update

Author: zhiyuanliang-ms

src/cdn/cdnRequestPipelinePolicy.ts renamed to src/afd/afdRequestPipelinePolicy.ts

@@ -68,7 +68,7 @@ import { ConfigurationClientManager } from "./configurationClientManager.js";
 import { getFixedBackoffDuration, getExponentialBackoffDuration } from "./common/backoffUtils.js";
 import { InvalidOperationError, ArgumentError, isFailoverableError, isInputError } from "./common/errors.js";
 import { ErrorMessages } from "./common/errorMessages.js";
-import { SERVER_TIMESTAMP_HEADER } from "./cdn/constants.js";
+import { SERVER_TIMESTAMP_HEADER } from "./afd/constants.js";
 
 const MIN_DELAY_FOR_UNHANDLED_FAILURE = 5_000; // 5 seconds
 
@@ -554,10 +554,6 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
         const keyValues: [key: string, value: unknown][] = [];
         const loadedSettings: ConfigurationSetting[] = await this.#loadConfigurationSettings();
 
-        if (loadedSettings.length === 0) {
-            return;
-        }
-
         if (this.#requestTracingEnabled && this.#aiConfigurationTracing !== undefined) {
             // reset old AI configuration tracing in order to track the information present in the current response from server
             this.#aiConfigurationTracing.reset();
@@ -614,10 +610,6 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
         const loadFeatureFlag = true;
         const featureFlagSettings: ConfigurationSetting[] = await this.#loadConfigurationSettings(loadFeatureFlag);
 
-        if (featureFlagSettings.length === 0) {
-            return;
-        }
-
         if (this.#requestTracingEnabled && this.#featureFlagTracing !== undefined) {
             // Reset old feature flag tracing in order to track the information present in the current response from server.
             this.#featureFlagTracing.reset();
@@ -650,7 +642,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
             needRefresh = await this.#checkConfigurationSettingsChange(this.#kvSelectors);
         } else {
             for (const watchedSetting of this.#sentinels.keys()) {
-                const configurationSettingId: ConfigurationSettingId = { key: watchedSetting.key, label: watchedSetting.label };
+                const configurationSettingId: ConfigurationSettingId = { key: watchedSetting.key, label: watchedSetting.label, etag: this.#sentinels.get(watchedSetting)?.etag };
                 const response: GetConfigurationSettingResponse | undefined =
                     await this.#getConfigurationSetting(configurationSettingId, { onlyIfChanged: true });
 
@@ -742,7 +734,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
                 };
 
                 if (!this.#isAfdUsed) {
-                    // if CDN is not used, add page etags to the listOptions to send conditional request
+                    // if AFD is not used, add page etags to the listOptions to send conditional request
                     listOptions.pageEtags = pageWatchers.map(w => w.etag ?? "") ;
                 }
 

src/cdn/constants.ts renamed to src/afd/constants.ts

@@ -22,7 +22,7 @@ export const enum ErrorMessages {
     CONNECTION_STRING_OR_ENDPOINT_MISSED = "A connection string or an endpoint with credential must be specified to create a client.",
     REPLICA_DISCOVERY_NOT_SUPPORTED = "Replica discovery is not supported when loading from Azure Front Door.",
     LOAD_BALANCING_NOT_SUPPORTED = "Load balancing is not supported when loading from Azure Front Door.",
-    WATCHED_SETTINGS_NOT_SUPPORTED = "Watched settings are not supported when loading from Azure Front Door."
+    WATCHED_SETTINGS_NOT_SUPPORTED = "Specifying watched settings is not supported when loading from Azure Front Door. If refresh is enabled, all loaded configuration settings will be watched automatically."
 }
 
 export const enum KeyVaultReferenceErrorMessages {

src/appConfigurationImpl.ts

@@ -6,7 +6,7 @@ import { AzureAppConfiguration } from "./appConfiguration.js";
 import { AzureAppConfigurationImpl } from "./appConfigurationImpl.js";
 import { AzureAppConfigurationOptions } from "./appConfigurationOptions.js";
 import { ConfigurationClientManager } from "./configurationClientManager.js";
-import { AnonymousRequestPipelinePolicy, RemoveSyncTokenPipelinePolicy } from "./cdn/cdnRequestPipelinePolicy.js";
+import { AnonymousRequestPipelinePolicy, RemoveSyncTokenPipelinePolicy } from "./afd/afdRequestPipelinePolicy.js";
 import { instanceOfTokenCredential } from "./common/utils.js";
 import { ArgumentError } from "./common/errors.js";
 import { ErrorMessages } from "./common/errorMessages.js";
@@ -27,7 +27,7 @@ export async function load(connectionString: string, options?: AzureAppConfigura
 
 /**
  * Loads the data from Azure App Configuration service and returns an instance of AzureAppConfiguration.
- * @param endpoint  The URL to the App Configuration store.
+ * @param endpoint  The App Configuration store endpoint.
  * @param credential  The credential to use to connect to the App Configuration store.
  * @param options  Optional parameters.
  */
@@ -67,8 +67,8 @@ export async function load(
 }
 
 /**
- * Loads the data from Azure Front Door (CDN) and returns an instance of AzureAppConfiguration.
- * @param endpoint  The URL to the Azure Front Door.
+ * Loads the data from Azure Front Door and returns an instance of AzureAppConfiguration.
+ * @param endpoint  The Azure Front Door endpoint.
  * @param appConfigOptions  Optional parameters.
  */
 export async function loadFromAzureFrontDoor(endpoint: URL | string, options?: AzureAppConfigurationOptions): Promise<AzureAppConfiguration>;

src/common/errorMessages.ts

@@ -11,7 +11,7 @@ import { AppConfigurationClient } from "@azure/app-configuration";
 import { load, loadFromAzureFrontDoor } from "../src/index.js";
 import { ErrorMessages } from "../src/common/errorMessages.js";
 import { createMockedKeyValue, createMockedFeatureFlag, HttpRequestHeadersPolicy, getCachedIterator, sinon, restoreMocks, createMockedConnectionString, createMockedAzureFrontDoorEndpoint, sleepInMs } from "./utils/testHelper.js";
-import { SERVER_TIMESTAMP_HEADER } from "../src/cdn/constants.js";
+import { SERVER_TIMESTAMP_HEADER } from "../src/afd/constants.js";
 import { isBrowser } from "../src/requestTracing/utils.js";
 
 function createTimestampHeaders(timestamp: string | Date) {

src/load.ts

@@ -468,7 +468,9 @@ describe("feature flags", function () {
             }
         });
 
-        expect(settingsWithNonExistentTag.get("feature_management")).to.be.undefined;
+        featureFlags = settingsWithNonExistentTag.get<any>("feature_management").feature_flags;
+        expect(featureFlags).not.undefined;
+        expect((featureFlags as []).length).equals(0);
     });
 
     it("should load feature flags from snapshot", async () => {