From dd743a351a7ad94088acf376d725a4ea5843b707 Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Tue, 20 Aug 2024 14:58:01 +0800 Subject: [PATCH 1/2] enforce to use semicolon --- .eslintrc | 3 ++- src/AzureAppConfigurationImpl.ts | 2 +- src/JsonKeyValueAdapter.ts | 2 +- src/load.ts | 2 +- src/requestTracing/utils.ts | 4 ++-- test/clientOptions.test.ts | 10 +++++----- test/featureFlag.test.ts | 3 ++- test/json.test.ts | 4 ++-- test/keyvault.test.ts | 2 +- test/load.test.ts | 3 ++- test/refresh.test.ts | 8 ++++---- test/requestTracing.test.ts | 2 +- test/utils/testHelper.ts | 12 ++++++------ 13 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.eslintrc b/.eslintrc index f2852f86..27a13ccf 100644 --- a/.eslintrc +++ b/.eslintrc @@ -56,6 +56,7 @@ { "max": 1 } - ] + ], + "semi": ["error", "always"] } } \ No newline at end of file diff --git a/src/AzureAppConfigurationImpl.ts b/src/AzureAppConfigurationImpl.ts index 76d2c963..f49cbe3b 100644 --- a/src/AzureAppConfigurationImpl.ts +++ b/src/AzureAppConfigurationImpl.ts @@ -481,7 +481,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration { if (index >= 0) { this.#onRefreshListeners.splice(index, 1); } - } + }; return new Disposable(remove); } diff --git a/src/JsonKeyValueAdapter.ts b/src/JsonKeyValueAdapter.ts index c558f4e4..6b77da5d 100644 --- a/src/JsonKeyValueAdapter.ts +++ b/src/JsonKeyValueAdapter.ts @@ -54,4 +54,4 @@ function isJsonContentType(contentTypeValue: string): boolean { } return typeParts[1].split("+").includes("json"); -} +} diff --git a/src/load.ts b/src/load.ts index d5559c07..10dda11e 100644 --- a/src/load.ts +++ b/src/load.ts @@ -94,7 +94,7 @@ function getClientOptions(options?: AzureAppConfigurationOptions): AppConfigurat const defaultRetryOptions = { maxRetries: MaxRetries, maxRetryDelayInMs: MaxRetryDelayInMs, - } + }; const retryOptions = Object.assign({}, defaultRetryOptions, options?.clientOptions?.retryOptions); return Object.assign({}, options?.clientOptions, { diff --git a/src/requestTracing/utils.ts b/src/requestTracing/utils.ts index 20d19313..f979bf47 100644 --- a/src/requestTracing/utils.ts +++ b/src/requestTracing/utils.ts @@ -40,7 +40,7 @@ export function listConfigurationSettingsWithTrace( customHeaders: { [CORRELATION_CONTEXT_HEADER_NAME]: createCorrelationContextHeader(appConfigOptions, initialLoadCompleted) } - } + }; } return client.listConfigurationSettings(actualListOptions); @@ -64,7 +64,7 @@ export function getConfigurationSettingWithTrace( customHeaders: { [CORRELATION_CONTEXT_HEADER_NAME]: createCorrelationContextHeader(appConfigOptions, initialLoadCompleted) } - } + }; } return client.getConfigurationSetting(configurationSettingId, actualGetOptions); diff --git a/test/clientOptions.test.ts b/test/clientOptions.test.ts index 0b970d93..58bbd353 100644 --- a/test/clientOptions.test.ts +++ b/test/clientOptions.test.ts @@ -37,7 +37,7 @@ describe("custom client options", function () { afterEach(() => { nock.restore(); - }) + }); it("should retry 2 times by default", async () => { const countPolicy = new HttpRequestCountPolicy(); @@ -49,7 +49,7 @@ describe("custom client options", function () { position: "perRetry" }] } - }) + }); }; let error; try { @@ -74,7 +74,7 @@ describe("custom client options", function () { maxRetries } } - }) + }); }; let error; @@ -109,7 +109,7 @@ describe("custom client options", function () { position: "perRetry" }] } - }) + }); }; let error; try { @@ -120,4 +120,4 @@ describe("custom client options", function () { expect(error).not.undefined; expect(countPolicy.count).eq(3); }); -}) +}); diff --git a/test/featureFlag.test.ts b/test/featureFlag.test.ts index 22db36af..0383705f 100644 --- a/test/featureFlag.test.ts +++ b/test/featureFlag.test.ts @@ -65,7 +65,8 @@ describe("feature flags", function () { after(() => { restoreMocks(); - }) + }); + it("should load feature flags if enabled", async () => { const connectionString = createMockedConnectionString(); const settings = await load(connectionString, { diff --git a/test/json.test.ts b/test/json.test.ts index 0d7e9484..b25c3392 100644 --- a/test/json.test.ts +++ b/test/json.test.ts @@ -17,7 +17,7 @@ describe("json", function () { afterEach(() => { restoreMocks(); - }) + }); it("should load and parse if content type is application/json", async () => { mockAppConfigurationClientListConfigurationSettings([jsonKeyValue]); @@ -86,4 +86,4 @@ describe("json", function () { expect(settings.get("json.settings.emptyString")).eq("", "is empty string"); expect(settings.get("json.settings.illegalString")).eq("[unclosed", "is illegal string"); }); -}) +}); diff --git a/test/keyvault.test.ts b/test/keyvault.test.ts index 5f70d0a5..eaed0476 100644 --- a/test/keyvault.test.ts +++ b/test/keyvault.test.ts @@ -111,4 +111,4 @@ describe("key vault reference", function () { expect(settings.get("TestKey")).eq("SecretValue"); expect(settings.get("TestKey2")).eq("SecretValue2"); }); -}) +}); diff --git a/test/load.test.ts b/test/load.test.ts index abe7cb3a..5f0b277b 100644 --- a/test/load.test.ts +++ b/test/load.test.ts @@ -85,7 +85,8 @@ describe("load", function () { after(() => { restoreMocks(); - }) + }); + it("should load data from config store with connection string", async () => { const connectionString = createMockedConnectionString(); const settings = await load(connectionString); diff --git a/test/refresh.test.ts b/test/refresh.test.ts index 021ac3ba..2af8842e 100644 --- a/test/refresh.test.ts +++ b/test/refresh.test.ts @@ -33,12 +33,12 @@ describe("dynamic refresh", function () { { value: "30", key: "app.settings.fontSize", label: "prod" } ].map(createMockedKeyValue); mockAppConfigurationClientListConfigurationSettings(mockedKVs); - mockAppConfigurationClientGetConfigurationSetting(mockedKVs) + mockAppConfigurationClientGetConfigurationSetting(mockedKVs); }); afterEach(() => { restoreMocks(); - }) + }); it("should throw error when refresh is not enabled but refresh is called", async () => { const connectionString = createMockedConnectionString(); @@ -331,14 +331,14 @@ describe("dynamic refresh feature flags", function () { afterEach(() => { restoreMocks(); - }) + }); it("should refresh feature flags when enabled", async () => { mockedKVs = [ createMockedFeatureFlag("Beta", { enabled: true }) ]; mockAppConfigurationClientListConfigurationSettings(mockedKVs); - mockAppConfigurationClientGetConfigurationSetting(mockedKVs) + mockAppConfigurationClientGetConfigurationSetting(mockedKVs); const connectionString = createMockedConnectionString(); const settings = await load(connectionString, { diff --git a/test/requestTracing.test.ts b/test/requestTracing.test.ts index 5362d004..fbf5cccb 100644 --- a/test/requestTracing.test.ts +++ b/test/requestTracing.test.ts @@ -42,7 +42,7 @@ describe("request tracing", function () { }); after(() => { - }) + }); it("should have correct user agent prefix", async () => { try { diff --git a/test/utils/testHelper.ts b/test/utils/testHelper.ts index 9f0034e7..6e787dd7 100644 --- a/test/utils/testHelper.ts +++ b/test/utils/testHelper.ts @@ -35,7 +35,7 @@ function _filterKVs(unfilteredKvs: ConfigurationSetting[], listOptions: any) { labelMatched = kv.label === labelFilter; } return keyMatched && labelMatched; - }) + }); } /** @@ -86,7 +86,7 @@ function mockAppConfigurationClientListConfigurationSettings(...pages: Configura }); } } - } + }; } }; @@ -126,7 +126,7 @@ function mockSecretClientGetSecret(uriValueList: [string, string][]) { name: secretName, value: dict.get(url.toString()) } as KeyVaultSecret; - }) + }); } function restoreMocks() { @@ -139,11 +139,11 @@ const createMockedConnectionString = (endpoint = createMockedEndpoint(), secret const toEncodeAsBytes = Buffer.from(secret); const returnValue = toEncodeAsBytes.toString("base64"); return `Endpoint=${endpoint};Id=${id};Secret=${returnValue}`; -} +}; const createMockedTokenCredential = (tenantId = TEST_TENANT_ID, clientId = TEST_CLIENT_ID, clientSecret = TEST_CLIENT_SECRET) => { return new ClientSecretCredential(tenantId, clientId, clientSecret); -} +}; const createMockedKeyVaultReference = (key: string, vaultUri: string): ConfigurationSetting => ({ // https://${vaultName}.vault.azure.net/secrets/${secretName} @@ -210,4 +210,4 @@ export { createMockedFeatureFlag, sleepInMs -} +}; From 0adb5d89ec9ea8825ea872c8b566723c709c8a59 Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Tue, 20 Aug 2024 15:01:20 +0800 Subject: [PATCH 2/2] fix lint --- test/featureFlag.test.ts | 2 +- test/load.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/featureFlag.test.ts b/test/featureFlag.test.ts index 0383705f..5022c0fe 100644 --- a/test/featureFlag.test.ts +++ b/test/featureFlag.test.ts @@ -66,7 +66,7 @@ describe("feature flags", function () { after(() => { restoreMocks(); }); - + it("should load feature flags if enabled", async () => { const connectionString = createMockedConnectionString(); const settings = await load(connectionString, { diff --git a/test/load.test.ts b/test/load.test.ts index 5f0b277b..2bd0e58d 100644 --- a/test/load.test.ts +++ b/test/load.test.ts @@ -86,7 +86,7 @@ describe("load", function () { after(() => { restoreMocks(); }); - + it("should load data from config store with connection string", async () => { const connectionString = createMockedConnectionString(); const settings = await load(connectionString);