[KeyVault] Small cleanup on the tests-resources (Azure#6212)

Fixes Azure#5238
mikeharder · Nov 19, 2019 · 2e083dc · 2e083dc
1 parent ccd0527
commit 2e083dc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-integration.yml b/eng/pipelines/templates/jobs/archetype-sdk-integration.yml
@@ -69,7 +69,7 @@ jobs:
               az group create --name $resourceGroupName --location $env:PROVISIONER_RG_LOCATION --tags DeleteAfter=$resourceGroupExpiration
               az group wait --created --resource-group $resourceGroupName
 
-              az group deployment create --resource-group $resourceGroupName --template-file ${{ parameters.ResourceFileLocation }} --parameters unique_id=$uniqueIdentifier location="$env:PROVISIONER_RG_LOCATION" tenant_id="$env:PROVISIONER_AAD_TENANT" test_app_id="$env:TEST_APP_ID"
+              az group deployment create --resource-group $resourceGroupName --template-file ${{ parameters.ResourceFileLocation }} --parameters unique_id=$uniqueIdentifier tenant_id="$env:PROVISIONER_AAD_TENANT" test_app_id="$env:TEST_APP_ID"
 
             env:
               PROVISIONER_AAD_ID: $(provisioner-aad-id)

diff --git a/sdk/keyvault/keyvault-certificates/tests-resources.json b/sdk/keyvault/keyvault-certificates/tests-resources.json
@@ -5,23 +5,22 @@
     "unique_id": {
       "type": "String"
     },
-    "location": {
-      "type": "String"
-    },
     "tenant_id": {
       "type": "String"
     },
     "test_app_id": {
       "type": "String"
     }
   },
-  "variables": {},
+  "variables": {
+    "location": "[resourceGroup().location]"
+  },
   "resources": [
     {
       "type": "Microsoft.KeyVault/vaults",
       "apiVersion": "2016-10-01",
       "name": "[parameters('unique_id')]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "properties": {
         "sku": {
           "family": "A",

diff --git a/sdk/keyvault/keyvault-keys/tests-resources.json b/sdk/keyvault/keyvault-keys/tests-resources.json
@@ -5,23 +5,22 @@
     "unique_id": {
       "type": "String"
     },
-    "location": {
-      "type": "String"
-    },
     "tenant_id": {
       "type": "String"
     },
     "test_app_id": {
       "type": "String"
     }
   },
-  "variables": {},
+  "variables": {
+    "location": "[resourceGroup().location]"
+  },
   "resources": [
     {
       "type": "Microsoft.KeyVault/vaults",
       "apiVersion": "2016-10-01",
       "name": "[parameters('unique_id')]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "properties": {
         "sku": {
           "family": "A",

diff --git a/sdk/keyvault/keyvault-secrets/tests-resources.json b/sdk/keyvault/keyvault-secrets/tests-resources.json
@@ -5,23 +5,22 @@
     "unique_id": {
       "type": "String"
     },
-    "location": {
-      "type": "String"
-    },
     "tenant_id": {
       "type": "String"
     },
     "test_app_id": {
       "type": "String"
     }
   },
-  "variables": {},
+  "variables": {
+    "location": "[resourceGroup().location]"
+  },
   "resources": [
     {
       "type": "Microsoft.KeyVault/vaults",
       "apiVersion": "2016-10-01",
       "name": "[parameters('unique_id')]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "properties": {
         "sku": {
           "family": "A",