From bf61f7546fcceb7c2101203c732f53b563a7485e Mon Sep 17 00:00:00 2001 From: Harsha Nalluru Date: Fri, 10 Dec 2021 09:54:00 +0000 Subject: [PATCH 1/6] load the env file by default --- sdk/test-utils/recorder-new/src/index.ts | 4 ++++ sdk/test-utils/testing-recorder-new/src/index.ts | 2 ++ sdk/test-utils/testing-recorder-new/test/core-v1-test.spec.ts | 2 -- sdk/test-utils/testing-recorder-new/test/core-v2-test.spec.ts | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/test-utils/recorder-new/src/index.ts b/sdk/test-utils/recorder-new/src/index.ts index 9edaf4d68f7e..40cee129bbc2 100644 --- a/sdk/test-utils/recorder-new/src/index.ts +++ b/sdk/test-utils/recorder-new/src/index.ts @@ -6,3 +6,7 @@ export { TestProxyHttpClientCoreV1 } from "./core-v1-recorder"; export { relativeRecordingsPath } from "./utils/relativePathCalculator"; export { SanitizerOptions, RecorderStartOptions } from "./utils/utils"; export { NoOpCredential } from "./recorderAADCredential"; + +// Initialize the environment +import { config } from "dotenv"; +config(); diff --git a/sdk/test-utils/testing-recorder-new/src/index.ts b/sdk/test-utils/testing-recorder-new/src/index.ts index e69de29bb2d1..fd2aca680c7b 100644 --- a/sdk/test-utils/testing-recorder-new/src/index.ts +++ b/sdk/test-utils/testing-recorder-new/src/index.ts @@ -0,0 +1,2 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. diff --git a/sdk/test-utils/testing-recorder-new/test/core-v1-test.spec.ts b/sdk/test-utils/testing-recorder-new/test/core-v1-test.spec.ts index b57952b9e892..4e865d600cbe 100644 --- a/sdk/test-utils/testing-recorder-new/test/core-v1-test.spec.ts +++ b/sdk/test-utils/testing-recorder-new/test/core-v1-test.spec.ts @@ -4,9 +4,7 @@ import { env, isPlaybackMode } from "@azure-tools/test-recorder"; import { QueueServiceClient } from "@azure/storage-queue"; import { TestProxyHttpClientCoreV1 } from "@azure-tools/test-recorder-new"; -import { config } from "dotenv"; import { RecorderStartOptions } from "@azure-tools/test-recorder-new"; -config(); const fakeSASUrl = "https://account_name.queue.core.windows.net/?sv=2020-08-04&ss=bfqt&srt=sco&sp=rwdlacuptfx&se=2026-07-10T07:00:24Z&st=2021-07-09T23:00:24Z&spr=https&sig=fake_sig"; diff --git a/sdk/test-utils/testing-recorder-new/test/core-v2-test.spec.ts b/sdk/test-utils/testing-recorder-new/test/core-v2-test.spec.ts index 137aa6a3c0f3..1a376f1e669d 100644 --- a/sdk/test-utils/testing-recorder-new/test/core-v2-test.spec.ts +++ b/sdk/test-utils/testing-recorder-new/test/core-v2-test.spec.ts @@ -8,10 +8,8 @@ import { recorderHttpPolicy, RecorderStartOptions } from "@azure-tools/test-recorder-new"; -import { config } from "dotenv"; import { createSimpleEntity } from "./utils/utils"; import { SanitizerOptions } from "@azure-tools/test-recorder-new"; -config(); const fakeConnString = "TableEndpoint=https://fakeaccountname.table.core.windows.net/;SharedAccessSignature=st=2021-08-03T08:52:15Z&spr=https&sig=fakesigval"; From a774935d2ee8ad92708c17133a4e6df35835ccd1 Mon Sep 17 00:00:00 2001 From: Harsha Nalluru Date: Fri, 10 Dec 2021 09:57:00 +0000 Subject: [PATCH 2/6] changelog --- sdk/test-utils/recorder-new/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/test-utils/recorder-new/CHANGELOG.md b/sdk/test-utils/recorder-new/CHANGELOG.md index 6ef667c8d0ee..91c015597130 100644 --- a/sdk/test-utils/recorder-new/CHANGELOG.md +++ b/sdk/test-utils/recorder-new/CHANGELOG.md @@ -2,6 +2,11 @@ ## 1.0.0 (Unreleased) +## 2021-12-10 + +- Loads the .env file using with the help of "dotenv" by default. + [#19139](https://github.com/Azure/azure-sdk-for-js/pull/19139) + ## 2021-11-30 - Adds NoOp AAD Credential for playback `NoOpCredential`. Using this as your AAD credential in playback mode would avoid the AAD traffic in playback. From 56785b8e6e6e2f1db076734ff84673d2cccecf9b Mon Sep 17 00:00:00 2001 From: Harsha Nalluru Date: Fri, 10 Dec 2021 11:22:25 +0000 Subject: [PATCH 3/6] fix up --- sdk/test-utils/recorder-new/src/index.ts | 5 +---- sdk/test-utils/recorder-new/src/utils/env.browser.ts | 4 ++++ sdk/test-utils/recorder-new/src/utils/env.ts | 7 +++++++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 sdk/test-utils/recorder-new/src/utils/env.browser.ts create mode 100644 sdk/test-utils/recorder-new/src/utils/env.ts diff --git a/sdk/test-utils/recorder-new/src/index.ts b/sdk/test-utils/recorder-new/src/index.ts index 40cee129bbc2..4786d52ed283 100644 --- a/sdk/test-utils/recorder-new/src/index.ts +++ b/sdk/test-utils/recorder-new/src/index.ts @@ -6,7 +6,4 @@ export { TestProxyHttpClientCoreV1 } from "./core-v1-recorder"; export { relativeRecordingsPath } from "./utils/relativePathCalculator"; export { SanitizerOptions, RecorderStartOptions } from "./utils/utils"; export { NoOpCredential } from "./recorderAADCredential"; - -// Initialize the environment -import { config } from "dotenv"; -config(); +export { env } from "@azure-tools/test-recorder"; diff --git a/sdk/test-utils/recorder-new/src/utils/env.browser.ts b/sdk/test-utils/recorder-new/src/utils/env.browser.ts new file mode 100644 index 000000000000..fa3a06cb1e6e --- /dev/null +++ b/sdk/test-utils/recorder-new/src/utils/env.browser.ts @@ -0,0 +1,4 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +// In the browser, we instead load the env variables with the help of karma.conf.js diff --git a/sdk/test-utils/recorder-new/src/utils/env.ts b/sdk/test-utils/recorder-new/src/utils/env.ts new file mode 100644 index 000000000000..08a1d3e26e76 --- /dev/null +++ b/sdk/test-utils/recorder-new/src/utils/env.ts @@ -0,0 +1,7 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +import * as dotenv from "dotenv"; + +// Initialize the environment +dotenv.config(); From 94b5c91c35cbaa7c1de09420566f491b80e822f5 Mon Sep 17 00:00:00 2001 From: Harsha Nalluru Date: Fri, 10 Dec 2021 11:42:02 +0000 Subject: [PATCH 4/6] mapping --- sdk/test-utils/recorder-new/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/test-utils/recorder-new/package.json b/sdk/test-utils/recorder-new/package.json index dc9545a18785..ab355cbd09e3 100644 --- a/sdk/test-utils/recorder-new/package.json +++ b/sdk/test-utils/recorder-new/package.json @@ -8,6 +8,7 @@ "types": "./types/src/index.d.ts", "browser": { "./dist-esm/src/utils/relativePathCalculator.js": "./dist-esm/src/utils/relativePathCalculator.browser.js", + "./dist-esm/src/utils/env.js": "./dist-esm/src/utils/env.browser.js", "./dist-esm/test/utils/server.js": "./dist-esm/test/utils/server.browser.js" }, "scripts": { From 5a23d08a7c663168e4368dc7888e0c7e67633ac2 Mon Sep 17 00:00:00 2001 From: Harsha Nalluru Date: Fri, 10 Dec 2021 21:12:26 +0000 Subject: [PATCH 5/6] env redeclare --- sdk/test-utils/recorder-new/src/utils/env.browser.ts | 4 +++- sdk/test-utils/recorder-new/src/utils/env.ts | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/test-utils/recorder-new/src/utils/env.browser.ts b/sdk/test-utils/recorder-new/src/utils/env.browser.ts index fa3a06cb1e6e..46511d143e8c 100644 --- a/sdk/test-utils/recorder-new/src/utils/env.browser.ts +++ b/sdk/test-utils/recorder-new/src/utils/env.browser.ts @@ -1,4 +1,6 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -// In the browser, we instead load the env variables with the help of karma.conf.js +// In the browser, we load the env variables with the help of karma.conf.js + +export const env = (window as any).__env__; diff --git a/sdk/test-utils/recorder-new/src/utils/env.ts b/sdk/test-utils/recorder-new/src/utils/env.ts index 08a1d3e26e76..3bba58dd03a3 100644 --- a/sdk/test-utils/recorder-new/src/utils/env.ts +++ b/sdk/test-utils/recorder-new/src/utils/env.ts @@ -5,3 +5,5 @@ import * as dotenv from "dotenv"; // Initialize the environment dotenv.config(); + +export const env = process.env; From cf757904f3cef2c3c57d3c22bd897d7aa5289b98 Mon Sep 17 00:00:00 2001 From: Harsha Nalluru Date: Fri, 10 Dec 2021 21:47:11 +0000 Subject: [PATCH 6/6] update index --- sdk/test-utils/recorder-new/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/test-utils/recorder-new/src/index.ts b/sdk/test-utils/recorder-new/src/index.ts index 4786d52ed283..ad346f007e16 100644 --- a/sdk/test-utils/recorder-new/src/index.ts +++ b/sdk/test-utils/recorder-new/src/index.ts @@ -6,4 +6,4 @@ export { TestProxyHttpClientCoreV1 } from "./core-v1-recorder"; export { relativeRecordingsPath } from "./utils/relativePathCalculator"; export { SanitizerOptions, RecorderStartOptions } from "./utils/utils"; export { NoOpCredential } from "./recorderAADCredential"; -export { env } from "@azure-tools/test-recorder"; +export { env } from "./utils/env";