From 51b1efc04848ff9b9b9facc45606eeae628ca26a Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Fri, 20 Nov 2020 01:51:01 -0800 Subject: [PATCH 01/19] app configuration test segregation --- .../app-configuration/test/{ => internal}/helpers.spec.ts | 0 .../app-configuration/test/{ => internal}/package.spec.ts | 2 +- .../test/{ => internal}/tracingHelpers.spec.ts | 0 .../test/policies/throttlingRetryPolicyTests.spec.ts | 2 +- .../app-configuration/test/{ => public}/auth.spec.ts | 0 .../app-configuration/test/{ => public}/etags.spec.ts | 4 ++-- .../test/{ => public}/index.readonlytests.spec.ts | 4 ++-- .../app-configuration/test/{ => public}/index.spec.ts | 4 ++-- .../test/{ => public}/throwOrNotThrow.spec.ts | 4 ++-- .../app-configuration/test/{ => utils}/testHelpers.ts | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) rename sdk/appconfiguration/app-configuration/test/{ => internal}/helpers.spec.ts (100%) rename sdk/appconfiguration/app-configuration/test/{ => internal}/package.spec.ts (92%) rename sdk/appconfiguration/app-configuration/test/{ => internal}/tracingHelpers.spec.ts (100%) rename sdk/appconfiguration/app-configuration/test/{ => public}/auth.spec.ts (100%) rename sdk/appconfiguration/app-configuration/test/{ => public}/etags.spec.ts (98%) rename sdk/appconfiguration/app-configuration/test/{ => public}/index.readonlytests.spec.ts (96%) rename sdk/appconfiguration/app-configuration/test/{ => public}/index.spec.ts (99%) rename sdk/appconfiguration/app-configuration/test/{ => public}/throwOrNotThrow.spec.ts (98%) rename sdk/appconfiguration/app-configuration/test/{ => utils}/testHelpers.ts (96%) diff --git a/sdk/appconfiguration/app-configuration/test/helpers.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts similarity index 100% rename from sdk/appconfiguration/app-configuration/test/helpers.spec.ts rename to sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts diff --git a/sdk/appconfiguration/app-configuration/test/package.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts similarity index 92% rename from sdk/appconfiguration/app-configuration/test/package.spec.ts rename to sdk/appconfiguration/app-configuration/test/internal/package.spec.ts index bdcfba4b28fb..417c99621239 100644 --- a/sdk/appconfiguration/app-configuration/test/package.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts @@ -2,7 +2,7 @@ import { join } from "path"; import * as assert from "assert"; import { isNode } from "@azure/core-http"; -import { packageVersion } from "../src/appConfigurationClient"; +import { packageVersion } from "../../src/appConfigurationClient"; describe("packagejson related tests", () => { // if this test is failing you need to update the contant `packageVersion` referenced above diff --git a/sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts similarity index 100% rename from sdk/appconfiguration/app-configuration/test/tracingHelpers.spec.ts rename to sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts diff --git a/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts b/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts index 661d3e2527df..b10cc8835b55 100644 --- a/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts @@ -12,7 +12,7 @@ import { RestError } from "@azure/core-http"; import { ThrottlingRetryPolicy, getDelayInMs } from "../../src/policies/throttlingRetryPolicy"; -import { assertThrowsRestError } from "../testHelpers"; +import { assertThrowsRestError } from "../utils/testHelpers"; describe("ThrottlingRetryPolicy", () => { class PassThroughPolicy { diff --git a/sdk/appconfiguration/app-configuration/test/auth.spec.ts b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts similarity index 100% rename from sdk/appconfiguration/app-configuration/test/auth.spec.ts rename to sdk/appconfiguration/app-configuration/test/public/auth.spec.ts diff --git a/sdk/appconfiguration/app-configuration/test/etags.spec.ts b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts similarity index 98% rename from sdk/appconfiguration/app-configuration/test/etags.spec.ts rename to sdk/appconfiguration/app-configuration/test/public/etags.spec.ts index b5f392d760e8..b4cf48c70b78 100644 --- a/sdk/appconfiguration/app-configuration/test/etags.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts @@ -1,13 +1,13 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { AppConfigurationClient } from "../src"; +import { AppConfigurationClient } from "../../src"; import { startRecorder, createAppConfigurationClientForTests, deleteKeyCompletely, assertThrowsRestError -} from "./testHelpers"; +} from "../utils/testHelpers"; import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/index.readonlytests.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts similarity index 96% rename from sdk/appconfiguration/app-configuration/test/index.readonlytests.spec.ts rename to sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts index b1ba3e010de7..029271ad420c 100644 --- a/sdk/appconfiguration/app-configuration/test/index.readonlytests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts @@ -4,8 +4,8 @@ import { deleteKeyCompletely, assertThrowsAbortError, startRecorder -} from "./testHelpers"; -import { AppConfigurationClient } from "../src"; +} from "../utils/testHelpers"; +import { AppConfigurationClient } from "../../src"; import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/index.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts similarity index 99% rename from sdk/appconfiguration/app-configuration/test/index.spec.ts rename to sdk/appconfiguration/app-configuration/test/public/index.spec.ts index 6f33a6b07d76..3165f5a49dfa 100644 --- a/sdk/appconfiguration/app-configuration/test/index.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts @@ -10,8 +10,8 @@ import { assertThrowsRestError, assertThrowsAbortError, startRecorder -} from "./testHelpers"; -import { AppConfigurationClient, ConfigurationSetting } from "../src"; +} from "../utils/testHelpers"; +import { AppConfigurationClient, ConfigurationSetting } from "../../src"; import { delay } from "@azure/core-http"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/throwOrNotThrow.spec.ts b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts similarity index 98% rename from sdk/appconfiguration/app-configuration/test/throwOrNotThrow.spec.ts rename to sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts index 8cbd12ca2523..7c4b61b951fb 100644 --- a/sdk/appconfiguration/app-configuration/test/throwOrNotThrow.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts @@ -1,10 +1,10 @@ -import { AppConfigurationClient, ConfigurationSetting } from "../src"; +import { AppConfigurationClient, ConfigurationSetting } from "../../src"; import { createAppConfigurationClientForTests, deleteKeyCompletely, assertThrowsRestError, startRecorder -} from "./testHelpers"; +} from "../utils/testHelpers"; import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts similarity index 96% rename from sdk/appconfiguration/app-configuration/test/testHelpers.ts rename to sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts index d7b91f40ba1d..cac176db6521 100644 --- a/sdk/appconfiguration/app-configuration/test/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { AppConfigurationClient } from "../src"; +import { AppConfigurationClient } from "../../src"; import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../src"; +import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../../src"; import { env, isPlaybackMode, RecorderEnvironmentSetup, record } from "@azure/test-utils-recorder"; import * as assert from "assert"; @@ -12,7 +12,7 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { RestError } from "@azure/core-http"; import { DefaultAzureCredential, TokenCredential } from "@azure/identity"; -import { InternalAppConfigurationClientOptions } from "../src/appConfigurationClient"; +import { InternalAppConfigurationClientOptions } from "../../src"; dotenv.config(); let connectionStringNotPresentWarning = false; From 362fa0bed1e607d60a4fc3ec6a77b416d5dc24c3 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 11:12:37 -0800 Subject: [PATCH 02/19] clean up internal references from public tests --- .../test/internal/helpers.spec.ts | 4 ++-- .../app-configuration/test/internal/http.spec.ts | 14 ++++++++------ .../test/internal/tracingHelpers.spec.ts | 2 +- .../app-configuration/test/public/auth.spec.ts | 4 ++-- .../app-configuration/test/utils/testHelpers.ts | 7 +++---- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts index f3660d731014..c5a283b17982 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/helpers.spec.ts @@ -10,9 +10,9 @@ import { transformKeyValue, transformKeyValueResponseWithStatusCode, transformKeyValueResponse -} from "../src/internal/helpers"; +} from "../../src/internal/helpers"; import * as assert from "assert"; -import { ConfigurationSetting, HttpResponseField, HttpResponseFields } from "../src"; +import { ConfigurationSetting, HttpResponseField, HttpResponseFields } from "../../src"; import { HttpHeaders } from "@azure/core-http"; describe("helper methods", () => { diff --git a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts index 6d161ccbc37d..22946d2cd4c3 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts @@ -5,12 +5,13 @@ import { parseSyncToken, SyncTokens } from "../../src/internal/synctokenpolicy"; import * as assert from "assert"; import { AppConfigurationClient } from "../../src"; import nock from "nock"; -import { getUserAgentPrefix, packageVersion } from "../../src/appConfigurationClient"; +import { getUserAgentPrefix, InternalAppConfigurationClientOptions, packageVersion } from "../../src/appConfigurationClient"; import { createAppConfigurationClientForTests, assertThrowsRestError, startRecorder -} from "../testHelpers"; +} from "../utils/testHelpers"; +//import InternalAppConfigurationClientOptions import * as chai from "chai"; import { Recorder } from "@azure/test-utils-recorder"; @@ -103,7 +104,8 @@ describe("http request related tests", function() { beforeEach(function() { recorder = startRecorder(this); - client = createAppConfigurationClientForTests() || this.skip(); + client = createAppConfigurationClientForTests({ + }) || this.skip(); }); afterEach(async function() { @@ -146,9 +148,9 @@ describe("http request related tests", function() { syncTokens = new SyncTokens(); client = - createAppConfigurationClientForTests({ - syncTokens: syncTokens - }) || this.skip(); + createAppConfigurationClientForTests({ + syncTokens: syncTokens + }) || this.skip(); nock.recorder.clear(); nock.restore(); diff --git a/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts index eae3cc37387c..6e2c66ed70e3 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/tracingHelpers.spec.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -import { Spanner } from "../src/internal/tracingHelpers"; +import { Spanner } from "../../src/internal/tracingHelpers"; import { RestError } from "@azure/core-http"; import { getTracer } from "@azure/core-tracing"; import { SpanKind, CanonicalCode } from "@opentelemetry/api"; diff --git a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts index 774a1cb4be88..7c19b35f5a63 100644 --- a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { AppConfigurationClient } from "../src"; -import { startRecorder, getTokenAuthenticationCredential, CredsAndEndpoint } from "./testHelpers"; +import { AppConfigurationClient } from "../../src"; +import { startRecorder, getTokenAuthenticationCredential, CredsAndEndpoint } from "../utils/testHelpers"; import * as assert from "assert"; import { Recorder, isPlaybackMode } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts index cac176db6521..3c46fd6c131d 100644 --- a/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { AppConfigurationClient } from "../../src"; +import { AppConfigurationClient, AppConfigurationClientOptions } from "../../src"; import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../../src"; import { env, isPlaybackMode, RecorderEnvironmentSetup, record } from "@azure/test-utils-recorder"; @@ -12,7 +12,6 @@ import * as assert from "assert"; import * as dotenv from "dotenv"; import { RestError } from "@azure/core-http"; import { DefaultAzureCredential, TokenCredential } from "@azure/identity"; -import { InternalAppConfigurationClientOptions } from "../../src"; dotenv.config(); let connectionStringNotPresentWarning = false; @@ -70,8 +69,8 @@ export function getTokenAuthenticationCredential(): CredsAndEndpoint | undefined }; } -export function createAppConfigurationClientForTests( - options?: InternalAppConfigurationClientOptions +export function createAppConfigurationClientForTests( + options?: Options ): AppConfigurationClient | undefined { const connectionString = env["APPCONFIG_CONNECTION_STRING"]; From c40175e58a006e1e2c537a557844a0780b566391 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 11:13:34 -0800 Subject: [PATCH 03/19] formatting changes and enable min max tests --- .../test/internal/http.spec.ts | 19 ++++++++++++------- .../test/public/auth.spec.ts | 6 +++++- .../app-configuration/tests.yml | 1 + 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts index 22946d2cd4c3..4ffbb0fd40eb 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts @@ -5,13 +5,17 @@ import { parseSyncToken, SyncTokens } from "../../src/internal/synctokenpolicy"; import * as assert from "assert"; import { AppConfigurationClient } from "../../src"; import nock from "nock"; -import { getUserAgentPrefix, InternalAppConfigurationClientOptions, packageVersion } from "../../src/appConfigurationClient"; +import { + getUserAgentPrefix, + InternalAppConfigurationClientOptions, + packageVersion +} from "../../src/appConfigurationClient"; import { createAppConfigurationClientForTests, assertThrowsRestError, startRecorder } from "../utils/testHelpers"; -//import InternalAppConfigurationClientOptions +//import InternalAppConfigurationClientOptions import * as chai from "chai"; import { Recorder } from "@azure/test-utils-recorder"; @@ -104,8 +108,9 @@ describe("http request related tests", function() { beforeEach(function() { recorder = startRecorder(this); - client = createAppConfigurationClientForTests({ - }) || this.skip(); + client = + createAppConfigurationClientForTests({}) || + this.skip(); }); afterEach(async function() { @@ -148,9 +153,9 @@ describe("http request related tests", function() { syncTokens = new SyncTokens(); client = - createAppConfigurationClientForTests({ - syncTokens: syncTokens - }) || this.skip(); + createAppConfigurationClientForTests({ + syncTokens: syncTokens + }) || this.skip(); nock.recorder.clear(); nock.restore(); diff --git a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts index 7c19b35f5a63..b43d1f0a9a46 100644 --- a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts @@ -2,7 +2,11 @@ // Licensed under the MIT license. import { AppConfigurationClient } from "../../src"; -import { startRecorder, getTokenAuthenticationCredential, CredsAndEndpoint } from "../utils/testHelpers"; +import { + startRecorder, + getTokenAuthenticationCredential, + CredsAndEndpoint +} from "../utils/testHelpers"; import * as assert from "assert"; import { Recorder, isPlaybackMode } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/tests.yml b/sdk/appconfiguration/app-configuration/tests.yml index 2f1e6d7fe2af..f47704e9ce07 100644 --- a/sdk/appconfiguration/app-configuration/tests.yml +++ b/sdk/appconfiguration/app-configuration/tests.yml @@ -7,6 +7,7 @@ extends: ResourceServiceDirectory: appconfiguration TestBrowser: true TestSamples: false + TestMinMax: true EnvVars: AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) From 14844df05b61d8c1caf730f3c85a149fac6d76d6 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 13:51:56 -0800 Subject: [PATCH 04/19] move throttling policy to internal --- .../policies/throttlingRetryPolicyTests.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename sdk/appconfiguration/app-configuration/test/{ => internal}/policies/throttlingRetryPolicyTests.spec.ts (97%) diff --git a/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts similarity index 97% rename from sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts rename to sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts index b10cc8835b55..ed4150ca9513 100644 --- a/sdk/appconfiguration/app-configuration/test/policies/throttlingRetryPolicyTests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts @@ -11,8 +11,8 @@ import { RequestPolicy, RestError } from "@azure/core-http"; -import { ThrottlingRetryPolicy, getDelayInMs } from "../../src/policies/throttlingRetryPolicy"; -import { assertThrowsRestError } from "../utils/testHelpers"; +import { ThrottlingRetryPolicy, getDelayInMs } from "../../../src/policies/throttlingRetryPolicy"; +import { assertThrowsRestError } from "../../utils/testHelpers"; describe("ThrottlingRetryPolicy", () => { class PassThroughPolicy { From b3e45591bccfd7c024f10f690039e79a0b6e9b21 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 13:56:01 -0800 Subject: [PATCH 05/19] cleanup code --- .../app-configuration/test/internal/http.spec.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts index 4ffbb0fd40eb..9e57f20ee6b9 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts @@ -15,7 +15,7 @@ import { assertThrowsRestError, startRecorder } from "../utils/testHelpers"; -//import InternalAppConfigurationClientOptions + import * as chai from "chai"; import { Recorder } from "@azure/test-utils-recorder"; @@ -108,9 +108,7 @@ describe("http request related tests", function() { beforeEach(function() { recorder = startRecorder(this); - client = - createAppConfigurationClientForTests({}) || - this.skip(); + client = createAppConfigurationClientForTests() || this.skip(); }); afterEach(async function() { From e33d6a7745824bcd6f64f5e776789f86eb656a27 Mon Sep 17 00:00:00 2001 From: KarishmaGhiya Date: Wed, 25 Nov 2020 13:57:15 -0800 Subject: [PATCH 06/19] Update sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts Co-authored-by: chradek <51000525+chradek@users.noreply.github.com> --- .../app-configuration/test/utils/testHelpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts index 3c46fd6c131d..a4a8f8bc92d8 100644 --- a/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts @@ -69,7 +69,7 @@ export function getTokenAuthenticationCredential(): CredsAndEndpoint | undefined }; } -export function createAppConfigurationClientForTests( +export function createAppConfigurationClientForTests( options?: Options ): AppConfigurationClient | undefined { const connectionString = env["APPCONFIG_CONNECTION_STRING"]; From 2591dcf92d11828c5eff382f1ec96203e3cb2336 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 14:20:43 -0800 Subject: [PATCH 07/19] update relative path for package.json for package version user agent test --- .../app-configuration/test/internal/package.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts index 417c99621239..21a7acc022e9 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts @@ -18,11 +18,11 @@ describe("packagejson related tests", () => { try { // For integration tests - const packageJsonFilePath = join(__dirname, "../../package.json"); + const packageJsonFilePath = join(__dirname, "../../../package.json"); packageJsonContents = require(packageJsonFilePath); } catch (e) { // For unit tests - const packageJsonFilePath = join(__dirname, "../package.json"); + const packageJsonFilePath = join(__dirname, "../../package.json"); packageJsonContents = require(packageJsonFilePath); } From da7f10762696d7035967dc95d2ed4b3abed7cd58 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 14:51:43 -0800 Subject: [PATCH 08/19] rename client variable --- .../test/public/auth.spec.ts | 4 +- .../test/public/etags.spec.ts | 62 ++++---- .../test/public/index.readonlytests.spec.ts | 24 +-- .../test/public/index.spec.ts | 144 +++++++++--------- .../test/public/throwOrNotThrow.spec.ts | 32 ++-- 5 files changed, 133 insertions(+), 133 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts index b43d1f0a9a46..dccf166f1595 100644 --- a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts @@ -34,14 +34,14 @@ describe("Authentication", () => { if (isPlaybackMode()) { this.skip(); } - const client = new AppConfigurationClient( + const appConfigClient = new AppConfigurationClient( credsAndEndpoint.endpoint, credsAndEndpoint.credential ); // it doesn't matter if any data comes in so long as we were // able to connect and call the service - await client.addConfigurationSetting({ + await appConfigClient.addConfigurationSetting({ key: `token-authentication-test-${Date.now()}`, value: "hello" }); diff --git a/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts index b4cf48c70b78..8e9fc74f3358 100644 --- a/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts @@ -12,43 +12,43 @@ import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; describe("etags", () => { - let client: AppConfigurationClient; + let appConfigClient: AppConfigurationClient; let recorder: Recorder; let key: string; beforeEach(async function() { recorder = startRecorder(this); key = recorder.getUniqueName("etags"); - client = createAppConfigurationClientForTests() || this.skip(); - await client.addConfigurationSetting({ + appConfigClient = createAppConfigurationClientForTests() || this.skip(); + await appConfigClient.addConfigurationSetting({ key: key, value: "some value" }); }); afterEach(async function() { - await deleteKeyCompletely([key], client); + await deleteKeyCompletely([key], appConfigClient); await recorder.stop(); }); // etag usage is 'opt-in' via the onlyIfChanged/onlyIfUnchanged options for certain calls // by default no etags are used. it("Get and set by default doesn't use etags", async () => { - const addedSetting = await client.getConfigurationSetting({ key }); + const addedSetting = await appConfigClient.getConfigurationSetting({ key }); // by default - ignores the etag in 'addedSetting.etag' so last one in // wins addedSetting.value = "some new value!"; - await client.setConfigurationSetting(addedSetting); + await appConfigClient.setConfigurationSetting(addedSetting); }); it("Get and set, enabling etag checking using onlyIfUnchanged", async () => { - const addedSetting = await client.getConfigurationSetting({ key }); + const addedSetting = await appConfigClient.getConfigurationSetting({ key }); addedSetting.value = "some new value!"; // etag of the remote setting matches what we have so we're okay to update - const newlyUpdatedSetting = await client.setConfigurationSetting(addedSetting, { + const newlyUpdatedSetting = await appConfigClient.setConfigurationSetting(addedSetting, { onlyIfUnchanged: true }); assert.equal(newlyUpdatedSetting.value, addedSetting.value); @@ -61,19 +61,19 @@ describe("etags", () => { // trying to save with a non-matching etag (when we specifically said to only save if // nothing has changed) will result in a 412 (precondition failed) await assertThrowsRestError( - () => client.setConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), + () => appConfigClient.setConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), 412 ); }); it("set with an old etag will throw RestError", async () => { - const addedSetting = await client.getConfigurationSetting({ key }); + const addedSetting = await appConfigClient.getConfigurationSetting({ key }); addedSetting.value = "some new value!"; // sneaky process B comes in and does an update (ie, does NOT // enable the etag) - await client.setConfigurationSetting({ + await appConfigClient.setConfigurationSetting({ ...addedSetting, value: "sneaky user updated the field" }); @@ -82,7 +82,7 @@ describe("etags", () => { // so now this update (with the original etag) will throw. await assertThrowsRestError( () => - client.setConfigurationSetting(addedSetting, { + appConfigClient.setConfigurationSetting(addedSetting, { onlyIfUnchanged: true }), 412, @@ -91,13 +91,13 @@ describe("etags", () => { }); it("get using ifNoneMatch to only get the setting if it's changed (ie: safe GET)", async () => { - const originalSetting = await client.setConfigurationSetting({ + const originalSetting = await appConfigClient.setConfigurationSetting({ key: key, value: "world" }); // only get the setting if it changed (it hasn't) - const response = await client.getConfigurationSetting(originalSetting, { + const response = await appConfigClient.getConfigurationSetting(originalSetting, { onlyIfChanged: true }); @@ -115,9 +115,9 @@ describe("etags", () => { assert.ok(!response.value); // let's update it and then try again - await client.setConfigurationSetting({ key: key, value: "new world" }); + await appConfigClient.setConfigurationSetting({ key: key, value: "new world" }); - const updatedSetting = await client.getConfigurationSetting({ key }); + const updatedSetting = await appConfigClient.getConfigurationSetting({ key }); assert.notEqual( originalSetting.etag, @@ -128,7 +128,7 @@ describe("etags", () => { assert.equal(200, updatedSetting.statusCode); // only get the setting if it changed (it has!) - const configurationSetting = await client.getConfigurationSetting(originalSetting, { + const configurationSetting = await appConfigClient.getConfigurationSetting(originalSetting, { onlyIfChanged: true }); @@ -138,7 +138,7 @@ describe("etags", () => { }); it("(set|clear)readonly using etags", async () => { - const addedSetting = await client.getConfigurationSetting({ key }); + const addedSetting = await appConfigClient.getConfigurationSetting({ key }); const badEtagSetting = { ...addedSetting, @@ -148,47 +148,47 @@ describe("etags", () => { // etag won't match so we get a precondition failed await assertThrowsRestError( () => - client.setReadOnly(badEtagSetting, true, { + appConfigClient.setReadOnly(badEtagSetting, true, { onlyIfUnchanged: true }), 412 ); - let actualSetting = await client.getConfigurationSetting(badEtagSetting); + let actualSetting = await appConfigClient.getConfigurationSetting(badEtagSetting); // should not be read-only since it didn't match assert.ok(!actualSetting.isReadOnly); // and now that the etag matches we should be able to set the // key's value to read-onlly - await client.setReadOnly(addedSetting, true, { onlyIfUnchanged: true }); - actualSetting = await client.getConfigurationSetting(addedSetting); + await appConfigClient.setReadOnly(addedSetting, true, { onlyIfUnchanged: true }); + actualSetting = await appConfigClient.getConfigurationSetting(addedSetting); assert.ok(actualSetting.isReadOnly); // now let's try to clear it (using a bogus etag so it won't match) await assertThrowsRestError( () => - client.setReadOnly(badEtagSetting, false, { + appConfigClient.setReadOnly(badEtagSetting, false, { onlyIfUnchanged: true }), 412 ); // ...still readOnly - actualSetting = await client.getConfigurationSetting(addedSetting); + actualSetting = await appConfigClient.getConfigurationSetting(addedSetting); assert.ok(actualSetting.isReadOnly); // now we'll use the right etag (from the setting we just retrieved) - await client.setReadOnly(actualSetting, false, { + await appConfigClient.setReadOnly(actualSetting, false, { onlyIfUnchanged: true }); // and now it's no longer readOnly - actualSetting = await client.getConfigurationSetting(addedSetting); + actualSetting = await appConfigClient.getConfigurationSetting(addedSetting); assert.ok(!actualSetting.isReadOnly); }); it("delete using etags", async () => { - const addedSetting = await client.getConfigurationSetting({ key }); + const addedSetting = await appConfigClient.getConfigurationSetting({ key }); const badEtagSetting = { ...addedSetting, @@ -196,17 +196,17 @@ describe("etags", () => { }; await assertThrowsRestError( - () => client.deleteConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), + () => appConfigClient.deleteConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), 412 ); // obviously the setting is still there (or else this would throw) - await client.getConfigurationSetting({ key }); + await appConfigClient.getConfigurationSetting({ key }); // this time we'll pass in the proper setting with the right etag - await client.deleteConfigurationSetting(addedSetting, { onlyIfUnchanged: true }); + await appConfigClient.deleteConfigurationSetting(addedSetting, { onlyIfUnchanged: true }); // and now the setting isn't found - await assertThrowsRestError(() => client.getConfigurationSetting({ key }), 404); + await assertThrowsRestError(() => appConfigClient.getConfigurationSetting({ key }), 404); }); }); diff --git a/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts index 029271ad420c..b027f7b26b50 100644 --- a/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts @@ -10,7 +10,7 @@ import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; describe("AppConfigurationClient (set|clear)ReadOnly", () => { - let client: AppConfigurationClient; + let appConfigClient: AppConfigurationClient; let recorder: Recorder; const testConfigSetting = { key: "", @@ -21,26 +21,26 @@ describe("AppConfigurationClient (set|clear)ReadOnly", () => { beforeEach(async function() { recorder = startRecorder(this); testConfigSetting.key = recorder.getUniqueName("readOnlyTests"); - client = createAppConfigurationClientForTests() || this.skip(); + appConfigClient = createAppConfigurationClientForTests() || this.skip(); // before it's set to read only we can set it all we want - await client.setConfigurationSetting(testConfigSetting); + await appConfigClient.setConfigurationSetting(testConfigSetting); }); afterEach(async function() { - await deleteKeyCompletely([testConfigSetting.key], client); + await deleteKeyCompletely([testConfigSetting.key], appConfigClient); await recorder.stop(); }); it("basic", async function() { - let storedSetting = await client.getConfigurationSetting({ + let storedSetting = await appConfigClient.getConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }); assert.ok(!storedSetting.isReadOnly); - await client.setReadOnly(testConfigSetting, true); + await appConfigClient.setReadOnly(testConfigSetting, true); - storedSetting = await client.getConfigurationSetting({ + storedSetting = await appConfigClient.getConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }); @@ -48,13 +48,13 @@ describe("AppConfigurationClient (set|clear)ReadOnly", () => { // any modification related methods throw exceptions await assertThrowsRestError( - () => client.setConfigurationSetting(testConfigSetting), + () => appConfigClient.setConfigurationSetting(testConfigSetting), 409, "Set should fail because the setting is read-only" ); await assertThrowsRestError( () => - client.deleteConfigurationSetting({ + appConfigClient.deleteConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }), @@ -64,16 +64,16 @@ describe("AppConfigurationClient (set|clear)ReadOnly", () => { }); it("accepts operation options", async function() { - await client.getConfigurationSetting({ + await appConfigClient.getConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }); await assertThrowsAbortError(async () => { - await client.setReadOnly(testConfigSetting, true, { requestOptions: { timeout: 1 } }); + await appConfigClient.setReadOnly(testConfigSetting, true, { requestOptions: { timeout: 1 } }); }); await assertThrowsAbortError(async () => { - await client.setReadOnly(testConfigSetting, false, { requestOptions: { timeout: 1 } }); + await appConfigClient.setReadOnly(testConfigSetting, false, { requestOptions: { timeout: 1 } }); }); }); }); diff --git a/sdk/appconfiguration/app-configuration/test/public/index.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts index 3165f5a49dfa..ad7305238e96 100644 --- a/sdk/appconfiguration/app-configuration/test/public/index.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts @@ -16,12 +16,12 @@ import { delay } from "@azure/core-http"; import { Recorder } from "@azure/test-utils-recorder"; describe("AppConfigurationClient", () => { - let client: AppConfigurationClient; + let appConfigClient: AppConfigurationClient; let recorder: Recorder; beforeEach(function() { recorder = startRecorder(this); - client = createAppConfigurationClientForTests() || this.skip(); + appConfigClient = createAppConfigurationClientForTests() || this.skip(); }); afterEach(async function() { @@ -32,7 +32,7 @@ describe("AppConfigurationClient", () => { it("Add and query a setting without a label", async () => { const key = recorder.getUniqueName("noLabelTests"); - await client.addConfigurationSetting({ key, value: "added" }); + await appConfigClient.addConfigurationSetting({ key, value: "added" }); await compare({ key, @@ -40,10 +40,10 @@ describe("AppConfigurationClient", () => { label: undefined }); - await client.deleteConfigurationSetting({ key }); + await appConfigClient.deleteConfigurationSetting({ key }); // will recreate the setting - await client.setConfigurationSetting({ key, value: "set" }); + await appConfigClient.setConfigurationSetting({ key, value: "set" }); await compare({ key, @@ -52,7 +52,7 @@ describe("AppConfigurationClient", () => { }); // and now acts as a wholesale update - await client.setConfigurationSetting({ key, value: "set a second time" }); + await appConfigClient.setConfigurationSetting({ key, value: "set a second time" }); await compare({ key, @@ -60,11 +60,11 @@ describe("AppConfigurationClient", () => { label: undefined }); - await client.deleteConfigurationSetting({ key }); + await appConfigClient.deleteConfigurationSetting({ key }); }); async function compare(expected: { key: string; value: string; label?: string }) { - const actualSettings = await client.getConfigurationSetting(expected); + const actualSettings = await appConfigClient.getConfigurationSetting(expected); assert.equal(expected.key, actualSettings.key); assert.equal(expected.value, actualSettings.value); @@ -75,7 +75,7 @@ describe("AppConfigurationClient", () => { describe("addConfigurationSetting", () => { it("sample works", async () => { const key = recorder.getUniqueName("addConfigSample"); - const result = await client.setConfigurationSetting({ + const result = await appConfigClient.setConfigurationSetting({ key, value: "MyValue" }); @@ -87,7 +87,7 @@ describe("AppConfigurationClient", () => { const key = recorder.getUniqueName("addConfigTest"); const label = "MyLabel"; const value = "MyValue"; - const result = await client.addConfigurationSetting({ key, label, value }); + const result = await appConfigClient.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -106,14 +106,14 @@ describe("AppConfigurationClient", () => { assert.ok(!(result as any).eTag); assert.ok(result.etag); - await client.deleteConfigurationSetting({ key, label }); + await appConfigClient.deleteConfigurationSetting({ key, label }); }); it("throws an error if the configuration setting already exists", async () => { const key = recorder.getUniqueName("addConfigTestTwice"); const label = "test"; const value = "foo"; - const result = await client.addConfigurationSetting({ key, label, value }); + const result = await appConfigClient.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -129,13 +129,13 @@ describe("AppConfigurationClient", () => { // attempt to add the same setting try { - await client.addConfigurationSetting({ key, label, value }); + await appConfigClient.addConfigurationSetting({ key, label, value }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); } - await client.deleteConfigurationSetting({ key, label }); + await appConfigClient.deleteConfigurationSetting({ key, label }); }); it("accepts operation options", async () => { @@ -143,7 +143,7 @@ describe("AppConfigurationClient", () => { const label = "test"; const value = "foo"; await assertThrowsAbortError(async () => { - await client.addConfigurationSetting( + await appConfigClient.addConfigurationSetting( { key, label, value }, { requestOptions: { @@ -162,7 +162,7 @@ describe("AppConfigurationClient", () => { const value = "MyValue"; // create configuration - const result = await client.addConfigurationSetting({ key, label, value }); + const result = await appConfigClient.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -177,12 +177,12 @@ describe("AppConfigurationClient", () => { ); // delete configuration - const deletedSetting = await client.deleteConfigurationSetting(result); + const deletedSetting = await appConfigClient.deleteConfigurationSetting(result); assert.equal(200, deletedSetting._response.status); // confirm setting no longer exists try { - await client.getConfigurationSetting({ key, label }); + await appConfigClient.getConfigurationSetting({ key, label }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); @@ -195,7 +195,7 @@ describe("AppConfigurationClient", () => { const value = "foo"; // create configuration - const result = await client.addConfigurationSetting({ key, label, value }); + const result = await appConfigClient.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -210,7 +210,7 @@ describe("AppConfigurationClient", () => { ); // delete configuration - await client.deleteConfigurationSetting( + await appConfigClient.deleteConfigurationSetting( { key, label @@ -220,7 +220,7 @@ describe("AppConfigurationClient", () => { // confirm setting no longer exists try { - await client.getConfigurationSetting({ key, label }); + await appConfigClient.getConfigurationSetting({ key, label }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); @@ -232,7 +232,7 @@ describe("AppConfigurationClient", () => { const label = "test"; // delete configuration - const response = await client.deleteConfigurationSetting({ key, label }); + const response = await appConfigClient.deleteConfigurationSetting({ key, label }); // we hoist this code up to the top in case users want to check if the // delete actually happened (status code: 200) or if the setting wasn't @@ -248,7 +248,7 @@ describe("AppConfigurationClient", () => { const value = "foo"; // create configuration - const result = await client.addConfigurationSetting({ key, label, value }); + const result = await appConfigClient.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -265,14 +265,14 @@ describe("AppConfigurationClient", () => { // delete configuration await assertThrowsRestError( () => - client.deleteConfigurationSetting( + appConfigClient.deleteConfigurationSetting( { key, label, etag: "invalid" }, { onlyIfUnchanged: true } ), 412 ); - await client.deleteConfigurationSetting({ key, label }); + await appConfigClient.deleteConfigurationSetting({ key, label }); }); it("accepts operation options", async () => { @@ -281,11 +281,11 @@ describe("AppConfigurationClient", () => { const value = "MyValue"; // create configuration - const result = await client.addConfigurationSetting({ key, label, value }); + const result = await appConfigClient.addConfigurationSetting({ key, label, value }); // delete configuration await assertThrowsAbortError(async () => { - await client.deleteConfigurationSetting(result, { + await appConfigClient.deleteConfigurationSetting(result, { requestOptions: { timeout: 1 } }); }); @@ -304,7 +304,7 @@ describe("AppConfigurationClient", () => { const contentType = "application/json"; // create configuration - const result = await client.addConfigurationSetting({ key, label, value, contentType, tags }); + const result = await appConfigClient.addConfigurationSetting({ key, label, value, contentType, tags }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -339,7 +339,7 @@ describe("AppConfigurationClient", () => { ); // retrieve the value from the service - const remoteResult = await client.getConfigurationSetting({ key, label }); + const remoteResult = await appConfigClient.getConfigurationSetting({ key, label }); assert.equal( remoteResult.key, key, @@ -376,7 +376,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from getConfigurationSetting()." ); - await client.deleteConfigurationSetting({ key, label }); + await appConfigClient.deleteConfigurationSetting({ key, label }); }); it("throws when retrieving a non-existent configuration setting", async () => { @@ -385,7 +385,7 @@ describe("AppConfigurationClient", () => { // retrieve the value from the service try { - await client.getConfigurationSetting({ key, label }); + await appConfigClient.getConfigurationSetting({ key, label }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); @@ -401,28 +401,28 @@ describe("AppConfigurationClient", () => { car: "caz" }; const contentType = "application/json"; - await client.addConfigurationSetting({ key, label, value, contentType, tags }); + await appConfigClient.addConfigurationSetting({ key, label, value, contentType, tags }); await assertThrowsAbortError(async () => { - await client.getConfigurationSetting({ key, label }, { requestOptions: { timeout: 1 } }); + await appConfigClient.getConfigurationSetting({ key, label }, { requestOptions: { timeout: 1 } }); }); }); it("by date", async () => { const key = recorder.getUniqueName("getConfigurationSettingByDate"); - const initialSetting = await client.setConfigurationSetting({ + const initialSetting = await appConfigClient.setConfigurationSetting({ key, value: "value1" }); await delay(1000); - await client.setConfigurationSetting({ + await appConfigClient.setConfigurationSetting({ key, value: "value2" }); - const settingAtPointInTime = await client.getConfigurationSetting( + const settingAtPointInTime = await appConfigClient.getConfigurationSetting( { key }, { acceptDateTime: initialSetting.lastModified @@ -465,20 +465,20 @@ describe("AppConfigurationClient", () => { productionASettingId.key = keys.listConfigSettingA; productionASettingId.label = uniqueLabel; - await client.addConfigurationSetting(productionASettingId); - await client.setReadOnly(productionASettingId, true); + await appConfigClient.addConfigurationSetting(productionASettingId); + await appConfigClient.setReadOnly(productionASettingId, true); - listConfigSettingA = await client.addConfigurationSetting({ + listConfigSettingA = await appConfigClient.addConfigurationSetting({ key: keys.listConfigSettingA, value: "[A] value" }); - await client.addConfigurationSetting({ + await appConfigClient.addConfigurationSetting({ key: keys.listConfigSettingB, label: uniqueLabel, value: "[B] production value" }); - await client.addConfigurationSetting({ + await appConfigClient.addConfigurationSetting({ key: keys.listConfigSettingB, value: "[B] value" }); @@ -486,18 +486,18 @@ describe("AppConfigurationClient", () => { after(async () => { try { - await deleteKeyCompletely([keys.listConfigSettingA, keys.listConfigSettingB], client); + await deleteKeyCompletely([keys.listConfigSettingA, keys.listConfigSettingB], appConfigClient); } catch (e) {} }); it("undefined doesn't throw and will just return everything", async () => { - const settingsIterator = client.listConfigurationSettings(); + const settingsIterator = appConfigClient.listConfigurationSettings(); await settingsIterator.next(); }); it("exact match on label", async () => { // query with a direct label match - let byLabelIterator = client.listConfigurationSettings({ labelFilter: uniqueLabel }); + let byLabelIterator = appConfigClient.listConfigurationSettings({ labelFilter: uniqueLabel }); const byLabelSettings = await toSortedArray(byLabelIterator); assertEqualSettings( @@ -521,7 +521,7 @@ describe("AppConfigurationClient", () => { it("label wildcards", async () => { // query with a direct label match - let byLabelIterator = client.listConfigurationSettings({ + let byLabelIterator = appConfigClient.listConfigurationSettings({ labelFilter: uniqueLabel.substring(0, uniqueLabel.length - 1) + "*" }); const byLabelSettings = await toSortedArray(byLabelIterator); @@ -546,7 +546,7 @@ describe("AppConfigurationClient", () => { }); it("exact match on key", async () => { - let byKeyIterator = client.listConfigurationSettings({ + let byKeyIterator = appConfigClient.listConfigurationSettings({ keyFilter: keys.listConfigSettingA }); const byKeySettings = await toSortedArray(byKeyIterator); @@ -573,7 +573,7 @@ describe("AppConfigurationClient", () => { it("key wildcards", async () => { // query with a key wildcard const keyFilter = keys.listConfigSettingA; - let byKeyIterator = client.listConfigurationSettings({ + let byKeyIterator = appConfigClient.listConfigurationSettings({ keyFilter: keyFilter.substring(0, keyFilter.length - 1) + "*" }); const byKeySettings = await toSortedArray(byKeyIterator); @@ -599,7 +599,7 @@ describe("AppConfigurationClient", () => { it("filter on fields", async () => { // only fill in the 'readOnly' field (which is really the locked field in the REST model) - let byKeyIterator = client.listConfigurationSettings({ + let byKeyIterator = appConfigClient.listConfigurationSettings({ keyFilter: keys.listConfigSettingA, fields: ["key", "label", "isReadOnly"] }); @@ -615,7 +615,7 @@ describe("AppConfigurationClient", () => { assert.ok(!settings[0].etag); // only fill in the 'readOnly' field (which is really the locked field in the REST model) - byKeyIterator = client.listConfigurationSettings({ + byKeyIterator = appConfigClient.listConfigurationSettings({ keyFilter: keys.listConfigSettingA, fields: ["key", "label", "value"] }); @@ -632,7 +632,7 @@ describe("AppConfigurationClient", () => { }); it("by date", async () => { - let byKeyIterator = client.listConfigurationSettings({ + let byKeyIterator = appConfigClient.listConfigurationSettings({ keyFilter: "listConfigSetting*", acceptDateTime: listConfigSettingA.lastModified }); @@ -663,7 +663,7 @@ describe("AppConfigurationClient", () => { for (let i = 0; i < expectedNumberOfLabels; i++) { addSettingPromises.push( - client.addConfigurationSetting({ + appConfigClient.addConfigurationSetting({ key, value: `the value for ${i}`, label: i.toString() @@ -678,7 +678,7 @@ describe("AppConfigurationClient", () => { await Promise.all(addSettingPromises); - let listResult = client.listConfigurationSettings({ + let listResult = appConfigClient.listConfigurationSettings({ keyFilter: key }); @@ -694,13 +694,13 @@ describe("AppConfigurationClient", () => { } for (let i = 0; i < expectedNumberOfLabels; i++) { - await client.deleteConfigurationSetting({ key, label: i.toString() }); + await appConfigClient.deleteConfigurationSetting({ key, label: i.toString() }); } }); it("accepts operation options", async () => { await assertThrowsAbortError(async () => { - const settingsIterator = client.listConfigurationSettings({ + const settingsIterator = appConfigClient.listConfigurationSettings({ requestOptions: { timeout: 1 } }); await settingsIterator.next(); @@ -720,20 +720,20 @@ describe("AppConfigurationClient", () => { labelB = recorder.getUniqueName(`list-revisions-B`); // we'll generate two sets of keys and labels for this selection - originalSetting = await client.addConfigurationSetting({ + originalSetting = await appConfigClient.addConfigurationSetting({ key, label: labelA, value: "fooA1" }); await delay(1000); - await client.setConfigurationSetting({ key, label: labelA, value: "fooA2" }); + await appConfigClient.setConfigurationSetting({ key, label: labelA, value: "fooA2" }); - await client.addConfigurationSetting({ key, label: labelB, value: "fooB1" }); - await client.setConfigurationSetting({ key, label: labelB, value: "fooB2" }); + await appConfigClient.addConfigurationSetting({ key, label: labelB, value: "fooB1" }); + await appConfigClient.setConfigurationSetting({ key, label: labelB, value: "fooB2" }); }); it("exact match on label", async () => { - const revisionsWithLabelIterator = client.listRevisions({ labelFilter: labelA }); + const revisionsWithLabelIterator = appConfigClient.listRevisions({ labelFilter: labelA }); const revisions = await toSortedArray(revisionsWithLabelIterator); assertEqualSettings( @@ -746,7 +746,7 @@ describe("AppConfigurationClient", () => { }); it("label wildcards", async () => { - const revisionsWithLabelIterator = client.listRevisions({ + const revisionsWithLabelIterator = appConfigClient.listRevisions({ labelFilter: labelA.substring(0, labelA.length - 1) + "*" }); const revisions = await toSortedArray(revisionsWithLabelIterator); @@ -761,7 +761,7 @@ describe("AppConfigurationClient", () => { }); it("exact match on key", async () => { - const revisionsWithKeyIterator = client.listRevisions({ keyFilter: key }); + const revisionsWithKeyIterator = appConfigClient.listRevisions({ keyFilter: key }); const revisions = await toSortedArray(revisionsWithKeyIterator); assertEqualSettings( @@ -776,7 +776,7 @@ describe("AppConfigurationClient", () => { }); it("key wildcards", async () => { - const revisionsWithKeyIterator = client.listRevisions({ + const revisionsWithKeyIterator = appConfigClient.listRevisions({ keyFilter: key.substring(0, key.length - 1) + "*" }); const revisions = await toSortedArray(revisionsWithKeyIterator); @@ -794,13 +794,13 @@ describe("AppConfigurationClient", () => { it("accepts operation options", async () => { await assertThrowsAbortError(async () => { - const iter = client.listRevisions({ labelFilter: labelA, requestOptions: { timeout: 1 } }); + const iter = appConfigClient.listRevisions({ labelFilter: labelA, requestOptions: { timeout: 1 } }); await iter.next(); }); }); it("by date", async () => { - let byKeyIterator = client.listRevisions({ + let byKeyIterator = appConfigClient.listRevisions({ keyFilter: key, acceptDateTime: originalSetting.lastModified }); @@ -835,7 +835,7 @@ describe("AppConfigurationClient", () => { }; // create configuration - const result = await client.addConfigurationSetting({ + const result = await appConfigClient.addConfigurationSetting({ key, label, value: "foo", @@ -875,7 +875,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from addConfigurationSetting()." ); - const replacedResult = await client.setConfigurationSetting({ key, label, value: "foo2" }); + const replacedResult = await appConfigClient.setConfigurationSetting({ key, label, value: "foo2" }); assert.equal( replacedResult.key, @@ -913,7 +913,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from setConfigurationSetting()." ); - await client.deleteConfigurationSetting({ key, label }); + await appConfigClient.deleteConfigurationSetting({ key, label }); }); it("replaces a configuration setting (valid etag)", async () => { @@ -926,7 +926,7 @@ describe("AppConfigurationClient", () => { }; // create configuration - const result = await client.addConfigurationSetting({ + const result = await appConfigClient.addConfigurationSetting({ key, label, value: "foo", @@ -966,7 +966,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from addConfigurationSetting()." ); - const replacedResult = await client.setConfigurationSetting( + const replacedResult = await appConfigClient.setConfigurationSetting( { key, label, @@ -1012,7 +1012,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from setConfigurationSetting()." ); - await client.deleteConfigurationSetting({ key, label }); + await appConfigClient.deleteConfigurationSetting({ key, label }); }); it("creates a configuration setting if it doesn't exist", async () => { @@ -1020,7 +1020,7 @@ describe("AppConfigurationClient", () => { const label = "test"; const value = "foo"; - const result = await client.setConfigurationSetting({ key, label, value: "foo" }); + const result = await appConfigClient.setConfigurationSetting({ key, label, value: "foo" }); assert.equal(result.key, key, "Unexpected key in result from setConfigurationSetting()."); assert.equal( result.label, @@ -1059,7 +1059,7 @@ describe("AppConfigurationClient", () => { const label = "test"; const value = "foo"; await assertThrowsAbortError(async () => { - await client.setConfigurationSetting( + await appConfigClient.setConfigurationSetting( { key, label, value: value }, { requestOptions: { diff --git a/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts index 7c4b61b951fb..315e2d1ed905 100644 --- a/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts @@ -13,13 +13,13 @@ import { Recorder } from "@azure/test-utils-recorder"; // with other teams simpler. (there's redundancy with other parts of the test suite but // that's okay) describe("Various error cases", () => { - let client: AppConfigurationClient; + let appConfigClient: AppConfigurationClient; let recorder: Recorder; const nonMatchingETag = "never-match-etag"; beforeEach(function() { recorder = startRecorder(this); - client = createAppConfigurationClientForTests() || this.skip(); + appConfigClient = createAppConfigurationClientForTests() || this.skip(); }); afterEach(async function() { @@ -31,7 +31,7 @@ describe("Various error cases", () => { let nonExistentKey: string; beforeEach(async () => { - addedSetting = await client.addConfigurationSetting({ + addedSetting = await appConfigClient.addConfigurationSetting({ key: recorder.getUniqueName(`etags`), value: "world" }); @@ -41,25 +41,25 @@ describe("Various error cases", () => { afterEach(async function() { if (!this.currentTest?.isPending()) { - await deleteKeyCompletely([addedSetting.key], client); + await deleteKeyCompletely([addedSetting.key], appConfigClient); } }); it("get: Non-existent key throws 404", async () => { await assertThrowsRestError( - () => client.getConfigurationSetting({ key: nonExistentKey }), + () => appConfigClient.getConfigurationSetting({ key: nonExistentKey }), 404 ); }); it("add: Setting already exists throws 412", async () => { - await assertThrowsRestError(() => client.addConfigurationSetting(addedSetting), 412); + await assertThrowsRestError(() => appConfigClient.addConfigurationSetting(addedSetting), 412); }); it("set: Existing key, (onlyIfUnchanged) throws 412", async () => { await assertThrowsRestError( () => - client.setConfigurationSetting( + appConfigClient.setConfigurationSetting( { ...addedSetting, etag: nonMatchingETag // purposefully make the etag not match the server @@ -71,15 +71,15 @@ describe("Various error cases", () => { }); it("set: trying to modify a read-only setting throws 409", async () => { - await client.setReadOnly(addedSetting, true); + await appConfigClient.setReadOnly(addedSetting, true); - await assertThrowsRestError(() => client.setConfigurationSetting(addedSetting), 409); + await assertThrowsRestError(() => appConfigClient.setConfigurationSetting(addedSetting), 409); }); it("delete: key that is set to read-only throws 409", async () => { - await client.setReadOnly(addedSetting, true); - await assertThrowsRestError(async () => client.deleteConfigurationSetting(addedSetting), 409); - await client.setReadOnly(addedSetting, false); + await appConfigClient.setReadOnly(addedSetting, true); + await assertThrowsRestError(async () => appConfigClient.deleteConfigurationSetting(addedSetting), 409); + await appConfigClient.setReadOnly(addedSetting, false); }); }); @@ -92,7 +92,7 @@ describe("Various error cases", () => { // key: hello{date}, value: world // the 'no label' value for 'hello' - addedSetting = await client.addConfigurationSetting({ + addedSetting = await appConfigClient.addConfigurationSetting({ key: recorder.getUniqueName(`etags`), value: "world" }); @@ -102,12 +102,12 @@ describe("Various error cases", () => { afterEach(async function() { if (!this.currentTest?.isPending()) { - await deleteKeyCompletely([addedSetting.key], client); + await deleteKeyCompletely([addedSetting.key], appConfigClient); } }); it("get: value is unchanged from etag (304) using ifNoneMatch, sets all properties to undefined", async () => { - const response = await client.getConfigurationSetting(addedSetting, { + const response = await appConfigClient.getConfigurationSetting(addedSetting, { onlyIfChanged: true }); @@ -116,7 +116,7 @@ describe("Various error cases", () => { }); it("delete: non-existent key (no etag)", async () => { - await client.deleteConfigurationSetting({ key: nonExistentKey }); + await appConfigClient.deleteConfigurationSetting({ key: nonExistentKey }); }); }); }); From 36f72db2cc8ea2e9ed32fdb4a10568a728750b6a Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 15:13:43 -0800 Subject: [PATCH 09/19] undo renaming --- .../test/public/auth.spec.ts | 4 +- .../test/public/etags.spec.ts | 62 ++++---- .../test/public/index.readonlytests.spec.ts | 24 +-- .../test/public/index.spec.ts | 144 +++++++++--------- .../test/public/throwOrNotThrow.spec.ts | 32 ++-- 5 files changed, 133 insertions(+), 133 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts index dccf166f1595..b43d1f0a9a46 100644 --- a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts @@ -34,14 +34,14 @@ describe("Authentication", () => { if (isPlaybackMode()) { this.skip(); } - const appConfigClient = new AppConfigurationClient( + const client = new AppConfigurationClient( credsAndEndpoint.endpoint, credsAndEndpoint.credential ); // it doesn't matter if any data comes in so long as we were // able to connect and call the service - await appConfigClient.addConfigurationSetting({ + await client.addConfigurationSetting({ key: `token-authentication-test-${Date.now()}`, value: "hello" }); diff --git a/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts index 8e9fc74f3358..b4cf48c70b78 100644 --- a/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts @@ -12,43 +12,43 @@ import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; describe("etags", () => { - let appConfigClient: AppConfigurationClient; + let client: AppConfigurationClient; let recorder: Recorder; let key: string; beforeEach(async function() { recorder = startRecorder(this); key = recorder.getUniqueName("etags"); - appConfigClient = createAppConfigurationClientForTests() || this.skip(); - await appConfigClient.addConfigurationSetting({ + client = createAppConfigurationClientForTests() || this.skip(); + await client.addConfigurationSetting({ key: key, value: "some value" }); }); afterEach(async function() { - await deleteKeyCompletely([key], appConfigClient); + await deleteKeyCompletely([key], client); await recorder.stop(); }); // etag usage is 'opt-in' via the onlyIfChanged/onlyIfUnchanged options for certain calls // by default no etags are used. it("Get and set by default doesn't use etags", async () => { - const addedSetting = await appConfigClient.getConfigurationSetting({ key }); + const addedSetting = await client.getConfigurationSetting({ key }); // by default - ignores the etag in 'addedSetting.etag' so last one in // wins addedSetting.value = "some new value!"; - await appConfigClient.setConfigurationSetting(addedSetting); + await client.setConfigurationSetting(addedSetting); }); it("Get and set, enabling etag checking using onlyIfUnchanged", async () => { - const addedSetting = await appConfigClient.getConfigurationSetting({ key }); + const addedSetting = await client.getConfigurationSetting({ key }); addedSetting.value = "some new value!"; // etag of the remote setting matches what we have so we're okay to update - const newlyUpdatedSetting = await appConfigClient.setConfigurationSetting(addedSetting, { + const newlyUpdatedSetting = await client.setConfigurationSetting(addedSetting, { onlyIfUnchanged: true }); assert.equal(newlyUpdatedSetting.value, addedSetting.value); @@ -61,19 +61,19 @@ describe("etags", () => { // trying to save with a non-matching etag (when we specifically said to only save if // nothing has changed) will result in a 412 (precondition failed) await assertThrowsRestError( - () => appConfigClient.setConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), + () => client.setConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), 412 ); }); it("set with an old etag will throw RestError", async () => { - const addedSetting = await appConfigClient.getConfigurationSetting({ key }); + const addedSetting = await client.getConfigurationSetting({ key }); addedSetting.value = "some new value!"; // sneaky process B comes in and does an update (ie, does NOT // enable the etag) - await appConfigClient.setConfigurationSetting({ + await client.setConfigurationSetting({ ...addedSetting, value: "sneaky user updated the field" }); @@ -82,7 +82,7 @@ describe("etags", () => { // so now this update (with the original etag) will throw. await assertThrowsRestError( () => - appConfigClient.setConfigurationSetting(addedSetting, { + client.setConfigurationSetting(addedSetting, { onlyIfUnchanged: true }), 412, @@ -91,13 +91,13 @@ describe("etags", () => { }); it("get using ifNoneMatch to only get the setting if it's changed (ie: safe GET)", async () => { - const originalSetting = await appConfigClient.setConfigurationSetting({ + const originalSetting = await client.setConfigurationSetting({ key: key, value: "world" }); // only get the setting if it changed (it hasn't) - const response = await appConfigClient.getConfigurationSetting(originalSetting, { + const response = await client.getConfigurationSetting(originalSetting, { onlyIfChanged: true }); @@ -115,9 +115,9 @@ describe("etags", () => { assert.ok(!response.value); // let's update it and then try again - await appConfigClient.setConfigurationSetting({ key: key, value: "new world" }); + await client.setConfigurationSetting({ key: key, value: "new world" }); - const updatedSetting = await appConfigClient.getConfigurationSetting({ key }); + const updatedSetting = await client.getConfigurationSetting({ key }); assert.notEqual( originalSetting.etag, @@ -128,7 +128,7 @@ describe("etags", () => { assert.equal(200, updatedSetting.statusCode); // only get the setting if it changed (it has!) - const configurationSetting = await appConfigClient.getConfigurationSetting(originalSetting, { + const configurationSetting = await client.getConfigurationSetting(originalSetting, { onlyIfChanged: true }); @@ -138,7 +138,7 @@ describe("etags", () => { }); it("(set|clear)readonly using etags", async () => { - const addedSetting = await appConfigClient.getConfigurationSetting({ key }); + const addedSetting = await client.getConfigurationSetting({ key }); const badEtagSetting = { ...addedSetting, @@ -148,47 +148,47 @@ describe("etags", () => { // etag won't match so we get a precondition failed await assertThrowsRestError( () => - appConfigClient.setReadOnly(badEtagSetting, true, { + client.setReadOnly(badEtagSetting, true, { onlyIfUnchanged: true }), 412 ); - let actualSetting = await appConfigClient.getConfigurationSetting(badEtagSetting); + let actualSetting = await client.getConfigurationSetting(badEtagSetting); // should not be read-only since it didn't match assert.ok(!actualSetting.isReadOnly); // and now that the etag matches we should be able to set the // key's value to read-onlly - await appConfigClient.setReadOnly(addedSetting, true, { onlyIfUnchanged: true }); - actualSetting = await appConfigClient.getConfigurationSetting(addedSetting); + await client.setReadOnly(addedSetting, true, { onlyIfUnchanged: true }); + actualSetting = await client.getConfigurationSetting(addedSetting); assert.ok(actualSetting.isReadOnly); // now let's try to clear it (using a bogus etag so it won't match) await assertThrowsRestError( () => - appConfigClient.setReadOnly(badEtagSetting, false, { + client.setReadOnly(badEtagSetting, false, { onlyIfUnchanged: true }), 412 ); // ...still readOnly - actualSetting = await appConfigClient.getConfigurationSetting(addedSetting); + actualSetting = await client.getConfigurationSetting(addedSetting); assert.ok(actualSetting.isReadOnly); // now we'll use the right etag (from the setting we just retrieved) - await appConfigClient.setReadOnly(actualSetting, false, { + await client.setReadOnly(actualSetting, false, { onlyIfUnchanged: true }); // and now it's no longer readOnly - actualSetting = await appConfigClient.getConfigurationSetting(addedSetting); + actualSetting = await client.getConfigurationSetting(addedSetting); assert.ok(!actualSetting.isReadOnly); }); it("delete using etags", async () => { - const addedSetting = await appConfigClient.getConfigurationSetting({ key }); + const addedSetting = await client.getConfigurationSetting({ key }); const badEtagSetting = { ...addedSetting, @@ -196,17 +196,17 @@ describe("etags", () => { }; await assertThrowsRestError( - () => appConfigClient.deleteConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), + () => client.deleteConfigurationSetting(badEtagSetting, { onlyIfUnchanged: true }), 412 ); // obviously the setting is still there (or else this would throw) - await appConfigClient.getConfigurationSetting({ key }); + await client.getConfigurationSetting({ key }); // this time we'll pass in the proper setting with the right etag - await appConfigClient.deleteConfigurationSetting(addedSetting, { onlyIfUnchanged: true }); + await client.deleteConfigurationSetting(addedSetting, { onlyIfUnchanged: true }); // and now the setting isn't found - await assertThrowsRestError(() => appConfigClient.getConfigurationSetting({ key }), 404); + await assertThrowsRestError(() => client.getConfigurationSetting({ key }), 404); }); }); diff --git a/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts index b027f7b26b50..029271ad420c 100644 --- a/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts @@ -10,7 +10,7 @@ import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; describe("AppConfigurationClient (set|clear)ReadOnly", () => { - let appConfigClient: AppConfigurationClient; + let client: AppConfigurationClient; let recorder: Recorder; const testConfigSetting = { key: "", @@ -21,26 +21,26 @@ describe("AppConfigurationClient (set|clear)ReadOnly", () => { beforeEach(async function() { recorder = startRecorder(this); testConfigSetting.key = recorder.getUniqueName("readOnlyTests"); - appConfigClient = createAppConfigurationClientForTests() || this.skip(); + client = createAppConfigurationClientForTests() || this.skip(); // before it's set to read only we can set it all we want - await appConfigClient.setConfigurationSetting(testConfigSetting); + await client.setConfigurationSetting(testConfigSetting); }); afterEach(async function() { - await deleteKeyCompletely([testConfigSetting.key], appConfigClient); + await deleteKeyCompletely([testConfigSetting.key], client); await recorder.stop(); }); it("basic", async function() { - let storedSetting = await appConfigClient.getConfigurationSetting({ + let storedSetting = await client.getConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }); assert.ok(!storedSetting.isReadOnly); - await appConfigClient.setReadOnly(testConfigSetting, true); + await client.setReadOnly(testConfigSetting, true); - storedSetting = await appConfigClient.getConfigurationSetting({ + storedSetting = await client.getConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }); @@ -48,13 +48,13 @@ describe("AppConfigurationClient (set|clear)ReadOnly", () => { // any modification related methods throw exceptions await assertThrowsRestError( - () => appConfigClient.setConfigurationSetting(testConfigSetting), + () => client.setConfigurationSetting(testConfigSetting), 409, "Set should fail because the setting is read-only" ); await assertThrowsRestError( () => - appConfigClient.deleteConfigurationSetting({ + client.deleteConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }), @@ -64,16 +64,16 @@ describe("AppConfigurationClient (set|clear)ReadOnly", () => { }); it("accepts operation options", async function() { - await appConfigClient.getConfigurationSetting({ + await client.getConfigurationSetting({ key: testConfigSetting.key, label: testConfigSetting.label }); await assertThrowsAbortError(async () => { - await appConfigClient.setReadOnly(testConfigSetting, true, { requestOptions: { timeout: 1 } }); + await client.setReadOnly(testConfigSetting, true, { requestOptions: { timeout: 1 } }); }); await assertThrowsAbortError(async () => { - await appConfigClient.setReadOnly(testConfigSetting, false, { requestOptions: { timeout: 1 } }); + await client.setReadOnly(testConfigSetting, false, { requestOptions: { timeout: 1 } }); }); }); }); diff --git a/sdk/appconfiguration/app-configuration/test/public/index.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts index ad7305238e96..3165f5a49dfa 100644 --- a/sdk/appconfiguration/app-configuration/test/public/index.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts @@ -16,12 +16,12 @@ import { delay } from "@azure/core-http"; import { Recorder } from "@azure/test-utils-recorder"; describe("AppConfigurationClient", () => { - let appConfigClient: AppConfigurationClient; + let client: AppConfigurationClient; let recorder: Recorder; beforeEach(function() { recorder = startRecorder(this); - appConfigClient = createAppConfigurationClientForTests() || this.skip(); + client = createAppConfigurationClientForTests() || this.skip(); }); afterEach(async function() { @@ -32,7 +32,7 @@ describe("AppConfigurationClient", () => { it("Add and query a setting without a label", async () => { const key = recorder.getUniqueName("noLabelTests"); - await appConfigClient.addConfigurationSetting({ key, value: "added" }); + await client.addConfigurationSetting({ key, value: "added" }); await compare({ key, @@ -40,10 +40,10 @@ describe("AppConfigurationClient", () => { label: undefined }); - await appConfigClient.deleteConfigurationSetting({ key }); + await client.deleteConfigurationSetting({ key }); // will recreate the setting - await appConfigClient.setConfigurationSetting({ key, value: "set" }); + await client.setConfigurationSetting({ key, value: "set" }); await compare({ key, @@ -52,7 +52,7 @@ describe("AppConfigurationClient", () => { }); // and now acts as a wholesale update - await appConfigClient.setConfigurationSetting({ key, value: "set a second time" }); + await client.setConfigurationSetting({ key, value: "set a second time" }); await compare({ key, @@ -60,11 +60,11 @@ describe("AppConfigurationClient", () => { label: undefined }); - await appConfigClient.deleteConfigurationSetting({ key }); + await client.deleteConfigurationSetting({ key }); }); async function compare(expected: { key: string; value: string; label?: string }) { - const actualSettings = await appConfigClient.getConfigurationSetting(expected); + const actualSettings = await client.getConfigurationSetting(expected); assert.equal(expected.key, actualSettings.key); assert.equal(expected.value, actualSettings.value); @@ -75,7 +75,7 @@ describe("AppConfigurationClient", () => { describe("addConfigurationSetting", () => { it("sample works", async () => { const key = recorder.getUniqueName("addConfigSample"); - const result = await appConfigClient.setConfigurationSetting({ + const result = await client.setConfigurationSetting({ key, value: "MyValue" }); @@ -87,7 +87,7 @@ describe("AppConfigurationClient", () => { const key = recorder.getUniqueName("addConfigTest"); const label = "MyLabel"; const value = "MyValue"; - const result = await appConfigClient.addConfigurationSetting({ key, label, value }); + const result = await client.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -106,14 +106,14 @@ describe("AppConfigurationClient", () => { assert.ok(!(result as any).eTag); assert.ok(result.etag); - await appConfigClient.deleteConfigurationSetting({ key, label }); + await client.deleteConfigurationSetting({ key, label }); }); it("throws an error if the configuration setting already exists", async () => { const key = recorder.getUniqueName("addConfigTestTwice"); const label = "test"; const value = "foo"; - const result = await appConfigClient.addConfigurationSetting({ key, label, value }); + const result = await client.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -129,13 +129,13 @@ describe("AppConfigurationClient", () => { // attempt to add the same setting try { - await appConfigClient.addConfigurationSetting({ key, label, value }); + await client.addConfigurationSetting({ key, label, value }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); } - await appConfigClient.deleteConfigurationSetting({ key, label }); + await client.deleteConfigurationSetting({ key, label }); }); it("accepts operation options", async () => { @@ -143,7 +143,7 @@ describe("AppConfigurationClient", () => { const label = "test"; const value = "foo"; await assertThrowsAbortError(async () => { - await appConfigClient.addConfigurationSetting( + await client.addConfigurationSetting( { key, label, value }, { requestOptions: { @@ -162,7 +162,7 @@ describe("AppConfigurationClient", () => { const value = "MyValue"; // create configuration - const result = await appConfigClient.addConfigurationSetting({ key, label, value }); + const result = await client.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -177,12 +177,12 @@ describe("AppConfigurationClient", () => { ); // delete configuration - const deletedSetting = await appConfigClient.deleteConfigurationSetting(result); + const deletedSetting = await client.deleteConfigurationSetting(result); assert.equal(200, deletedSetting._response.status); // confirm setting no longer exists try { - await appConfigClient.getConfigurationSetting({ key, label }); + await client.getConfigurationSetting({ key, label }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); @@ -195,7 +195,7 @@ describe("AppConfigurationClient", () => { const value = "foo"; // create configuration - const result = await appConfigClient.addConfigurationSetting({ key, label, value }); + const result = await client.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -210,7 +210,7 @@ describe("AppConfigurationClient", () => { ); // delete configuration - await appConfigClient.deleteConfigurationSetting( + await client.deleteConfigurationSetting( { key, label @@ -220,7 +220,7 @@ describe("AppConfigurationClient", () => { // confirm setting no longer exists try { - await appConfigClient.getConfigurationSetting({ key, label }); + await client.getConfigurationSetting({ key, label }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); @@ -232,7 +232,7 @@ describe("AppConfigurationClient", () => { const label = "test"; // delete configuration - const response = await appConfigClient.deleteConfigurationSetting({ key, label }); + const response = await client.deleteConfigurationSetting({ key, label }); // we hoist this code up to the top in case users want to check if the // delete actually happened (status code: 200) or if the setting wasn't @@ -248,7 +248,7 @@ describe("AppConfigurationClient", () => { const value = "foo"; // create configuration - const result = await appConfigClient.addConfigurationSetting({ key, label, value }); + const result = await client.addConfigurationSetting({ key, label, value }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -265,14 +265,14 @@ describe("AppConfigurationClient", () => { // delete configuration await assertThrowsRestError( () => - appConfigClient.deleteConfigurationSetting( + client.deleteConfigurationSetting( { key, label, etag: "invalid" }, { onlyIfUnchanged: true } ), 412 ); - await appConfigClient.deleteConfigurationSetting({ key, label }); + await client.deleteConfigurationSetting({ key, label }); }); it("accepts operation options", async () => { @@ -281,11 +281,11 @@ describe("AppConfigurationClient", () => { const value = "MyValue"; // create configuration - const result = await appConfigClient.addConfigurationSetting({ key, label, value }); + const result = await client.addConfigurationSetting({ key, label, value }); // delete configuration await assertThrowsAbortError(async () => { - await appConfigClient.deleteConfigurationSetting(result, { + await client.deleteConfigurationSetting(result, { requestOptions: { timeout: 1 } }); }); @@ -304,7 +304,7 @@ describe("AppConfigurationClient", () => { const contentType = "application/json"; // create configuration - const result = await appConfigClient.addConfigurationSetting({ key, label, value, contentType, tags }); + const result = await client.addConfigurationSetting({ key, label, value, contentType, tags }); assert.equal(result.key, key, "Unexpected key in result from addConfigurationSetting()."); assert.equal( @@ -339,7 +339,7 @@ describe("AppConfigurationClient", () => { ); // retrieve the value from the service - const remoteResult = await appConfigClient.getConfigurationSetting({ key, label }); + const remoteResult = await client.getConfigurationSetting({ key, label }); assert.equal( remoteResult.key, key, @@ -376,7 +376,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from getConfigurationSetting()." ); - await appConfigClient.deleteConfigurationSetting({ key, label }); + await client.deleteConfigurationSetting({ key, label }); }); it("throws when retrieving a non-existent configuration setting", async () => { @@ -385,7 +385,7 @@ describe("AppConfigurationClient", () => { // retrieve the value from the service try { - await appConfigClient.getConfigurationSetting({ key, label }); + await client.getConfigurationSetting({ key, label }); throw new Error("Test failure"); } catch (err) { assert.notEqual(err.message, "Test failure"); @@ -401,28 +401,28 @@ describe("AppConfigurationClient", () => { car: "caz" }; const contentType = "application/json"; - await appConfigClient.addConfigurationSetting({ key, label, value, contentType, tags }); + await client.addConfigurationSetting({ key, label, value, contentType, tags }); await assertThrowsAbortError(async () => { - await appConfigClient.getConfigurationSetting({ key, label }, { requestOptions: { timeout: 1 } }); + await client.getConfigurationSetting({ key, label }, { requestOptions: { timeout: 1 } }); }); }); it("by date", async () => { const key = recorder.getUniqueName("getConfigurationSettingByDate"); - const initialSetting = await appConfigClient.setConfigurationSetting({ + const initialSetting = await client.setConfigurationSetting({ key, value: "value1" }); await delay(1000); - await appConfigClient.setConfigurationSetting({ + await client.setConfigurationSetting({ key, value: "value2" }); - const settingAtPointInTime = await appConfigClient.getConfigurationSetting( + const settingAtPointInTime = await client.getConfigurationSetting( { key }, { acceptDateTime: initialSetting.lastModified @@ -465,20 +465,20 @@ describe("AppConfigurationClient", () => { productionASettingId.key = keys.listConfigSettingA; productionASettingId.label = uniqueLabel; - await appConfigClient.addConfigurationSetting(productionASettingId); - await appConfigClient.setReadOnly(productionASettingId, true); + await client.addConfigurationSetting(productionASettingId); + await client.setReadOnly(productionASettingId, true); - listConfigSettingA = await appConfigClient.addConfigurationSetting({ + listConfigSettingA = await client.addConfigurationSetting({ key: keys.listConfigSettingA, value: "[A] value" }); - await appConfigClient.addConfigurationSetting({ + await client.addConfigurationSetting({ key: keys.listConfigSettingB, label: uniqueLabel, value: "[B] production value" }); - await appConfigClient.addConfigurationSetting({ + await client.addConfigurationSetting({ key: keys.listConfigSettingB, value: "[B] value" }); @@ -486,18 +486,18 @@ describe("AppConfigurationClient", () => { after(async () => { try { - await deleteKeyCompletely([keys.listConfigSettingA, keys.listConfigSettingB], appConfigClient); + await deleteKeyCompletely([keys.listConfigSettingA, keys.listConfigSettingB], client); } catch (e) {} }); it("undefined doesn't throw and will just return everything", async () => { - const settingsIterator = appConfigClient.listConfigurationSettings(); + const settingsIterator = client.listConfigurationSettings(); await settingsIterator.next(); }); it("exact match on label", async () => { // query with a direct label match - let byLabelIterator = appConfigClient.listConfigurationSettings({ labelFilter: uniqueLabel }); + let byLabelIterator = client.listConfigurationSettings({ labelFilter: uniqueLabel }); const byLabelSettings = await toSortedArray(byLabelIterator); assertEqualSettings( @@ -521,7 +521,7 @@ describe("AppConfigurationClient", () => { it("label wildcards", async () => { // query with a direct label match - let byLabelIterator = appConfigClient.listConfigurationSettings({ + let byLabelIterator = client.listConfigurationSettings({ labelFilter: uniqueLabel.substring(0, uniqueLabel.length - 1) + "*" }); const byLabelSettings = await toSortedArray(byLabelIterator); @@ -546,7 +546,7 @@ describe("AppConfigurationClient", () => { }); it("exact match on key", async () => { - let byKeyIterator = appConfigClient.listConfigurationSettings({ + let byKeyIterator = client.listConfigurationSettings({ keyFilter: keys.listConfigSettingA }); const byKeySettings = await toSortedArray(byKeyIterator); @@ -573,7 +573,7 @@ describe("AppConfigurationClient", () => { it("key wildcards", async () => { // query with a key wildcard const keyFilter = keys.listConfigSettingA; - let byKeyIterator = appConfigClient.listConfigurationSettings({ + let byKeyIterator = client.listConfigurationSettings({ keyFilter: keyFilter.substring(0, keyFilter.length - 1) + "*" }); const byKeySettings = await toSortedArray(byKeyIterator); @@ -599,7 +599,7 @@ describe("AppConfigurationClient", () => { it("filter on fields", async () => { // only fill in the 'readOnly' field (which is really the locked field in the REST model) - let byKeyIterator = appConfigClient.listConfigurationSettings({ + let byKeyIterator = client.listConfigurationSettings({ keyFilter: keys.listConfigSettingA, fields: ["key", "label", "isReadOnly"] }); @@ -615,7 +615,7 @@ describe("AppConfigurationClient", () => { assert.ok(!settings[0].etag); // only fill in the 'readOnly' field (which is really the locked field in the REST model) - byKeyIterator = appConfigClient.listConfigurationSettings({ + byKeyIterator = client.listConfigurationSettings({ keyFilter: keys.listConfigSettingA, fields: ["key", "label", "value"] }); @@ -632,7 +632,7 @@ describe("AppConfigurationClient", () => { }); it("by date", async () => { - let byKeyIterator = appConfigClient.listConfigurationSettings({ + let byKeyIterator = client.listConfigurationSettings({ keyFilter: "listConfigSetting*", acceptDateTime: listConfigSettingA.lastModified }); @@ -663,7 +663,7 @@ describe("AppConfigurationClient", () => { for (let i = 0; i < expectedNumberOfLabels; i++) { addSettingPromises.push( - appConfigClient.addConfigurationSetting({ + client.addConfigurationSetting({ key, value: `the value for ${i}`, label: i.toString() @@ -678,7 +678,7 @@ describe("AppConfigurationClient", () => { await Promise.all(addSettingPromises); - let listResult = appConfigClient.listConfigurationSettings({ + let listResult = client.listConfigurationSettings({ keyFilter: key }); @@ -694,13 +694,13 @@ describe("AppConfigurationClient", () => { } for (let i = 0; i < expectedNumberOfLabels; i++) { - await appConfigClient.deleteConfigurationSetting({ key, label: i.toString() }); + await client.deleteConfigurationSetting({ key, label: i.toString() }); } }); it("accepts operation options", async () => { await assertThrowsAbortError(async () => { - const settingsIterator = appConfigClient.listConfigurationSettings({ + const settingsIterator = client.listConfigurationSettings({ requestOptions: { timeout: 1 } }); await settingsIterator.next(); @@ -720,20 +720,20 @@ describe("AppConfigurationClient", () => { labelB = recorder.getUniqueName(`list-revisions-B`); // we'll generate two sets of keys and labels for this selection - originalSetting = await appConfigClient.addConfigurationSetting({ + originalSetting = await client.addConfigurationSetting({ key, label: labelA, value: "fooA1" }); await delay(1000); - await appConfigClient.setConfigurationSetting({ key, label: labelA, value: "fooA2" }); + await client.setConfigurationSetting({ key, label: labelA, value: "fooA2" }); - await appConfigClient.addConfigurationSetting({ key, label: labelB, value: "fooB1" }); - await appConfigClient.setConfigurationSetting({ key, label: labelB, value: "fooB2" }); + await client.addConfigurationSetting({ key, label: labelB, value: "fooB1" }); + await client.setConfigurationSetting({ key, label: labelB, value: "fooB2" }); }); it("exact match on label", async () => { - const revisionsWithLabelIterator = appConfigClient.listRevisions({ labelFilter: labelA }); + const revisionsWithLabelIterator = client.listRevisions({ labelFilter: labelA }); const revisions = await toSortedArray(revisionsWithLabelIterator); assertEqualSettings( @@ -746,7 +746,7 @@ describe("AppConfigurationClient", () => { }); it("label wildcards", async () => { - const revisionsWithLabelIterator = appConfigClient.listRevisions({ + const revisionsWithLabelIterator = client.listRevisions({ labelFilter: labelA.substring(0, labelA.length - 1) + "*" }); const revisions = await toSortedArray(revisionsWithLabelIterator); @@ -761,7 +761,7 @@ describe("AppConfigurationClient", () => { }); it("exact match on key", async () => { - const revisionsWithKeyIterator = appConfigClient.listRevisions({ keyFilter: key }); + const revisionsWithKeyIterator = client.listRevisions({ keyFilter: key }); const revisions = await toSortedArray(revisionsWithKeyIterator); assertEqualSettings( @@ -776,7 +776,7 @@ describe("AppConfigurationClient", () => { }); it("key wildcards", async () => { - const revisionsWithKeyIterator = appConfigClient.listRevisions({ + const revisionsWithKeyIterator = client.listRevisions({ keyFilter: key.substring(0, key.length - 1) + "*" }); const revisions = await toSortedArray(revisionsWithKeyIterator); @@ -794,13 +794,13 @@ describe("AppConfigurationClient", () => { it("accepts operation options", async () => { await assertThrowsAbortError(async () => { - const iter = appConfigClient.listRevisions({ labelFilter: labelA, requestOptions: { timeout: 1 } }); + const iter = client.listRevisions({ labelFilter: labelA, requestOptions: { timeout: 1 } }); await iter.next(); }); }); it("by date", async () => { - let byKeyIterator = appConfigClient.listRevisions({ + let byKeyIterator = client.listRevisions({ keyFilter: key, acceptDateTime: originalSetting.lastModified }); @@ -835,7 +835,7 @@ describe("AppConfigurationClient", () => { }; // create configuration - const result = await appConfigClient.addConfigurationSetting({ + const result = await client.addConfigurationSetting({ key, label, value: "foo", @@ -875,7 +875,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from addConfigurationSetting()." ); - const replacedResult = await appConfigClient.setConfigurationSetting({ key, label, value: "foo2" }); + const replacedResult = await client.setConfigurationSetting({ key, label, value: "foo2" }); assert.equal( replacedResult.key, @@ -913,7 +913,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from setConfigurationSetting()." ); - await appConfigClient.deleteConfigurationSetting({ key, label }); + await client.deleteConfigurationSetting({ key, label }); }); it("replaces a configuration setting (valid etag)", async () => { @@ -926,7 +926,7 @@ describe("AppConfigurationClient", () => { }; // create configuration - const result = await appConfigClient.addConfigurationSetting({ + const result = await client.addConfigurationSetting({ key, label, value: "foo", @@ -966,7 +966,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from addConfigurationSetting()." ); - const replacedResult = await appConfigClient.setConfigurationSetting( + const replacedResult = await client.setConfigurationSetting( { key, label, @@ -1012,7 +1012,7 @@ describe("AppConfigurationClient", () => { "Unexpected contentType in result from setConfigurationSetting()." ); - await appConfigClient.deleteConfigurationSetting({ key, label }); + await client.deleteConfigurationSetting({ key, label }); }); it("creates a configuration setting if it doesn't exist", async () => { @@ -1020,7 +1020,7 @@ describe("AppConfigurationClient", () => { const label = "test"; const value = "foo"; - const result = await appConfigClient.setConfigurationSetting({ key, label, value: "foo" }); + const result = await client.setConfigurationSetting({ key, label, value: "foo" }); assert.equal(result.key, key, "Unexpected key in result from setConfigurationSetting()."); assert.equal( result.label, @@ -1059,7 +1059,7 @@ describe("AppConfigurationClient", () => { const label = "test"; const value = "foo"; await assertThrowsAbortError(async () => { - await appConfigClient.setConfigurationSetting( + await client.setConfigurationSetting( { key, label, value: value }, { requestOptions: { diff --git a/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts index 315e2d1ed905..7c4b61b951fb 100644 --- a/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts @@ -13,13 +13,13 @@ import { Recorder } from "@azure/test-utils-recorder"; // with other teams simpler. (there's redundancy with other parts of the test suite but // that's okay) describe("Various error cases", () => { - let appConfigClient: AppConfigurationClient; + let client: AppConfigurationClient; let recorder: Recorder; const nonMatchingETag = "never-match-etag"; beforeEach(function() { recorder = startRecorder(this); - appConfigClient = createAppConfigurationClientForTests() || this.skip(); + client = createAppConfigurationClientForTests() || this.skip(); }); afterEach(async function() { @@ -31,7 +31,7 @@ describe("Various error cases", () => { let nonExistentKey: string; beforeEach(async () => { - addedSetting = await appConfigClient.addConfigurationSetting({ + addedSetting = await client.addConfigurationSetting({ key: recorder.getUniqueName(`etags`), value: "world" }); @@ -41,25 +41,25 @@ describe("Various error cases", () => { afterEach(async function() { if (!this.currentTest?.isPending()) { - await deleteKeyCompletely([addedSetting.key], appConfigClient); + await deleteKeyCompletely([addedSetting.key], client); } }); it("get: Non-existent key throws 404", async () => { await assertThrowsRestError( - () => appConfigClient.getConfigurationSetting({ key: nonExistentKey }), + () => client.getConfigurationSetting({ key: nonExistentKey }), 404 ); }); it("add: Setting already exists throws 412", async () => { - await assertThrowsRestError(() => appConfigClient.addConfigurationSetting(addedSetting), 412); + await assertThrowsRestError(() => client.addConfigurationSetting(addedSetting), 412); }); it("set: Existing key, (onlyIfUnchanged) throws 412", async () => { await assertThrowsRestError( () => - appConfigClient.setConfigurationSetting( + client.setConfigurationSetting( { ...addedSetting, etag: nonMatchingETag // purposefully make the etag not match the server @@ -71,15 +71,15 @@ describe("Various error cases", () => { }); it("set: trying to modify a read-only setting throws 409", async () => { - await appConfigClient.setReadOnly(addedSetting, true); + await client.setReadOnly(addedSetting, true); - await assertThrowsRestError(() => appConfigClient.setConfigurationSetting(addedSetting), 409); + await assertThrowsRestError(() => client.setConfigurationSetting(addedSetting), 409); }); it("delete: key that is set to read-only throws 409", async () => { - await appConfigClient.setReadOnly(addedSetting, true); - await assertThrowsRestError(async () => appConfigClient.deleteConfigurationSetting(addedSetting), 409); - await appConfigClient.setReadOnly(addedSetting, false); + await client.setReadOnly(addedSetting, true); + await assertThrowsRestError(async () => client.deleteConfigurationSetting(addedSetting), 409); + await client.setReadOnly(addedSetting, false); }); }); @@ -92,7 +92,7 @@ describe("Various error cases", () => { // key: hello{date}, value: world // the 'no label' value for 'hello' - addedSetting = await appConfigClient.addConfigurationSetting({ + addedSetting = await client.addConfigurationSetting({ key: recorder.getUniqueName(`etags`), value: "world" }); @@ -102,12 +102,12 @@ describe("Various error cases", () => { afterEach(async function() { if (!this.currentTest?.isPending()) { - await deleteKeyCompletely([addedSetting.key], appConfigClient); + await deleteKeyCompletely([addedSetting.key], client); } }); it("get: value is unchanged from etag (304) using ifNoneMatch, sets all properties to undefined", async () => { - const response = await appConfigClient.getConfigurationSetting(addedSetting, { + const response = await client.getConfigurationSetting(addedSetting, { onlyIfChanged: true }); @@ -116,7 +116,7 @@ describe("Various error cases", () => { }); it("delete: non-existent key (no etag)", async () => { - await appConfigClient.deleteConfigurationSetting({ key: nonExistentKey }); + await client.deleteConfigurationSetting({ key: nonExistentKey }); }); }); }); From 74c51f2fad5e52d9e81ea1422b36c1382d708526 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 15:17:07 -0800 Subject: [PATCH 10/19] move utils to public folder and update references --- .../app-configuration/test/internal/http.spec.ts | 2 +- .../test/internal/policies/throttlingRetryPolicyTests.spec.ts | 2 +- sdk/appconfiguration/app-configuration/test/public/auth.spec.ts | 2 +- .../app-configuration/test/public/etags.spec.ts | 2 +- .../app-configuration/test/public/index.readonlytests.spec.ts | 2 +- .../app-configuration/test/public/index.spec.ts | 2 +- .../app-configuration/test/public/throwOrNotThrow.spec.ts | 2 +- .../app-configuration/test/{ => public}/utils/testHelpers.ts | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename sdk/appconfiguration/app-configuration/test/{ => public}/utils/testHelpers.ts (100%) diff --git a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts index 9e57f20ee6b9..3b8abfe05cd9 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/http.spec.ts @@ -14,7 +14,7 @@ import { createAppConfigurationClientForTests, assertThrowsRestError, startRecorder -} from "../utils/testHelpers"; +} from "../public/utils/testHelpers"; import * as chai from "chai"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts index ed4150ca9513..54a1f8032564 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts @@ -12,7 +12,7 @@ import { RestError } from "@azure/core-http"; import { ThrottlingRetryPolicy, getDelayInMs } from "../../../src/policies/throttlingRetryPolicy"; -import { assertThrowsRestError } from "../../utils/testHelpers"; +import { assertThrowsRestError } from "../../public/utils/testHelpers"; describe("ThrottlingRetryPolicy", () => { class PassThroughPolicy { diff --git a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts index b43d1f0a9a46..900525f082a0 100644 --- a/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/auth.spec.ts @@ -6,7 +6,7 @@ import { startRecorder, getTokenAuthenticationCredential, CredsAndEndpoint -} from "../utils/testHelpers"; +} from "./utils/testHelpers"; import * as assert from "assert"; import { Recorder, isPlaybackMode } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts index b4cf48c70b78..6bf51a263f36 100644 --- a/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/etags.spec.ts @@ -7,7 +7,7 @@ import { createAppConfigurationClientForTests, deleteKeyCompletely, assertThrowsRestError -} from "../utils/testHelpers"; +} from "./utils/testHelpers"; import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts index 029271ad420c..26004a576d79 100644 --- a/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.readonlytests.spec.ts @@ -4,7 +4,7 @@ import { deleteKeyCompletely, assertThrowsAbortError, startRecorder -} from "../utils/testHelpers"; +} from "./utils/testHelpers"; import { AppConfigurationClient } from "../../src"; import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/public/index.spec.ts b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts index 3165f5a49dfa..c9ec1bba5497 100644 --- a/sdk/appconfiguration/app-configuration/test/public/index.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/index.spec.ts @@ -10,7 +10,7 @@ import { assertThrowsRestError, assertThrowsAbortError, startRecorder -} from "../utils/testHelpers"; +} from "./utils/testHelpers"; import { AppConfigurationClient, ConfigurationSetting } from "../../src"; import { delay } from "@azure/core-http"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts index 7c4b61b951fb..0d565815e663 100644 --- a/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/public/throwOrNotThrow.spec.ts @@ -4,7 +4,7 @@ import { deleteKeyCompletely, assertThrowsRestError, startRecorder -} from "../utils/testHelpers"; +} from "./utils/testHelpers"; import * as assert from "assert"; import { Recorder } from "@azure/test-utils-recorder"; diff --git a/sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts similarity index 100% rename from sdk/appconfiguration/app-configuration/test/utils/testHelpers.ts rename to sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts From 3378bc9d33ef6423d4625138b89d76ec9a6b40ec Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 15:23:30 -0800 Subject: [PATCH 11/19] update src refs --- .../app-configuration/test/public/utils/testHelpers.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts index a4a8f8bc92d8..91854b31017c 100644 --- a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -import { AppConfigurationClient, AppConfigurationClientOptions } from "../../src"; +import { AppConfigurationClient, AppConfigurationClientOptions } from "../../../src"; import { PagedAsyncIterableIterator } from "@azure/core-paging"; import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../../src"; import { env, isPlaybackMode, RecorderEnvironmentSetup, record } from "@azure/test-utils-recorder"; @@ -69,9 +69,9 @@ export function getTokenAuthenticationCredential(): CredsAndEndpoint | undefined }; } -export function createAppConfigurationClientForTests( - options?: Options -): AppConfigurationClient | undefined { +export function createAppConfigurationClientForTests< + Options extends AppConfigurationClientOptions = AppConfigurationClientOptions +>(options?: Options): AppConfigurationClient | undefined { const connectionString = env["APPCONFIG_CONNECTION_STRING"]; if (connectionString == null) { From ad2eaa9a36515d2226ba15d28207685b4eacc88b Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 25 Nov 2020 15:50:08 -0800 Subject: [PATCH 12/19] update src refs --- .../app-configuration/test/public/utils/testHelpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts index 91854b31017c..be546f5de2b5 100644 --- a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts @@ -3,7 +3,7 @@ import { AppConfigurationClient, AppConfigurationClientOptions } from "../../../src"; import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../../src"; +import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../../../src"; import { env, isPlaybackMode, RecorderEnvironmentSetup, record } from "@azure/test-utils-recorder"; import * as assert from "assert"; From 372273995d0f6ce94ee615db973940767ee418a3 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Mon, 30 Nov 2020 18:02:28 -0800 Subject: [PATCH 13/19] rest error condition --- .../app-configuration/test/public/utils/testHelpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts index be546f5de2b5..5070fe912b2c 100644 --- a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts @@ -157,7 +157,7 @@ export async function assertThrowsRestError( await testFunction(); assert.fail(`${message}: No error thrown`); } catch (err) { - if (err instanceof RestError) { + if (err.name === RestError) { assert.equal(expectedStatusCode, err.statusCode, message); return err; } From ef72e2f2b8358ffb2a1ed35e689a2de781867138 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Mon, 30 Nov 2020 18:24:17 -0800 Subject: [PATCH 14/19] rest error condition --- .../app-configuration/test/public/utils/testHelpers.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts index 5070fe912b2c..6b28b84b8be0 100644 --- a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts @@ -3,7 +3,11 @@ import { AppConfigurationClient, AppConfigurationClientOptions } from "../../../src"; import { PagedAsyncIterableIterator } from "@azure/core-paging"; -import { ConfigurationSetting, ListConfigurationSettingPage, ListRevisionsPage } from "../../../src"; +import { + ConfigurationSetting, + ListConfigurationSettingPage, + ListRevisionsPage +} from "../../../src"; import { env, isPlaybackMode, RecorderEnvironmentSetup, record } from "@azure/test-utils-recorder"; import * as assert from "assert"; @@ -157,7 +161,7 @@ export async function assertThrowsRestError( await testFunction(); assert.fail(`${message}: No error thrown`); } catch (err) { - if (err.name === RestError) { + if (err.name === "RestError") { assert.equal(expectedStatusCode, err.statusCode, message); return err; } From dc2629f704b482d5a6bfc61fee8f250347e781f8 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Mon, 30 Nov 2020 23:59:44 -0800 Subject: [PATCH 15/19] rest error import statement dropped --- .../app-configuration/test/public/utils/testHelpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts index 6b28b84b8be0..d31e5bf070ce 100644 --- a/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts +++ b/sdk/appconfiguration/app-configuration/test/public/utils/testHelpers.ts @@ -14,7 +14,7 @@ import * as assert from "assert"; // allow loading from a .env file as an alternative to defining the variable // in the environment import * as dotenv from "dotenv"; -import { RestError } from "@azure/core-http"; + import { DefaultAzureCredential, TokenCredential } from "@azure/identity"; dotenv.config(); From 029f77098c4028d5ad776efe5e6f1a3f283a173d Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 2 Dec 2020 14:00:52 -0800 Subject: [PATCH 16/19] see the directory path --- .../app-configuration/test/internal/package.spec.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts index 21a7acc022e9..6b15397e4c8f 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts @@ -4,7 +4,7 @@ import { isNode } from "@azure/core-http"; import { packageVersion } from "../../src/appConfigurationClient"; -describe("packagejson related tests", () => { +describe.only("packagejson related tests", () => { // if this test is failing you need to update the contant `packageVersion` referenced above // in the generated code. it("user agent string matches the package version", function() { @@ -18,6 +18,7 @@ describe("packagejson related tests", () => { try { // For integration tests + console.log(__dirname); const packageJsonFilePath = join(__dirname, "../../../package.json"); packageJsonContents = require(packageJsonFilePath); } catch (e) { From 7a650cfa0527b9fe188825b55b5d78a49c7dde31 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 2 Dec 2020 16:12:53 -0800 Subject: [PATCH 17/19] test if this fix works --- .../app-configuration/test/internal/package.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts index 6b15397e4c8f..f63f02bd91ba 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts @@ -18,12 +18,11 @@ describe.only("packagejson related tests", () => { try { // For integration tests - console.log(__dirname); const packageJsonFilePath = join(__dirname, "../../../package.json"); packageJsonContents = require(packageJsonFilePath); } catch (e) { // For unit tests - const packageJsonFilePath = join(__dirname, "../../package.json"); + const packageJsonFilePath = join(__dirname, "../package.json"); packageJsonContents = require(packageJsonFilePath); } From b2b2e01638c20d8a50d4dad76d0e0006c75f5603 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 2 Dec 2020 16:33:01 -0800 Subject: [PATCH 18/19] remove .only --- .../app-configuration/test/internal/package.spec.ts | 2 +- .../internal/{policies => }/throttlingRetryPolicyTests.spec.ts | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk/appconfiguration/app-configuration/test/internal/{policies => }/throttlingRetryPolicyTests.spec.ts (100%) diff --git a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts index f63f02bd91ba..b7c823cc0fbc 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/package.spec.ts @@ -4,7 +4,7 @@ import { isNode } from "@azure/core-http"; import { packageVersion } from "../../src/appConfigurationClient"; -describe.only("packagejson related tests", () => { +describe("packagejson related tests", () => { // if this test is failing you need to update the contant `packageVersion` referenced above // in the generated code. it("user agent string matches the package version", function() { diff --git a/sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts similarity index 100% rename from sdk/appconfiguration/app-configuration/test/internal/policies/throttlingRetryPolicyTests.spec.ts rename to sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts From ba68ff60806ff6631484d2870ad343225727b75a Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 2 Dec 2020 16:58:57 -0800 Subject: [PATCH 19/19] adjust references --- .../test/internal/throttlingRetryPolicyTests.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts b/sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts index 54a1f8032564..163ab5567669 100644 --- a/sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts +++ b/sdk/appconfiguration/app-configuration/test/internal/throttlingRetryPolicyTests.spec.ts @@ -11,8 +11,8 @@ import { RequestPolicy, RestError } from "@azure/core-http"; -import { ThrottlingRetryPolicy, getDelayInMs } from "../../../src/policies/throttlingRetryPolicy"; -import { assertThrowsRestError } from "../../public/utils/testHelpers"; +import { ThrottlingRetryPolicy, getDelayInMs } from "../../src/policies/throttlingRetryPolicy"; +import { assertThrowsRestError } from "../public/utils/testHelpers"; describe("ThrottlingRetryPolicy", () => { class PassThroughPolicy {