Communication: fix test-resources config (Azure#11434)

deyaaeldeen · Sep 25, 2020 · 0ba1cf7 · 0ba1cf7
1 parent 7f8aa53
commit 0ba1cf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 28 deletions.
diff --git a/sdk/communication/communication-administration/sample.env b/sdk/communication/communication-administration/sample.env
@@ -1,4 +1,4 @@
-# Used in most samples. Retrieve these values from a Cognitive Services instance
+# Used in most samples. Retrieve these values from a Communication Services resource
 # in the Azure Portal.
 COMMUNICATION_CONNECTION_STRING="endpoint=<endpoint>;accessKey=<accessKey>"
 

diff --git a/sdk/communication/test-resources.json b/sdk/communication/test-resources.json
@@ -9,51 +9,30 @@
         "description": "The base resource name."
       }
     },
-    "location": {
-      "type": "string",
-      "defaultValue": "[resourceGroup().location]",
-      "metadata": {
-        "description": "The location of the resource. By default, this is the same as the resource group."
-      }
-    },
     "endpointPrefix": {
       "defaultValue": "communication",
       "type": "string"
     },
-    "endpointSuffix": {
-      "defaultValue": ".communications.azure.net",
-      "type": "string"
-    },
     "testApplicationOid": {
       "type": "string",
       "metadata": {
         "description": "The client OID to grant access to test resources."
       }
     },
-    "testApplicationId": {
-      "type": "string",
-      "metadata": {
-        "description": "The application client ID used to run tests."
-      }
-    },
-    "testApplicationSecret": {
-      "type": "string",
-      "metadata": {
-        "description": "The application client secret used to run tests."
-      }
-    }
   },
   "variables": {
     "uniqueSubDomainName": "[format('{0}-{1}', parameters('baseName'), parameters('endpointPrefix'))]",
-    "endpointValue": "[format('https://{0}-{1}{2}', parameters('baseName'), parameters('endpointPrefix'), parameters('endpointSuffix'))]",
     "contributorRoleId": "b24988ac-6180-42a0-ab88-20f7382dd24c"
   },
   "resources": [
     {
       "type": "Microsoft.Communication/CommunicationServices",
-      "apiVersion": "2019-10-10-preview",
+      "apiVersion": "2020-08-20-preview",
       "name": "[variables('uniqueSubDomainName')]",
-      "location": "[parameters('location')]"
+      "location": "global",
+      "properties": {
+        "dataLocation": "UnitedStates"
+      }
     },
     {
       "type": "Microsoft.Authorization/roleAssignments",
@@ -69,7 +48,7 @@
   "outputs": {
     "COMMUNICATION_CONNECTION_STRING": {
       "type": "string",
-      "value": "[listKeys(resourceId('Microsoft.Communication/CommunicationServices',variables('uniqueSubDomainName')), '2019-10-10-preview').primaryConnectionString]"
+      "value": "[listKeys(resourceId('Microsoft.Communication/CommunicationServices',variables('uniqueSubDomainName')), '2020-08-20-preview').primaryConnectionString]"
     },
     "RESOURCE_GROUP_NAME": {
       "type": "string",