update

Author: zhiyuanliang-ms

src/AzureAppConfigurationImpl.ts

@@ -594,12 +594,12 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
 
                 if (selector.pageEtags === undefined || selector.pageEtags.length === 0) {
                     selectorCollection.etagToBreakCdnCache = undefined;
-                    return true; // no etag, always refresh
+                    return true; // no etag is retrieved from previous request, always refresh
                 }
 
                 let i = 0;
                 for await (const page of pageIterator) {
-                    if (i > selector.pageEtags.length + 1 || // new page
+                    if (i >= selector.pageEtags.length || // new page
                         (page._response.status === 200 && page.etag !== selector.pageEtags[i])) { // page changed
                         if (this.#isCdnUsed) {
                             selectorCollection.etagToBreakCdnCache = page.etag;

test/loadBalance.test.ts

@@ -6,10 +6,15 @@ import * as chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 import { load } from "./exportedApi.js";
-import { restoreMocks, createMockedConnectionString, sleepInMs, createMockedEndpoint, mockConfigurationManagerGetClients, mockAppConfigurationClientLoadBalanceMode } from "./utils/testHelper.js";
+import { restoreMocks, createMockedConnectionString, createMockedKeyValue, sleepInMs, createMockedEndpoint, mockConfigurationManagerGetClients, mockAppConfigurationClientLoadBalanceMode } from "./utils/testHelper.js";
 import { AppConfigurationClient } from "@azure/app-configuration";
 import { ConfigurationClientWrapper } from "../src/ConfigurationClientWrapper.js";
 
+const mockedKVs = [
+    { value: "red", key: "app.settings.fontColor" },
+    { value: "40", key: "app.settings.fontSize" },
+    { value: "30", key: "app.settings.fontSize", label: "prod" }
+].map(createMockedKeyValue);
 const fakeEndpoint_1 = createMockedEndpoint("fake_1");
 const fakeEndpoint_2 = createMockedEndpoint("fake_2");
 const fakeClientWrapper_1 = new ConfigurationClientWrapper(fakeEndpoint_1, new AppConfigurationClient(createMockedConnectionString(fakeEndpoint_1)));
@@ -29,8 +34,8 @@ describe("load balance", function () {
 
     it("should load balance the request when loadBalancingEnabled", async () => {
         mockConfigurationManagerGetClients([fakeClientWrapper_1, fakeClientWrapper_2], false);
-        mockAppConfigurationClientLoadBalanceMode(fakeClientWrapper_1, clientRequestCounter_1);
-        mockAppConfigurationClientLoadBalanceMode(fakeClientWrapper_2, clientRequestCounter_2);
+        mockAppConfigurationClientLoadBalanceMode([mockedKVs], fakeClientWrapper_1, clientRequestCounter_1);
+        mockAppConfigurationClientLoadBalanceMode([mockedKVs], fakeClientWrapper_2, clientRequestCounter_2);
 
         const connectionString = createMockedConnectionString();
         const settings = await load(connectionString, {
@@ -66,8 +71,8 @@ describe("load balance", function () {
         clientRequestCounter_1.count = 0;
         clientRequestCounter_2.count = 0;
         mockConfigurationManagerGetClients([fakeClientWrapper_1, fakeClientWrapper_2], false);
-        mockAppConfigurationClientLoadBalanceMode(fakeClientWrapper_1, clientRequestCounter_1);
-        mockAppConfigurationClientLoadBalanceMode(fakeClientWrapper_2, clientRequestCounter_2);
+        mockAppConfigurationClientLoadBalanceMode([mockedKVs], fakeClientWrapper_1, clientRequestCounter_1);
+        mockAppConfigurationClientLoadBalanceMode([mockedKVs], fakeClientWrapper_2, clientRequestCounter_2);
 
         const connectionString = createMockedConnectionString();
         // loadBalancingEnabled is default to false

test/utils/testHelper.ts

@@ -103,12 +103,11 @@ function mockAppConfigurationClientListConfigurationSettings(pages: Configuratio
     });
 }
 
-function mockAppConfigurationClientLoadBalanceMode(clientWrapper: ConfigurationClientWrapper, countObject: { count: number }) {
-    const emptyPages: ConfigurationSetting[][] = [];
+function mockAppConfigurationClientLoadBalanceMode(pages: ConfigurationSetting[][], clientWrapper: ConfigurationClientWrapper, countObject: { count: number }) {
     sinon.stub(clientWrapper.client, "listConfigurationSettings").callsFake((listOptions) => {
         countObject.count += 1;
-        const kvs = _filterKVs(emptyPages.flat(), listOptions);
-        return getMockedIterator(emptyPages, kvs, listOptions);
+        const kvs = _filterKVs(pages.flat(), listOptions);
+        return getMockedIterator(pages, kvs, listOptions);
     });
 }