From 7395fd9780c795a9af7f4ac05fef0737e3c394fb Mon Sep 17 00:00:00 2001 From: Nishtha Ahuja Date: Mon, 10 Feb 2025 18:43:42 +0530 Subject: [PATCH] test changes --- src/Common/Constants.ts | 6 +++--- src/Common/CosmosClient.ts | 3 ++- src/Platform/Emulator/emulatorAccount.tsx | 24 ++++------------------- src/Platform/Emulator/emulatorConfig.json | 22 +++++++++++++++++++++ 4 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 src/Platform/Emulator/emulatorConfig.json diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index fff625dc7..60ba868cc 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -446,9 +446,9 @@ export enum PoolIdType { QueryCopilot = "query-copilot", } -export const EmulatorMasterKey = - //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")] - "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="; +// export const EmulatorMasterKey = +// //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")] +// "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="; export class Notebook { public static readonly defaultBasePath = "./notebooks"; diff --git a/src/Common/CosmosClient.ts b/src/Common/CosmosClient.ts index 2779e1ba1..aa2728de4 100644 --- a/src/Common/CosmosClient.ts +++ b/src/Common/CosmosClient.ts @@ -1,6 +1,7 @@ import * as Cosmos from "@azure/cosmos"; import { getAuthorizationTokenUsingResourceTokens } from "Common/getAuthorizationTokenUsingResourceTokens"; import { AuthorizationToken } from "Contracts/FabricMessageTypes"; +import { EmulatorMasterKey } from "Platform/Emulator/emulatorAccount"; import { checkDatabaseResourceTokensValidity } from "Platform/Fabric/FabricUtil"; import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility"; import { useNewPortalBackendEndpoint } from "Utils/EndpointUtils"; @@ -11,7 +12,7 @@ import { Platform, configContext } from "../ConfigContext"; import { updateUserContext, userContext } from "../UserContext"; import { logConsoleError } from "../Utils/NotificationConsoleUtils"; import * as PriorityBasedExecutionUtils from "../Utils/PriorityBasedExecutionUtils"; -import { EmulatorMasterKey, HttpHeaders } from "./Constants"; +import { HttpHeaders } from "./Constants"; import { getErrorMessage } from "./ErrorHandlingUtils"; const _global = typeof self === "undefined" ? window : self; diff --git a/src/Platform/Emulator/emulatorAccount.tsx b/src/Platform/Emulator/emulatorAccount.tsx index 211f4dfd8..c89c671ac 100644 --- a/src/Platform/Emulator/emulatorAccount.tsx +++ b/src/Platform/Emulator/emulatorAccount.tsx @@ -1,21 +1,5 @@ -import { AccountKind } from "../../Common/Constants"; +const emulatorConfig = require("./emulatorConfig.json"); -export const emulatorAccount = { - name: "", - id: "", - location: "", - type: "", - kind: AccountKind.DocumentDB, - properties: { - documentEndpoint: "", - tableEndpoint: "", - gremlinEndpoint: "", - cassandraEndpoint: "", - capabilities: [ - { - name: "EnableNoSQLVectorSearch", - description: "Enable Vector Search on NoSQL account", - }, - ], - }, -}; +export const EmulatorMasterKey = emulatorConfig.EmulatorMasterKey || ""; +export const emulatorAccount = emulatorConfig.Account || {}; +console.log("I am master", EmulatorMasterKey); diff --git a/src/Platform/Emulator/emulatorConfig.json b/src/Platform/Emulator/emulatorConfig.json new file mode 100644 index 000000000..77c2b9ecb --- /dev/null +++ b/src/Platform/Emulator/emulatorConfig.json @@ -0,0 +1,22 @@ +{ + "EmulatorMasterKey": "rFiKJU8m8BhOGhL5EmVP94ITQA5Qsk+sy7OmjzF7SgV5j8WhqGp/WzDrTJBtmXso6WzGaU9OppuvGa0gb/XwDQ==", + "Account": { + "name": "", + "id": "", + "location": "", + "type": "", + "kind": "DocumentDB", + "properties": { + "documentEndpoint": "", + "tableEndpoint": "", + "gremlinEndpoint": "", + "cassandraEndpoint": "", + "capabilities": [ + { + "name": "EnableNoSQLVectorSearch", + "description": "Enable Vector Search on NoSQL account" + } + ] + } + } +}