From f6834cdb84a8bacad1f412d2c94822c01c5c53c5 Mon Sep 17 00:00:00 2001 From: Ramya Raja Date: Tue, 23 Jul 2019 11:24:11 -0700 Subject: [PATCH] Update AAD env vars --- sdk/eventhub/event-hubs/samples/usingAadAuth.ts | 2 +- sdk/eventhub/event-hubs/test/client.spec.ts | 12 ++++++------ sdk/eventhub/event-hubs/test/utils/testUtils.ts | 12 ++++++------ sdk/eventhub/event-hubs/tests.yml | 7 +++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/sdk/eventhub/event-hubs/samples/usingAadAuth.ts b/sdk/eventhub/event-hubs/samples/usingAadAuth.ts index 3c05373b7e25..17a798ed0566 100644 --- a/sdk/eventhub/event-hubs/samples/usingAadAuth.ts +++ b/sdk/eventhub/event-hubs/samples/usingAadAuth.ts @@ -27,7 +27,7 @@ import { EnvironmentCredential } from "@azure/identity"; const evenHubsEndpoint = ""; // .servicebus.windows.net const eventHubName = ""; -// Define AZURE_TENANT_ID, AZURE_CLIENT_ID and AZURE_CLIENT_SECRET of your AAD application in your environment +// Define EVENTHUB_AAD_TENANT_ID, EVENTHUB_AAD_CLIENT_ID and EVENTHUB_AAD_CLIENT_SECRET of your AAD application in your environment async function main(): Promise { const credential = new EnvironmentCredential(); diff --git a/sdk/eventhub/event-hubs/test/client.spec.ts b/sdk/eventhub/event-hubs/test/client.spec.ts index 6bb692350019..2b786811648a 100644 --- a/sdk/eventhub/event-hubs/test/client.spec.ts +++ b/sdk/eventhub/event-hubs/test/client.spec.ts @@ -70,16 +70,16 @@ describe("Create EventHubClient #RunnableInBrowser", function(): void { void > { should.exist( - env[EnvVarKeys.AZURE_CLIENT_ID], - "define AZURE_CLIENT_ID in your environment before running integration tests." + env[EnvVarKeys.EVENTHUB_AAD_CLIENT_ID], + "define EVENTHUB_AAD_CLIENT_ID in your environment before running integration tests." ); should.exist( - env[EnvVarKeys.AZURE_TENANT_ID], - "define AZURE_TENANT_ID in your environment before running integration tests." + env[EnvVarKeys.EVENTHUB_AAD_TENANT_ID], + "define EVENTHUB_AAD_TENANT_ID in your environment before running integration tests." ); should.exist( - env[EnvVarKeys.AZURE_CLIENT_SECRET], - "define AZURE_CLIENT_SECRET in your environment before running integration tests." + env[EnvVarKeys.EVENTHUB_AAD_CLIENT_SECRET], + "define EVENTHUB_AAD_CLIENT_SECRET in your environment before running integration tests." ); should.exist( env[EnvVarKeys.EVENTHUB_CONNECTION_STRING], diff --git a/sdk/eventhub/event-hubs/test/utils/testUtils.ts b/sdk/eventhub/event-hubs/test/utils/testUtils.ts index 522626075ae7..c02df9c832c2 100644 --- a/sdk/eventhub/event-hubs/test/utils/testUtils.ts +++ b/sdk/eventhub/event-hubs/test/utils/testUtils.ts @@ -11,9 +11,9 @@ export enum EnvVarKeys { EVENTHUB_CONNECTION_STRING = "EVENTHUB_CONNECTION_STRING", EVENTHUB_NAME = "EVENTHUB_NAME", IOTHUB_CONNECTION_STRING = "IOTHUB_CONNECTION_STRING", - AZURE_TENANT_ID = "AZURE_TENANT_ID", - AZURE_CLIENT_ID = "AZURE_CLIENT_ID", - AZURE_CLIENT_SECRET = "AZURE_CLIENT_SECRET" + EVENTHUB_AAD_TENANT_ID = "EVENTHUB_AAD_TENANT_ID", + EVENTHUB_AAD_CLIENT_ID = "EVENTHUB_AAD_CLIENT_ID", + EVENTHUB_AAD_CLIENT_SECRET = "EVENTHUB_AADCLIENT_SECRET" } function getEnvVarValue(name: string): string | undefined { @@ -30,8 +30,8 @@ export function getEnvVars(): { [key in EnvVarKeys]: any } { [EnvVarKeys.EVENTHUB_CONNECTION_STRING]: getEnvVarValue(EnvVarKeys.EVENTHUB_CONNECTION_STRING), [EnvVarKeys.EVENTHUB_NAME]: getEnvVarValue(EnvVarKeys.EVENTHUB_NAME), [EnvVarKeys.IOTHUB_CONNECTION_STRING]: getEnvVarValue(EnvVarKeys.IOTHUB_CONNECTION_STRING), - [EnvVarKeys.AZURE_TENANT_ID]: getEnvVarValue(EnvVarKeys.AZURE_TENANT_ID), - [EnvVarKeys.AZURE_CLIENT_ID]: getEnvVarValue(EnvVarKeys.AZURE_CLIENT_ID), - [EnvVarKeys.AZURE_CLIENT_SECRET]: getEnvVarValue(EnvVarKeys.AZURE_CLIENT_SECRET) + [EnvVarKeys.EVENTHUB_AAD_TENANT_ID]: getEnvVarValue(EnvVarKeys.EVENTHUB_AAD_TENANT_ID), + [EnvVarKeys.EVENTHUB_AAD_CLIENT_ID]: getEnvVarValue(EnvVarKeys.EVENTHUB_AAD_CLIENT_ID), + [EnvVarKeys.EVENTHUB_AAD_CLIENT_SECRET]: getEnvVarValue(EnvVarKeys.EVENTHUB_AAD_CLIENT_SECRET) }; } diff --git a/sdk/eventhub/event-hubs/tests.yml b/sdk/eventhub/event-hubs/tests.yml index 0823168fc436..3ef39f6f2e11 100644 --- a/sdk/eventhub/event-hubs/tests.yml +++ b/sdk/eventhub/event-hubs/tests.yml @@ -53,9 +53,8 @@ jobs: EVENTHUB_NAME: "hub_mac_node8" EnvVars: - AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) - AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) - AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) + EVENTHUB_AAD_CLIENT_ID: $(aad-azure-sdk-test-client-id) + EVENTHUB_AAD_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) + EVENTHUB_AAD_TENANT_ID: $(aad-azure-sdk-test-tenant-id) IOTHUB_CONNECTION_STRING: $(js-event-hubs-test-iothub-connection-string) EVENTHUB_CONNECTION_STRING: $(js-event-hubs-test-connection-string) - ENDPOINT: $(js-event-hubs-test-endpoint)