Update AAD env vars

Azure · Jul 23, 2019 · f6834cd · f6834cd
1 parent 77c59a5
commit f6834cd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git 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 = ""; // <your-eventhubs-namespace>.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<void> {
   const credential = new EnvironmentCredential();

diff --git 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
@@ -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
@@ -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)