Azure · zzhxiaofeng · Jul 6, 2021 · Jul 8, 2021 · Jul 9, 2021 · Jul 13, 2021
diff --git a/sdk/eventhub/event-hubs/test/public/eventHubConsumerClient.spec.ts b/sdk/eventhub/event-hubs/test/public/eventHubConsumerClient.spec.ts
@@ -359,7 +359,7 @@ describe("EventHubConsumerClient", () => {
         });
 
         await loopUntil({
-          maxTimes: 10,
+          maxTimes: 20,
           name:
             "Wait for subscription2 to read from all partitions and subscription1 to invoke close handlers",
           timeBetweenRunsMs: 1000,

diff --git a/sdk/eventhub/event-hubs/tests.yml b/sdk/eventhub/event-hubs/tests.yml
@@ -5,9 +5,18 @@ stages:
     parameters:
       PackageName: "@azure/event-hubs"
       ServiceDirectory: eventhub
-      Clouds: 'Public,Canary'
+      TimeoutInMinutes: 120
+      SupportedClouds: 'Public,UsGov,China'
+      CloudConfig:
+        Public:
+          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        UsGov:
+          SubscriptionConfiguration: $(sub-config-gov-test-resources)
+          Location: 'usgovarizona'
+        China:
+          SubscriptionConfiguration: $(sub-config-cn-test-resources)
       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)
+        AZURE_CLIENT_ID: $(EVENTHUB_CLIENT_ID)
+        AZURE_CLIENT_SECRET: $(EVENTHUB_CLIENT_SECRET)
+        AZURE_TENANT_ID: $(EVENTHUB_TENANT_ID)
         AZURE_LOG_LEVEL: info
diff --git a/sdk/formrecognizer/ai-form-recognizer/test/public/node/formrecognizerclient.spec.ts b/sdk/formrecognizer/ai-form-recognizer/test/public/node/formrecognizerclient.spec.ts
@@ -31,6 +31,28 @@ type MaybeTypedFormField<T extends FormField["valueType"]> =
 
 matrix([[true, false]] as const, async (useAad) => {
   describe(`[${useAad ? "AAD" : "API Key"}] FormRecognizerClient NodeJS only`, () => {
+    console.log("-----------------------------------1");
+    const aa = env.FORM_RECOGNIZER_ENDPOINT.toString();
+    for (var i = 0; i < aa.length; i++) {
+      console.log(aa[i]);
+    }
+    console.log("-----------------------------------2");
+    const bb = process.env["AZURE_TENANT_ID"]!.toString();
+    for (var i = 0; i < bb.length; i++) {
+      console.log(bb[i]);
+    }
+    console.log("-----------------------------------3");
+    const cc = process.env["TEST_MODE"]!.toString();
+    for (var i = 0; i < cc.length; i++) {
+      console.log(cc[i]);
+    }
+    console.log("-----------------------------------4");
+    const dd = process.env["FORM_RECOGNIZER_TARGET_RESOURCE_REGION"]!.toString();
+    for (var i = 0; i < dd.length; i++) {
+      console.log(dd[i]);
+    }
+    console.log("-----------------------------------5");
+
     const ASSET_PATH = path.resolve(path.join(process.cwd(), "assets"));
     let client: FormRecognizerClient;
     let recorder: Recorder;

@@ -2,11 +2,6 @@
 # specifying a different Azure region to use when manually triggering the live
 # tests pipeline. This is useful for when we want to test in different
 # environments: Prod, Canary, etc.
-parameters:
-- name: Location
-  displayName: Location
-  type: string
-  default: canadacentral
 
 trigger: none
 
@@ -15,8 +10,9 @@ stages:
     parameters:
       PackageName: "@azure/ai-form-recognizer"
       ServiceDirectory: formrecognizer
-      Location: "${{ parameters.Location }}"
+      TimeoutInMinutes: 120
+      SupportedClouds: 'Public,UsGov,China'
       EnvVars:
-        AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
-        AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
-        AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
+        AZURE_CLIENT_ID: $(FORMRECOGNIZER_CLIENT_ID)
+        AZURE_TENANT_ID: $(FORMRECOGNIZER_TENANT_ID)
+        AZURE_CLIENT_SECRET: $(FORMRECOGNIZER_CLIENT_SECRET)
diff --git a/sdk/formrecognizer/test-resources.json b/sdk/formrecognizer/test-resources.json
@@ -36,7 +36,7 @@
     },
     "blobResourceId": {
       "type": "string",
-      "defaultValue": "[resourceId('2cd617ea-1866-46b1-90e3-fffb087ebf9b', 'TrainingData', 'Microsoft.Storage/storageAccounts', parameters('blobStorageAccount'))]"
+      "defaultValue": "[resourceId('TrainingData', 'Microsoft.Storage/storageAccounts', parameters('blobStorageAccount'))]"
     },
     "trainingDataSasProperties": {
       "type": "object",
@@ -68,6 +68,10 @@
         "signedPermission": "rl",
         "signedResource": "c"
       }
+    },
+    "cognitiveServicesEndpointSuffix": {
+      "type": "string",
+      "defaultValue": ".cognitiveservices.azure.com"
     }
   },
   "variables": {
@@ -101,7 +105,7 @@
   "outputs": {
     "FORM_RECOGNIZER_ENDPOINT": {
       "type": "string",
-      "value": "[concat('https://', parameters('baseName'), '.cognitiveservices.azure.com/')]"
+      "value": "[concat('https://', parameters('baseName'), parameters('cognitiveServicesEndpointSuffix'),'/')]"
     },
     "FORM_RECOGNIZER_API_KEY": {
       "type": "string",

diff --git a/sdk/search/search-documents/test/public/utils/recordedClient.ts b/sdk/search/search-documents/test/public/utils/recordedClient.ts
@@ -53,6 +53,15 @@ export const environmentSetup: RecorderEnvironmentSetup = {
 };
 
 export function createClients<IndexModel>(indexName: string): Clients<IndexModel> {
+  switch (testEnv.AZURE_AUTHORITY_HOST) {
+    case "https://login.microsoftonline.us":
+      process.env.ENDPOINT = process.env.ENDPOINT!.toString().replace(".windows.net", ".azure.us");
+      break;
+    case "https://login.chinacloudapi.cn":
+      process.env.ENDPOINT = process.env.ENDPOINT!.toString().replace(".windows.net", ".azure.cn");
+      break;
+  }
+
   const credential = new AzureKeyCredential(testEnv.SEARCH_API_ADMIN_KEY);
   const searchClient = new SearchClient<IndexModel>(testEnv.ENDPOINT, indexName, credential);
   const indexClient = new SearchIndexClient(testEnv.ENDPOINT, credential);

diff --git a/sdk/search/search-documents/tests.yml b/sdk/search/search-documents/tests.yml
@@ -5,3 +5,4 @@ stages:
     parameters:
       PackageName: "@azure/search-documents"
       ServiceDirectory: search
+      SupportedClouds: 'Public,UsGov,China'
diff --git a/sdk/search/test-resources.json b/sdk/search/test-resources.json
@@ -11,9 +11,9 @@
     },
     "searchSku": {
       "type": "string",
-      "defaultValue": "free",
+      "defaultValue": "basic",
       "metadata": {
-        "description": "SKU for search resource. The default is 'free'"
+        "description": "SKU for search resource. The default is 'basic'"
       }
     }
   },

diff --git a/sdk/servicebus/service-bus/tests.yml b/sdk/servicebus/service-bus/tests.yml
@@ -5,10 +5,10 @@ stages:
     parameters:
       PackageName: "@azure/service-bus"
       ServiceDirectory: servicebus
-      TimeoutInMinutes: 180
-      Clouds: 'Public,Canary'
+      TimeoutInMinutes: 120
+      SupportedClouds: 'Public,UsGov,China'
       EnvVars:
-        AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
-        AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
-        AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
+        AZURE_CLIENT_ID: $(SERVICEBUS_CLIENT_ID)
+        AZURE_TENANT_ID: $(SERVICEBUS_TENANT_ID)
+        AZURE_CLIENT_SECRET: $(SERVICEBUS_CLIENT_SECRET)
         AZURE_SUBSCRIPTION_ID: $(test-subscription-id)
diff --git a/sdk/textanalytics/ai-text-analytics/src/textAnalyticsClient.ts b/sdk/textanalytics/ai-text-analytics/src/textAnalyticsClient.ts
@@ -391,6 +391,14 @@ export class TextAnalyticsClient {
    */
   private readonly client: GeneratedClient;
 
+  // isBrowser(): boolean {
+  //   try {
+  //     return typeof self !== "undefined";
+  //   } catch (e) {
+  //     return false;
+  //   }
+  // }
+
   /**
    * Creates an instance of TextAnalyticsClient.
    *
@@ -429,6 +437,20 @@ export class TextAnalyticsClient {
 
     this.client = new GeneratedClient(this.endpointUrl, internalPipelineOptions);
 
+    // let scopes;
+    // const env = this.isBrowser() ? (self as any).__env__ : process.env;
+
+    // switch (env["AZURE_AUTHORITY_HOST"]) {
+    //   case "https://login.microsoftonline.us":
+    //     scopes = "https://cognitiveservices.azure.us/.default";
+    //     break;
+    //   case "https://login.chinacloudapi.cn":
+    //     scopes = "https://cognitiveservices.azure.cn/.default";
+    //     break;
+    //   default:
+    //     scopes = DEFAULT_COGNITIVE_SCOPE;
+    // }
+
     const authPolicy = isTokenCredential(credential)
       ? bearerTokenAuthenticationPolicy({ credential, scopes: DEFAULT_COGNITIVE_SCOPE })
       : textAnalyticsAzureKeyCredentialPolicy(credential);

@@ -5,7 +5,9 @@ stages:
     parameters:
       PackageName: "@azure/ai-text-analytics"
       ServiceDirectory: textanalytics
+      TimeoutInMinutes: 180
+      SupportedClouds: 'Public,UsGov,China'
       EnvVars:
-        AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
-        AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
-        AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
+        AZURE_CLIENT_ID: $(TEXTANALYTICS_CLIENT_ID)
+        AZURE_TENANT_ID: $(TEXTANALYTICS_TENANT_ID)
+        AZURE_CLIENT_SECRET: $(TEXTANALYTICS_CLIENT_SECRET)