WIP

Author: zhiyuanliang-ms

src/AzureAppConfigurationImpl.ts

@@ -9,7 +9,7 @@ import { IKeyValueAdapter } from "./IKeyValueAdapter";
 import { JsonKeyValueAdapter } from "./JsonKeyValueAdapter";
 import { DEFAULT_REFRESH_INTERVAL_IN_MS, MIN_REFRESH_INTERVAL_IN_MS } from "./RefreshOptions";
 import { Disposable } from "./common/disposable";
-import { FEATURE_FLAGS_KEY_NAME, FEATURE_MANAGEMENT_KEY_NAME } from "./featureManagement/constants";
+import { FEATURE_FLAGS_KEY_NAME, FEATURE_MANAGEMENT_KEY_NAME, TELEMETRY_KEY_NAME, METADATA_KEY_NAME, ETAG_KEY_NAME, FEATURE_FLAG_ID_KEY_NAME, FEATURE_FLAG_REFERENCE_KEY_NAME } from "./featureManagement/constants";
 import { AzureKeyVaultKeyValueAdapter } from "./keyvault/AzureKeyVaultKeyValueAdapter";
 import { RefreshTimer } from "./refresh/RefreshTimer";
 import { getConfigurationSettingWithTrace, listConfigurationSettingsWithTrace, requestTracingEnabled } from "./requestTracing/utils";
@@ -36,6 +36,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
     #sortedTrimKeyPrefixes: string[] | undefined;
     readonly #requestTracingEnabled: boolean;
     #client: AppConfigurationClient;
+    #clientEndpoint: string | undefined;
     #options: AzureAppConfigurationOptions | undefined;
     #isInitialLoadCompleted: boolean = false;
 
@@ -57,9 +58,11 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
 
     constructor(
         client: AppConfigurationClient,
+        clientEndpoint: string | undefined,
         options: AzureAppConfigurationOptions | undefined
     ) {
         this.#client = client;
+        this.#clientEndpoint = clientEndpoint;
         this.#options = options;
 
         // Enable request tracing if not opt-out
@@ -273,15 +276,15 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
                 pageEtags.push(page.etag ?? "");
                 for (const setting of page.items) {
                     if (isFeatureFlag(setting)) {
-                        featureFlagsMap.set(setting.key, setting.value);
+                        featureFlagsMap.set(setting.key, setting);
                     }
                 }
             }
             selector.pageEtags = pageEtags;
         }
 
         // parse feature flags
-        const featureFlags = Array.from(featureFlagsMap.values()).map(rawFlag => JSON.parse(rawFlag));
+        const featureFlags = Array.from(featureFlagsMap.values()).map(setting => this.#parseFeatureflag(setting));
 
         // feature_management is a reserved key, and feature_flags is an array of feature flags
         this.#configMap.set(FEATURE_MANAGEMENT_KEY_NAME, { [FEATURE_FLAGS_KEY_NAME]: featureFlags });
@@ -532,6 +535,40 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
         }
         return response;
     }
+
+    #parseFeatureflag(setting: ConfigurationSetting<string>): any{
+        const rawFlag = setting.value;
+        if (rawFlag === undefined) {
+            throw new Error("The value of configuration setting cannot be undefined.");
+        }
+        const featureFlag = JSON.parse(rawFlag);
+
+        if (featureFlag[TELEMETRY_KEY_NAME]) {
+            const metadata = featureFlag[TELEMETRY_KEY_NAME][METADATA_KEY_NAME];
+            featureFlag[TELEMETRY_KEY_NAME][METADATA_KEY_NAME] = {
+                ETAG_KEY_NAME: setting.etag,
+                FEATURE_FLAG_ID_KEY_NAME: "1",
+                FEATURE_FLAG_REFERENCE_KEY_NAME: this.#createFeatureFlagReference(setting),
+                ...(metadata || {})
+            };
+        }
+        
+        console.log(featureFlag);
+
+        return featureFlag;
+    }
+
+    #calculateFeatureFlagId(setting: ConfigurationSetting<string>): string {
+        return ""
+    }
+
+    #createFeatureFlagReference(setting: ConfigurationSetting<string>): string {
+        let featureFlagReference = `${this.#clientEndpoint}kv/${setting.key}`;
+        if (setting.label && setting.label.trim().length !== 0) {
+            featureFlagReference += `?label=${setting.label}`;
+        }
+        return featureFlagReference;
+    }
 }
 
 function getValidSelectors(selectors: SettingSelector[]): SettingSelector[] {
@@ -575,4 +612,4 @@ function getValidFeatureFlagSelectors(selectors?: SettingSelector[]): SettingSel
     } else {
         return getValidSelectors(selectors);
     }
-}
+}

src/featureManagement/constants.ts

@@ -2,4 +2,9 @@
 // Licensed under the MIT license.
 
 export const FEATURE_MANAGEMENT_KEY_NAME = "feature_management";
-export const FEATURE_FLAGS_KEY_NAME = "feature_flags";
+export const FEATURE_FLAGS_KEY_NAME = "feature_flags";
+export const TELEMETRY_KEY_NAME = "telemetry"
+export const METADATA_KEY_NAME = "metadata"
+export const ETAG_KEY_NAME = "Etag"
+export const FEATURE_FLAG_ID_KEY_NAME = "FeatureFlagId"
+export const FEATURE_FLAG_REFERENCE_KEY_NAME = "FeatureFlagReference"

src/load.ts

@@ -32,6 +32,7 @@ export async function load(
 ): Promise<AzureAppConfiguration> {
     const startTimestamp = Date.now();
     let client: AppConfigurationClient;
+    let clientEndpoint: string | undefined;
     let options: AzureAppConfigurationOptions | undefined;
 
     // input validation
@@ -40,30 +41,33 @@ export async function load(
         options = credentialOrOptions as AzureAppConfigurationOptions;
         const clientOptions = getClientOptions(options);
         client = new AppConfigurationClient(connectionString, clientOptions);
+        clientEndpoint = parseEndpoint(connectionStringOrEndpoint);
     } else if ((connectionStringOrEndpoint instanceof URL || typeof connectionStringOrEndpoint === "string") && instanceOfTokenCredential(credentialOrOptions)) {
-        let endpoint = connectionStringOrEndpoint;
         // ensure string is a valid URL.
-        if (typeof endpoint === "string") {
+        if (typeof connectionStringOrEndpoint === "string") {
             try {
-                endpoint = new URL(endpoint);
+                let endpoint = new URL(connectionStringOrEndpoint);
+                clientEndpoint = endpoint.toString();
             } catch (error) {
                 if (error.code === "ERR_INVALID_URL") {
                     throw new Error("Invalid endpoint URL.", { cause: error });
                 } else {
                     throw error;
                 }
             }
+        } else {
+            clientEndpoint = connectionStringOrEndpoint.toString();
         }
         const credential = credentialOrOptions as TokenCredential;
         options = appConfigOptions;
         const clientOptions = getClientOptions(options);
-        client = new AppConfigurationClient(endpoint.toString(), credential, clientOptions);
+        client = new AppConfigurationClient(clientEndpoint, credential, clientOptions);
     } else {
         throw new Error("A connection string or an endpoint with credential must be specified to create a client.");
     }
 
     try {
-        const appConfiguration = new AzureAppConfigurationImpl(client, options);
+        const appConfiguration = new AzureAppConfigurationImpl(client, clientEndpoint, options);
         await appConfiguration.load();
         return appConfiguration;
     } catch (error) {
@@ -104,3 +108,18 @@ function getClientOptions(options?: AzureAppConfigurationOptions): AppConfigurat
         }
     });
 }
+
+function parseEndpoint(connectionString: string): string | undefined {
+    const parts = connectionString.split(";");
+    const endpointPart = parts.find(part => part.startsWith("Endpoint="));
+    
+    if (endpointPart) {
+        let endpoint = endpointPart.split("=")[1];
+        if (!endpoint.endsWith("/")) {
+            endpoint += "/";
+        }
+        return endpoint;
+    }
+
+    return undefined;
+}