random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2026-01-06 03:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Azure/cosmos-explorer

Browse Source
This commit is contained in:
Senthamil Sindhu
2024-07-24 12:32:54 -07:00
parent 2b84af60f4 1e6c40eabf
commit e51c28c634
3 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Explorer/Panes/SettingsPane/SettingsPane.tsx
View File

@@ -36,8 +36,7 @@ import Explorer from "../../Explorer";
import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm"; import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
import { AuthType } from "AuthType"; import { AuthType } from "AuthType";
import create, { UseStore } from "zustand"; import create, { UseStore } from "zustand";
import { DatabaseAccountListKeysResult } from "@azure/arm-cosmosdb/esm/models"; import { getReadOnlyKeys, listKeys } from "Utils/arm/generatedClients/cosmos/databaseAccounts";
import { listKeys } from "Utils/arm/generatedClients/cosmos/databaseAccounts";
export interface DataPlaneRbacState { export interface DataPlaneRbacState {
dataPlaneRbacEnabled: boolean; dataPlaneRbacEnabled: boolean;
@@ -172,18 +171,25 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
}); });
const { databaseAccount: account, subscriptionId, resourceGroup } = userContext; const { databaseAccount: account, subscriptionId, resourceGroup } = userContext;
if (!userContext.features.enableAadDataPlane && !userContext.masterKey) { if (!userContext.features.enableAadDataPlane && !userContext.masterKey) {
let keys;
try { try {
const keys: DatabaseAccountListKeysResult = await listKeys(subscriptionId, resourceGroup, account.name); keys = await listKeys(subscriptionId, resourceGroup, account.name);
updateUserContext({
if (keys.primaryMasterKey) { masterKey: keys.primaryMasterKey,
updateUserContext({ masterKey: keys.primaryMasterKey }); });
useDataPlaneRbac.setState({ dataPlaneRbacEnabled: false });
}
} catch (error) { } catch (error) {
logConsoleError(`Error occurred fetching keys for the account." ${error.message}`); // if listKeys fail because of permissions issue, then make call to get ReadOnlyKeys
throw error; if (error.code === "AuthorizationFailed") {
keys = await getReadOnlyKeys(subscriptionId, resourceGroup, account.name);
updateUserContext({
masterKey: keys.primaryReadonlyMasterKey,
});
} else {
logConsoleError(`Error occurred fetching keys for the account." ${error.message}`);
throw error;
}
} }
useDataPlaneRbac.setState({ dataPlaneRbacEnabled: false });
} }
} }

6
src/Platform/Emulator/emulatorAccount.tsx
View File

@@ -11,5 +11,11 @@ export const emulatorAccount = {
tableEndpoint: "", tableEndpoint: "",
gremlinEndpoint: "", gremlinEndpoint: "",
cassandraEndpoint: "", cassandraEndpoint: "",
capabilities: [
{
name: "EnableNoSQLVectorSearch",
description: "Enable Vector Search on NoSQL account",
},
],
}, },
}; };

36
src/hooks/useKnockoutExplorer.ts
View File

@@ -40,7 +40,7 @@ import { DefaultExperienceUtility } from "../Shared/DefaultExperienceUtility";
import { Node, PortalEnv, updateUserContext, userContext } from "../UserContext"; import { Node, PortalEnv, updateUserContext, userContext } from "../UserContext";
import { acquireTokenWithMsal, getAuthorizationHeader, getMsalInstance } from "../Utils/AuthorizationUtils"; import { acquireTokenWithMsal, getAuthorizationHeader, getMsalInstance } from "../Utils/AuthorizationUtils";
import { isInvalidParentFrameOrigin, shouldProcessMessage } from "../Utils/MessageValidation"; import { isInvalidParentFrameOrigin, shouldProcessMessage } from "../Utils/MessageValidation";
import { listKeys } from "../Utils/arm/generatedClients/cosmos/databaseAccounts"; import { getReadOnlyKeys, listKeys } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
import { applyExplorerBindings } from "../applyExplorerBindings"; import { applyExplorerBindings } from "../applyExplorerBindings";
import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane"; import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane";
import * as Logger from "../Common/Logger"; import * as Logger from "../Common/Logger";
@@ -453,25 +453,33 @@ function configureEmulator(): Explorer {
return explorer; return explorer;
} }
async function fetchAndUpdateKeys(subscriptionId: string, resourceGroup: string, account: string) { export async function fetchAndUpdateKeys(subscriptionId: string, resourceGroup: string, account: string) {
Logger.logInfo(`Fetching keys for ${userContext.apiType} account ${account}`, "Explorer/fetchAndUpdateKeys");
let keys;
try { try {
Logger.logInfo(`Fetching keys for ${userContext.apiType} account ${account}`, "Explorer/fetchAndUpdateKeys"); keys = await listKeys(subscriptionId, resourceGroup, account);
const keys = await listKeys(subscriptionId, resourceGroup, account);
Logger.logInfo(`Keys fetched for ${userContext.apiType} account ${account}`, "Explorer/fetchAndUpdateKeys"); Logger.logInfo(`Keys fetched for ${userContext.apiType} account ${account}`, "Explorer/fetchAndUpdateKeys");
updateUserContext({ updateUserContext({
masterKey: keys.primaryMasterKey, masterKey: keys.primaryMasterKey,
}); });
Logger.logInfo(
`User context updated with Master key for ${userContext.apiType} account ${account}`,
"Explorer/fetchAndUpdateKeys",
);
} catch (error) { } catch (error) {
logConsoleError(`Error occurred fetching keys for the account." ${error.message}`); if (error.code === "AuthorizationFailed") {
Logger.logError( keys = await getReadOnlyKeys(subscriptionId, resourceGroup, account);
`Error during fetching keys or updating user context: ${error} for ${userContext.apiType} account ${account}`, Logger.logInfo(
"Explorer/fetchAndUpdateKeys", `Read only Keys fetched for ${userContext.apiType} account ${account}`,
); "Explorer/fetchAndUpdateKeys",
throw error; );
updateUserContext({
masterKey: keys.primaryReadonlyMasterKey,
});
} else {
logConsoleError(`Error occurred fetching keys for the account." ${error.message}`);
Logger.logError(
`Error during fetching keys or updating user context: ${error} for ${userContext.apiType} account ${account}`,
"Explorer/fetchAndUpdateKeys",
);
throw error;
}
} }
} }