load feature flags from new endpoint

package.json

@@ -69,8 +69,8 @@
     "vitest": "^4.1.8"
   },
   "dependencies": {
-    "@azure/app-configuration": "^1.12.1",
     "@azure-rest/core-client": "^2.6.0",
+    "@azure/app-configuration": "1.13.0-beta.1",
     "@azure/core-rest-pipeline": "^1.6.0",
     "@azure/identity": "^4.2.1",
     "@azure/keyvault-secrets": "^4.7.0",

src/appConfigurationClient.ts

@@ -0,0 +1,98 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import {
+    AppConfigurationClient as ConfigurationClient,
+    AppConfigurationClientOptions as ConfigurationClientOptions,
+    CheckConfigurationSettingsOptions,
+    ConfigurationSettingId,
+    FeatureFlagClient,
+    FeatureFlagClientOptions,
+    GetConfigurationSettingOptions,
+    GetSnapshotOptions,
+    KnownAppConfigurationApiVersion,
+    ListConfigurationSettingsForSnapshotOptions,
+    ListConfigurationSettingsOptions,
+    ListFeatureFlagsOptions
+} from "@azure/app-configuration";
+import { TokenCredential } from "@azure/identity";
+import { instanceOfTokenCredential } from "./common/utils.js";
+import { ArgumentError } from "./common/errors.js";
+import { ErrorMessages } from "./common/errorMessages.js";
+import { RequestTracingOptions, applyRequestTracing } from "./requestTracing/utils.js";
+
+/**
+ * A client for the operations the provider needs from both the @see ConfigurationClient and
+ * @see FeatureFlagClient SDK clients. Request tracing is applied before delegating each operation.
+ */
+export class AppConfigurationClient {
+    #configurationClient: ConfigurationClient;
+    #featureFlagClient: FeatureFlagClient;
+
+    constructor(connectionString: string, options?: ConfigurationClientOptions);
+    constructor(endpoint: string, credential: TokenCredential, options?: ConfigurationClientOptions);
+    constructor(
+        connectionStringOrEndpoint: string,
+        credentialOrOptions?: TokenCredential | ConfigurationClientOptions,
+        options?: ConfigurationClientOptions
+    ) {
+        const credentialPassed = instanceOfTokenCredential(credentialOrOptions);
+        const configurationClientOptions = credentialPassed
+            ? options
+            : credentialOrOptions as ConfigurationClientOptions | undefined;
+        const featureFlagClientOptions = getFeatureFlagClientOptions(configurationClientOptions);
+
+        if (credentialPassed) {
+            const credential = credentialOrOptions as TokenCredential;
+            this.#configurationClient = new ConfigurationClient(connectionStringOrEndpoint, credential, configurationClientOptions);
+            this.#featureFlagClient = new FeatureFlagClient(connectionStringOrEndpoint, credential, featureFlagClientOptions);
+        } else {
+            this.#configurationClient = new ConfigurationClient(connectionStringOrEndpoint, configurationClientOptions);
+            this.#featureFlagClient = new FeatureFlagClient(connectionStringOrEndpoint, featureFlagClientOptions);
+        }
+    }
+
+    listConfigurationSettings(listOptions: ListConfigurationSettingsOptions, tracingOptions: RequestTracingOptions) {
+        return this.#configurationClient.listConfigurationSettings(applyRequestTracing(tracingOptions, listOptions));
+    }
+
+    checkConfigurationSettings(checkOptions: CheckConfigurationSettingsOptions, tracingOptions: RequestTracingOptions) {
+        return this.#configurationClient.checkConfigurationSettings(applyRequestTracing(tracingOptions, checkOptions));
+    }
+
+    getConfigurationSetting(configurationSettingId: ConfigurationSettingId, getOptions: GetConfigurationSettingOptions | undefined, tracingOptions: RequestTracingOptions) {
+        return this.#configurationClient.getConfigurationSetting(configurationSettingId, applyRequestTracing(tracingOptions, getOptions));
+    }
+
+    getSnapshot(snapshotName: string, getOptions: GetSnapshotOptions | undefined, tracingOptions: RequestTracingOptions) {
+        return this.#configurationClient.getSnapshot(snapshotName, applyRequestTracing(tracingOptions, getOptions));
+    }
+
+    listConfigurationSettingsForSnapshot(snapshotName: string, listOptions: ListConfigurationSettingsForSnapshotOptions | undefined, tracingOptions: RequestTracingOptions) {
+        return this.#configurationClient.listConfigurationSettingsForSnapshot(snapshotName, applyRequestTracing(tracingOptions, listOptions));
+    }
+
+    listFeatureFlags(listOptions: ListFeatureFlagsOptions, tracingOptions: RequestTracingOptions) {
+        return this.#featureFlagClient.listFeatureFlags(applyRequestTracing(tracingOptions, listOptions));
+    }
+}
+
+export function getFeatureFlagClientOptions(options?: ConfigurationClientOptions): FeatureFlagClientOptions | undefined {
+    if (options === undefined) {
+        return undefined;
+    }
+    if (options.apiVersion !== undefined &&
+        options.apiVersion !== KnownAppConfigurationApiVersion.V20260501Preview) {
+        throw new ArgumentError(ErrorMessages.API_VERSION_NOT_SUPPORTED);
+    }
+
+    return {
+        ...options,
+        ...(options.retryOptions && { retryOptions: { ...options.retryOptions } }),
+        ...(options.proxyOptions && { proxyOptions: { ...options.proxyOptions } }),
+        ...(options.tlsOptions && { tlsOptions: { ...options.tlsOptions } }),
+        ...(options.userAgentOptions && { userAgentOptions: { ...options.userAgentOptions } }),
+        ...(options.telemetryOptions && { telemetryOptions: { ...options.telemetryOptions } }),
+        ...(options.additionalPolicies && { additionalPolicies: [...options.additionalPolicies] })
+    };
+}

src/configurationClientManager.ts → src/appConfigurationClientManager.ts

@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { AppConfigurationClient, AppConfigurationClientOptions } from "@azure/app-configuration";
-import { ConfigurationClientWrapper } from "./configurationClientWrapper.js";
+import { AppConfigurationClientOptions as ConfigurationClientOptions } from "@azure/app-configuration";
+import { AppConfigurationClient } from "./appConfigurationClient.js";
+import { AppConfigurationClientWrapper } from "./appConfigurationClientWrapper.js";
 import { TokenCredential } from "@azure/identity";
 import { AzureAppConfigurationOptions } from "./appConfigurationOptions.js";
 import { isBrowser, isWebWorker } from "./requestTracing/utils.js";
@@ -28,18 +29,18 @@ const DNS_RESOLVER_TIMEOUT_IN_MS = 3_000;
 const DNS_RESOLVER_TRIES = 2;
 const MAX_ALTNATIVE_SRV_COUNT = 10;
 
-export class ConfigurationClientManager {
+export class AppConfigurationClientManager {
     readonly endpoint: URL; // primary endpoint, which is the one specified in the connection string or passed in as a parameter
     #isFailoverable: boolean;
     #dns: any;
     #secret : string;
     #id : string;
     #credential: TokenCredential;
-    #clientOptions: AppConfigurationClientOptions | undefined;
+    #clientOptions: ConfigurationClientOptions | undefined;
     #appConfigOptions: AzureAppConfigurationOptions | undefined;
     #validDomain: string; // valid domain for the primary endpoint, which is used to discover replicas
-    #staticClients: ConfigurationClientWrapper[]; // there should always be only one static client
-    #dynamicClients: ConfigurationClientWrapper[];
+    #staticClients: AppConfigurationClientWrapper[]; // there should always be only one static client
+    #dynamicClients: AppConfigurationClientWrapper[];
     #replicaCount: number = 0;
     #lastFallbackClientUpdateTime: number = 0; // enforce to discover fallback client when it is expired
     #lastFallbackClientRefreshAttempt: number = 0; // avoid refreshing clients before the minimal refresh interval
@@ -84,7 +85,7 @@ export class ConfigurationClientManager {
             throw new ArgumentError(ErrorMessages.CONNECTION_STRING_OR_ENDPOINT_MISSED);
         }
 
-        this.#staticClients = [new ConfigurationClientWrapper(this.endpoint.origin, staticClient)];
+        this.#staticClients = [new AppConfigurationClientWrapper(this.endpoint.origin, staticClient)];
         this.#validDomain = getValidDomain(this.endpoint.hostname.toLowerCase());
     }
 
@@ -113,7 +114,7 @@ export class ConfigurationClientManager {
         return this.#replicaCount;
     }
 
-    async getClients(): Promise<ConfigurationClientWrapper[]> {
+    async getClients(): Promise<AppConfigurationClientWrapper[]> {
         if (!this.#isFailoverable) {
             return this.#staticClients;
         }
@@ -159,17 +160,17 @@ export class ConfigurationClientManager {
         }
 
         const srvTargetHosts = shuffleList(result);
-        const newDynamicClients: ConfigurationClientWrapper[] = [];
+        const newDynamicClients: AppConfigurationClientWrapper[] = [];
         for (const host of srvTargetHosts) {
             if (isValidEndpoint(host, this.#validDomain)) {
                 const targetEndpoint = `https://${host}`;
                 if (host.toLowerCase() === this.endpoint.hostname.toLowerCase()) {
                     continue;
                 }
-                const client = this.#credential ?
+                const appConfigurationClient = this.#credential ?
                     new AppConfigurationClient(targetEndpoint, this.#credential, this.#clientOptions) :
                     new AppConfigurationClient(buildConnectionString(targetEndpoint, this.#secret, this.#id), this.#clientOptions);
-                newDynamicClients.push(new ConfigurationClientWrapper(targetEndpoint, client));
+                newDynamicClients.push(new AppConfigurationClientWrapper(targetEndpoint, appConfigurationClient));
             }
         }
 
@@ -256,7 +257,7 @@ export function isValidEndpoint(host: string, validDomain: string): boolean {
     return host.toLowerCase().endsWith(validDomain.toLowerCase());
 }
 
-function getClientOptions(options?: AzureAppConfigurationOptions): AppConfigurationClientOptions | undefined {
+export function getClientOptions(options?: AzureAppConfigurationOptions): ConfigurationClientOptions {
     // user-agent
     let userAgentPrefix = RequestTracing.USER_AGENT_PREFIX; // Default UA for JavaScript Provider
     const userAgentOptions = options?.clientOptions?.userAgentOptions;

src/configurationClientWrapper.ts → src/appConfigurationClientWrapper.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-import { AppConfigurationClient } from "@azure/app-configuration";
+import { AppConfigurationClient } from "./appConfigurationClient.js";
 import { getExponentialBackoffDuration } from "./common/backoffUtils.js";
 
-export class ConfigurationClientWrapper {
+export class AppConfigurationClientWrapper {
     endpoint: string;
     client: AppConfigurationClient;
     backoffEndTime: number = 0; // Timestamp