From a3407fd8108ffa722775e6ed0a112fb54f9525e7 Mon Sep 17 00:00:00 2001 From: Christopher Suh Date: Thu, 13 Jul 2023 14:43:03 -0700 Subject: [PATCH] make akv optional --- extensions/azurecore/package.json | 2 +- .../src/account-provider/auths/azureAuth.ts | 4 +++- extensions/azurecore/src/azurecore.d.ts | 2 +- extensions/azurecore/src/utils.ts | 12 +++++++----- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json index 6c272710991e..cfa26b403bd6 100644 --- a/extensions/azurecore/package.json +++ b/extensions/azurecore/package.json @@ -193,7 +193,7 @@ }, "endpoints": { "type": "object", - "required": ["host","scopes", "sqlResource", "microsoftResource", "armResource", "graphResource", "azureStorageResource", "azureKeyVaultResource"], + "required": ["host","scopes", "sqlResource", "microsoftResource", "armResource", "graphResource", "azureStorageResource"], "properties": { "type": "object", "host": { diff --git a/extensions/azurecore/src/account-provider/auths/azureAuth.ts b/extensions/azurecore/src/account-provider/auths/azureAuth.ts index 978447c9fb93..1ab0144136df 100644 --- a/extensions/azurecore/src/account-provider/auths/azureAuth.ts +++ b/extensions/azurecore/src/account-provider/auths/azureAuth.ts @@ -72,7 +72,6 @@ export abstract class AzureAuth implements vscode.Disposable { this.resources = [ this.metadata.settings.armResource, this.metadata.settings.graphResource, - this.metadata.settings.azureKeyVaultResource ]; if (this.metadata.settings.sqlResource) { this.resources.push(this.metadata.settings.sqlResource); @@ -89,6 +88,9 @@ export abstract class AzureAuth implements vscode.Disposable { if (this.metadata.settings.azureLogAnalyticsResource) { this.resources.push(this.metadata.settings.azureLogAnalyticsResource); } + if (this.metadata.settings.azureKeyVaultResource) { + this.resources.push(this.metadata.settings.azureKeyVaultResource); + } if (this.metadata.settings.azureKustoResource) { this.resources.push(this.metadata.settings.azureKustoResource); } diff --git a/extensions/azurecore/src/azurecore.d.ts b/extensions/azurecore/src/azurecore.d.ts index 6de7a4bf0014..81a464609d90 100644 --- a/extensions/azurecore/src/azurecore.d.ts +++ b/extensions/azurecore/src/azurecore.d.ts @@ -121,7 +121,7 @@ declare module 'azurecore' { /** * Information that describes the Azure Key Vault resource */ - azureKeyVaultResource: Resource; + azureKeyVaultResource?: Resource; /** * Information that describes the Azure Dev Ops resource diff --git a/extensions/azurecore/src/utils.ts b/extensions/azurecore/src/utils.ts index f3f74d412e63..1bc58cee160f 100644 --- a/extensions/azurecore/src/utils.ts +++ b/extensions/azurecore/src/utils.ts @@ -224,11 +224,6 @@ function buildProviderSettings(cloudProvider: ProviderSettingsJson): ProviderSet endpointSuffix: cloudProvider.settings.metadata.endpoints.azureStorageResource.endpointSuffix, azureResourceId: AzureResource.AzureStorage }, - azureKeyVaultResource: { - id: SettingIds.vault, - endpoint: cloudProvider.settings.metadata.endpoints.azureKeyVaultResource, - azureResourceId: AzureResource.AzureKeyVault - }, sqlResource: { id: SettingIds.sql, endpoint: cloudProvider.settings.metadata.endpoints.sqlResource, @@ -263,6 +258,13 @@ function buildProviderSettings(cloudProvider: ProviderSettingsJson): ProviderSet azureResourceId: AzureResource.AzureKusto }; } + if (cloudProvider.settings.metadata.endpoints.azureKeyVaultResource) { + newSettings.metadata.settings.azureKeyVaultResource = { + id: SettingIds.vault, + endpoint: cloudProvider.settings.metadata.endpoints.azureKeyVaultResource, + azureResourceId: AzureResource.AzureKeyVault + }; + } if (cloudProvider.settings.metadata.endpoints.powerBiResource) { newSettings.metadata.settings.powerBiResource = { id: SettingIds.powerbi,