Skip to content

Commit 63617f3

Browse files
committed
Use arm template parameters as sole input for live test environment variables
1 parent 7100624 commit 63617f3

File tree

3 files changed

+35
-2
lines changed

3 files changed

+35
-2
lines changed

sdk/attestation/test-resources.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@
1616
"description": "The location of the resource. By default, this is the same as the resource group."
1717
}
1818
},
19+
"storageEndpointSuffix": {
20+
"type": "string",
21+
"defaultValue": "core.windows.net",
22+
"metadata": {
23+
"description": "The url suffix to use when accessing the storage data plane."
24+
}
25+
},
1926
"isolatedSigningCertificate": {
2027
"type": "string",
2128
"defaultValue": ""
@@ -47,7 +54,7 @@
4754
"type": "Microsoft.Attestation/attestationProviders",
4855
"apiVersion": "2020-10-01",
4956
"name": "[variables('aadTenantName')]",
50-
"location": "[parameters('location')]",
57+
"location": "[parameters('location')]"
5158
},
5259
{
5360
"type": "Microsoft.Attestation/attestationProviders",
@@ -58,6 +65,10 @@
5865
}
5966
],
6067
"outputs": {
68+
"ATTESTATION_STORAGE_ENDPOINT_SUFFIX": {
69+
"type": "string",
70+
"value": "[parameters('storageEndpointSuffix')]"
71+
},
6172
"ATTESTATION_ISOLATED_URL": {
6273
"type": "string",
6374
"value": "[variables('isolatedUri')]"

sdk/keyvault/test-resources.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@
8686
"metadata": {
8787
"description": "Test attestation service for Secure Key Release."
8888
}
89+
},
90+
"storageEndpointSuffix": {
91+
"type": "string",
92+
"defaultValue": "core.windows.net",
93+
"metadata": {
94+
"description": "The url suffix to use when accessing the storage data plane."
95+
}
8996
}
9097
},
9198
"variables": {
@@ -273,6 +280,10 @@
273280
"type": "string",
274281
"value": "[parameters('testApplicationOid')]"
275282
},
283+
"KEYVAULT_STORAGE_ENDPOINT_SUFFIX": {
284+
"type": "string",
285+
"value": "[parameters('storageEndpointSuffix')]"
286+
},
276287
"BLOB_STORAGE_ACCOUNT_NAME": {
277288
"type": "string",
278289
"value": "[variables('primaryAccountName')]"

sdk/tables/test-resources.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
"metadata": {
1111
"description": "The principal to assign the role to. This is application object id."
1212
}
13+
},
14+
"tablesStorageEndpointSuffix": {
15+
"type": "string",
16+
"defaultValue": "core.windows.net",
17+
"metadata": {
18+
"description": "The url suffix to use when accessing the storage data plane."
19+
}
1320
}
1421
},
1522
"variables": {
@@ -107,6 +114,10 @@
107114
}
108115
],
109116
"outputs": {
117+
"TABLES_STORAGE_ENDPOINT_SUFFIX": {
118+
"type": "string",
119+
"value": "[parameters('tablesStorageEndpointSuffix')]"
120+
},
110121
"TABLES_STORAGE_ACCOUNT_NAME": {
111122
"type": "string",
112123
"value": "[variables('primaryAccountName')]"
@@ -124,4 +135,4 @@
124135
"value": "[listKeys(resourceId('Microsoft.DocumentDB/databaseAccounts', variables('primaryAccountName')), '2020-04-01').primaryMasterKey]"
125136
}
126137
}
127-
}
138+
}

0 commit comments

Comments
 (0)