From 3a3b34621d5ec57a56304f9506750af7cad1f823 Mon Sep 17 00:00:00 2001 From: Yan Zhang Date: Thu, 4 Jan 2024 09:59:20 +0800 Subject: [PATCH 1/2] Rename AzureAppConfigurationKeyVaultOptions to KeyVaultOptions --- src/AzureAppConfigurationOptions.ts | 4 ++-- src/keyvault/AzureAppConfigurationKeyVaultOptions.ts | 2 +- src/keyvault/AzureKeyVaultKeyValueAdapter.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/AzureAppConfigurationOptions.ts b/src/AzureAppConfigurationOptions.ts index 104c8451..b69c9f4a 100644 --- a/src/AzureAppConfigurationOptions.ts +++ b/src/AzureAppConfigurationOptions.ts @@ -2,7 +2,7 @@ // Licensed under the MIT license. import { AppConfigurationClientOptions } from "@azure/app-configuration"; -import { AzureAppConfigurationKeyVaultOptions } from "./keyvault/AzureAppConfigurationKeyVaultOptions"; +import { KeyVaultOptions } from "./keyvault/AzureAppConfigurationKeyVaultOptions"; import { SettingSelector } from "./types"; export const MaxRetries = 2; @@ -34,5 +34,5 @@ export interface AzureAppConfigurationOptions { /** * Specifies options used to resolve Vey Vault references. */ - keyVaultOptions?: AzureAppConfigurationKeyVaultOptions; + keyVaultOptions?: KeyVaultOptions; } \ No newline at end of file diff --git a/src/keyvault/AzureAppConfigurationKeyVaultOptions.ts b/src/keyvault/AzureAppConfigurationKeyVaultOptions.ts index 2b5c7d87..88e86a9c 100644 --- a/src/keyvault/AzureAppConfigurationKeyVaultOptions.ts +++ b/src/keyvault/AzureAppConfigurationKeyVaultOptions.ts @@ -7,7 +7,7 @@ import { SecretClient } from "@azure/keyvault-secrets"; /** * Options used to resolve Key Vault references. */ -export interface AzureAppConfigurationKeyVaultOptions { +export interface KeyVaultOptions { /** * Specifies the Key Vault secret client used for resolving Key Vault references. */ diff --git a/src/keyvault/AzureKeyVaultKeyValueAdapter.ts b/src/keyvault/AzureKeyVaultKeyValueAdapter.ts index 3f5326fc..c6732601 100644 --- a/src/keyvault/AzureKeyVaultKeyValueAdapter.ts +++ b/src/keyvault/AzureKeyVaultKeyValueAdapter.ts @@ -3,7 +3,7 @@ import { ConfigurationSetting, isSecretReference, parseSecretReference } from "@azure/app-configuration"; import { IKeyValueAdapter } from "../IKeyValueAdapter"; -import { AzureAppConfigurationKeyVaultOptions } from "./AzureAppConfigurationKeyVaultOptions"; +import { KeyVaultOptions } from "./AzureAppConfigurationKeyVaultOptions"; import { SecretClient, parseKeyVaultSecretIdentifier } from "@azure/keyvault-secrets"; export class AzureKeyVaultKeyValueAdapter implements IKeyValueAdapter { @@ -13,7 +13,7 @@ export class AzureKeyVaultKeyValueAdapter implements IKeyValueAdapter { private secretClients: Map; constructor( - private keyVaultOptions: AzureAppConfigurationKeyVaultOptions | undefined + private keyVaultOptions: KeyVaultOptions | undefined ) { } public canProcess(setting: ConfigurationSetting): boolean { From 05999fd645dcf37948eefdf57470ca21b7071288 Mon Sep 17 00:00:00 2001 From: Yan Zhang Date: Fri, 5 Jan 2024 08:16:33 +0800 Subject: [PATCH 2/2] Update filename accordingly --- src/AzureAppConfigurationOptions.ts | 2 +- src/keyvault/AzureKeyVaultKeyValueAdapter.ts | 2 +- ...ureAppConfigurationKeyVaultOptions.ts => KeyVaultOptions.ts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/keyvault/{AzureAppConfigurationKeyVaultOptions.ts => KeyVaultOptions.ts} (100%) diff --git a/src/AzureAppConfigurationOptions.ts b/src/AzureAppConfigurationOptions.ts index b69c9f4a..978338d4 100644 --- a/src/AzureAppConfigurationOptions.ts +++ b/src/AzureAppConfigurationOptions.ts @@ -2,7 +2,7 @@ // Licensed under the MIT license. import { AppConfigurationClientOptions } from "@azure/app-configuration"; -import { KeyVaultOptions } from "./keyvault/AzureAppConfigurationKeyVaultOptions"; +import { KeyVaultOptions } from "./keyvault/KeyVaultOptions"; import { SettingSelector } from "./types"; export const MaxRetries = 2; diff --git a/src/keyvault/AzureKeyVaultKeyValueAdapter.ts b/src/keyvault/AzureKeyVaultKeyValueAdapter.ts index c6732601..b7025d58 100644 --- a/src/keyvault/AzureKeyVaultKeyValueAdapter.ts +++ b/src/keyvault/AzureKeyVaultKeyValueAdapter.ts @@ -3,7 +3,7 @@ import { ConfigurationSetting, isSecretReference, parseSecretReference } from "@azure/app-configuration"; import { IKeyValueAdapter } from "../IKeyValueAdapter"; -import { KeyVaultOptions } from "./AzureAppConfigurationKeyVaultOptions"; +import { KeyVaultOptions } from "./KeyVaultOptions"; import { SecretClient, parseKeyVaultSecretIdentifier } from "@azure/keyvault-secrets"; export class AzureKeyVaultKeyValueAdapter implements IKeyValueAdapter { diff --git a/src/keyvault/AzureAppConfigurationKeyVaultOptions.ts b/src/keyvault/KeyVaultOptions.ts similarity index 100% rename from src/keyvault/AzureAppConfigurationKeyVaultOptions.ts rename to src/keyvault/KeyVaultOptions.ts