update

Author: linglingye001

src/AzureAppConfigurationImpl.ts

@@ -182,10 +182,6 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
 
     async #executeWithFailoverPolicy(funcToExecute: (client: AppConfigurationClient) => Promise<any>): Promise<any> {
         const clientWrappers = await this.#clientManager.getClients();
-        if (clientWrappers.length === 0) {
-            this.#clientManager.refreshClients();
-            console.warn("Refresh skipped because no endpoint is accessible.");
-        }
 
         let successful: boolean;
         for (const clientWrapper of clientWrappers) {
@@ -208,7 +204,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
         }
 
         this.#clientManager.refreshClients();
-        throw new Error("Failed to get configuration settings from endpoint.");
+        throw new Error("All clients failed to get configuration settings.");
     }
 
     async #loadSelectedKeyValues(): Promise<ConfigurationSetting[]> {
@@ -415,7 +411,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
         // check if any refresh task failed
         for (const result of results) {
             if (result.status === "rejected") {
-                throw result.reason;
+                console.warn("Refresh failed:", result.reason);
             }
         }
 

test/failover.test.ts

@@ -6,7 +6,7 @@ import * as chaiAsPromised from "chai-as-promised";
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 import { load } from "./exportedApi";
-import { createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockAppConfigurationClientListConfigurationSettingsWithFailure, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
+import { createMockedConnectionString, createMockedFeatureFlag, createMockedKeyValue, mockAppConfigurationClientListConfigurationSettings, mockAppConfigurationClientListConfigurationSettingsWithFailure, mockConfigurationManagerGetClients, restoreMocks } from "./utils/testHelper";
 import { getValidDomain, isValidEndpoint } from "../src/ConfigurationClientManager";
 
 const mockedKVs = [{
@@ -37,7 +37,9 @@ describe("failover", function () {
         const replicaDiscoveryEnabled = true;
         const isFailoverable = true;
         mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure(mockedKVs);
+        mockAppConfigurationClientListConfigurationSettingsWithFailure();
+        restoreMocks();
+        mockAppConfigurationClientListConfigurationSettings(mockedKVs);
 
         const connectionString = createMockedConnectionString();
         const settings = await load(connectionString, {
@@ -52,7 +54,9 @@ describe("failover", function () {
         const replicaDiscoveryEnabled = true;
         const isFailoverable = true;
         mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure(mockedFeatureFlags);
+        mockAppConfigurationClientListConfigurationSettingsWithFailure();
+        restoreMocks();
+        mockAppConfigurationClientListConfigurationSettings(mockedFeatureFlags);
 
         const connectionString = createMockedConnectionString();
         const settings = await load(connectionString, {
@@ -72,7 +76,7 @@ describe("failover", function () {
     it("should throw error when all clients failed", async () => {
         const isFailoverable = false;
         mockConfigurationManagerGetClients(isFailoverable);
-        mockAppConfigurationClientListConfigurationSettingsWithFailure(mockedKVs);
+        mockAppConfigurationClientListConfigurationSettingsWithFailure();
 
         const connectionString = createMockedConnectionString();
         return expect(load(connectionString)).eventually.rejectedWith("Failed to get configuration settings from endpoint.");

test/keyvault.test.ts

@@ -39,8 +39,7 @@ describe("key vault reference", function () {
     });
 
     it("require key vault options to resolve reference", async () => {
-        return expect(load(createMockedConnectionString(), {
-        })).eventually.rejectedWith("Configure keyVaultOptions to resolve Key Vault Reference(s).");
+        return expect(load(createMockedConnectionString())).eventually.rejectedWith("Configure keyVaultOptions to resolve Key Vault Reference(s).");
     });
 
     it("should resolve key vault reference with credential", async () => {

test/refresh.test.ts

@@ -42,8 +42,7 @@ describe("dynamic refresh", function () {
 
     it("should throw error when refresh is not enabled but refresh is called", async () => {
         const connectionString = createMockedConnectionString();
-        const settings = await load(connectionString, {
-        });
+        const settings = await load(connectionString);
         const refreshCall = settings.refresh();
         return expect(refreshCall).eventually.rejectedWith("Refresh is not enabled for key-values or feature flags.");
     });
@@ -125,8 +124,7 @@ describe("dynamic refresh", function () {
 
     it("should throw error when calling onRefresh when refresh is not enabled", async () => {
         const connectionString = createMockedConnectionString();
-        const settings = await load(connectionString, {
-        });
+        const settings = await load(connectionString);
         expect(() => settings.onRefresh(() => { })).throws("Refresh is not enabled for key-values or feature flags.");
     });
 

test/utils/testHelper.ts

@@ -131,55 +131,11 @@ function mockAppConfigurationClientGetConfigurationSetting(kvList) {
     });
 }
 
-function mockAppConfigurationClientListConfigurationSettingsWithFailure(...pages: ConfigurationSetting[][]) {
+function mockAppConfigurationClientListConfigurationSettingsWithFailure() {
     const stub = sinon.stub(AppConfigurationClient.prototype, "listConfigurationSettings");
 
     // Configure the stub to throw an error on the first call and return mockedKVs on the second call
     stub.onFirstCall().throws(new RestError("Internal Server Error", { statusCode: 500 }));
-    stub.callsFake((listOptions) => {
-        let kvs = _filterKVs(pages.flat(), listOptions);
-        const mockIterator: AsyncIterableIterator<any> & { byPage(): AsyncIterableIterator<any> } = {
-            [Symbol.asyncIterator](): AsyncIterableIterator<any> {
-                kvs = _filterKVs(pages.flat(), listOptions);
-                return this;
-            },
-            next() {
-                const value = kvs.shift();
-                return Promise.resolve({ done: !value, value });
-            },
-            byPage(): AsyncIterableIterator<any> {
-                let remainingPages;
-                const pageEtags = listOptions?.pageEtags ? [...listOptions.pageEtags] : undefined; // a copy of the original list
-                return {
-                    [Symbol.asyncIterator](): AsyncIterableIterator<any> {
-                        remainingPages = [...pages];
-                        return this;
-                    },
-                    next() {
-                        const pageItems = remainingPages.shift();
-                        const pageEtag = pageEtags?.shift();
-                        if (pageItems === undefined) {
-                            return Promise.resolve({ done: true, value: undefined });
-                        } else {
-                            const items = _filterKVs(pageItems ?? [], listOptions);
-                            const etag = _sha256(JSON.stringify(items));
-                            const statusCode = pageEtag === etag ? 304 : 200;
-                            return Promise.resolve({
-                                done: false,
-                                value: {
-                                    items,
-                                    etag,
-                                    _response: { status: statusCode }
-                                }
-                            });
-                        }
-                    }
-                };
-            }
-        };
-
-        return mockIterator as any;
-    });
 }
 
 // uriValueList: [["<secretUri>", "value"], ...]