make akv optional

microsoft · Jul 13, 2023 · a3407fd · a3407fd
1 parent b2f3476
commit a3407fd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,