Skip to content

Commit f8ca765

Browse files
authored
Fix typo in resources json (Azure#19446)
* Remove unbalanced }. * Reformat the whole file * Fix environment variables * Remove arr artifact from mixedreality yml
1 parent 903406c commit f8ca765

File tree

4 files changed

+35
-39
lines changed

4 files changed

+35
-39
lines changed
Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "1.0.0.0",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3+
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"baseName": {
66
"type": "string",
@@ -28,28 +28,27 @@
2828
"apiVersion": "2020-05-01",
2929
"asaAccountName": "[concat(parameters('baseName'), '-asa-account')]"
3030
},
31-
"resources": [
32-
{
33-
"type": "Microsoft.MixedReality/spatialAnchorsAccounts",
34-
"name": "[variables('asaAccountName')]",
35-
"apiVersion": "[variables('apiVersion')]",
36-
"location": "[parameters('location')]",
37-
"properties": {}
38-
}
39-
],
40-
"outputs": {
41-
"MIXEDREALITY_ACCOUNT_ID": {
42-
"type": "string",
43-
"value": "[reference(variables('asaAccountName')).accountId]"
44-
},
45-
"MIXEDREALITY_ACCOUNT_DOMAIN": {
46-
"type": "string",
47-
"value": "[reference(variables('asaAccountName')).accountDomain]"
48-
},
49-
"MIXEDREALITY_ACCOUNT_KEY": {
50-
"type": "string",
51-
"value": "[listKeys(resourceId('Microsoft.MixedReality/spatialAnchorsAccounts', variables('asaAccountName')), variables('apiVersion')).primaryKey]"
52-
}
53-
}
31+
"resources": [
32+
{
33+
"type": "Microsoft.MixedReality/spatialAnchorsAccounts",
34+
"name": "[variables('asaAccountName')]",
35+
"apiVersion": "[variables('apiVersion')]",
36+
"location": "[parameters('location')]",
37+
"properties": {}
38+
}
39+
],
40+
"outputs": {
41+
"MIXEDREALITY_ACCOUNT_ID": {
42+
"type": "string",
43+
"value": "[reference(variables('asaAccountName')).accountId]"
44+
},
45+
"MIXEDREALITY_ACCOUNT_DOMAIN": {
46+
"type": "string",
47+
"value": "[reference(variables('asaAccountName')).accountDomain]"
48+
},
49+
"MIXEDREALITY_ACCOUNT_KEY": {
50+
"type": "string",
51+
"value": "[listKeys(resourceId('Microsoft.MixedReality/spatialAnchorsAccounts', variables('asaAccountName')), variables('apiVersion')).primaryKey]"
5452
}
53+
}
5554
}

sdk/mixedreality/tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@ stages:
99
- name: azure-mixedreality-authentication
1010
groupId: com.azure
1111
safeName: azuremixedrealityauthentication
12-
- name: azure-mixedreality-remoterendering
13-
groupId: com.azure
14-
safeName: azuremixedrealityremoterendering

sdk/remoterendering/test-resources-post.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ param (
1414
)
1515

1616
# outputs from the ARM deployment passed in from New-TestResources
17-
$StorageAccountName = $DeploymentOutputs['MIXEDREALITY_ARR_STORAGE_ACCOUNT_NAME']
18-
$StorageAccountKey = $DeploymentOutputs['MIXEDREALITY_ARR_STORAGE_ACCOUNT_KEY']
19-
$BlobContainerName = $DeploymentOutputs['MIXEDREALITY_ARR_BLOB_CONTAINER_NAME']
17+
$StorageAccountName = $DeploymentOutputs['REMOTERENDERING_ARR_STORAGE_ACCOUNT_NAME']
18+
$StorageAccountKey = $DeploymentOutputs['REMOTERENDERING_ARR_STORAGE_ACCOUNT_KEY']
19+
$BlobContainerName = $DeploymentOutputs['REMOTERENDERING_ARR_BLOB_CONTAINER_NAME']
2020

2121
$LocalFilePath = Join-Path $PSScriptRoot "TestResources\testBox.fbx"
2222
$TargetBlob = "Input/testBox.fbx"

sdk/remoterendering/test-resources.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,35 +85,35 @@
8585
}
8686
],
8787
"outputs": {
88-
"MIXEDREALITY_ARR_ACCOUNT_ID": {
88+
"REMOTERENDERING_ARR_ACCOUNT_ID": {
8989
"type": "string",
9090
"value": "[reference(variables('arrAccountName')).accountId]"
9191
},
92-
"MIXEDREALITY_ARR_ACCOUNT_DOMAIN": {
92+
"REMOTERENDERING_ARR_ACCOUNT_DOMAIN": {
9393
"type": "string",
9494
"value": "[reference(variables('arrAccountName')).accountDomain]"
9595
},
96-
"MIXEDREALITY_ARR_ACCOUNT_KEY": {
96+
"REMOTERENDERING_ARR_ACCOUNT_KEY": {
9797
"type": "string",
9898
"value": "[listKeys(resourceId('Microsoft.MixedReality/remoteRenderingAccounts', variables('arrAccountName')), variables('arrApiVersion')).primaryKey]"
9999
},
100-
"MIXEDREALITY_ARR_STORAGE_ACCOUNT_NAME": {
100+
"REMOTERENDERING_ARR_STORAGE_ACCOUNT_NAME": {
101101
"type": "string",
102102
"value": "[variables('storageAccountName')]"
103103
},
104-
"MIXEDREALITY_ARR_STORAGE_ACCOUNT_KEY": {
104+
"REMOTERENDERING_ARR_STORAGE_ACCOUNT_KEY": {
105105
"type": "string",
106106
"value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), variables('storageApiVersion')).keys[0].value]"
107107
},
108-
"MIXEDREALITY_ARR_BLOB_CONTAINER_NAME": {
108+
"REMOTERENDERING_ARR_BLOB_CONTAINER_NAME": {
109109
"type": "string",
110110
"value": "[variables('blobContainerName')]"
111111
},
112-
"MIXEDREALITY_ARR_SAS_TOKEN": {
112+
"REMOTERENDERING_ARR_SAS_TOKEN": {
113113
"type": "string",
114114
"value": "[listServiceSas(variables('storageAccountName'), variables('storageApiVersion'), variables('sasProperties')).serviceSasToken]"
115115
},
116-
"MIXEDREALITY_ARR_SERVICE_ENDPOINT": {
116+
"REMOTERENDERING_ARR_SERVICE_ENDPOINT": {
117117
"type": "string",
118118
"value": "[concat('https://remoterendering.', parameters('location'), '.mixedreality.azure.com')]"
119119
}

0 commit comments

Comments
 (0)