Merge branch 'develop' into workspaces-ui

Teradata · Aug 19, 2024 · 683737e · 683737e
2 parents 320d1ae + 63ea346
commit 683737e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/deployments/azure/templates/arm/all-in-one/all-in-one-with-nlb.json b/deployments/azure/templates/arm/all-in-one/all-in-one-with-nlb.json
@@ -314,7 +314,7 @@
         "mode": "Incremental",
         "parameters": {
           "vaultName": {
-            "value": "[parameters('AiUnlimitedName')]"
+            "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('ResourceGroupName')), 'Microsoft.Resources/deployments', 'vault'), '2022-09-01').outputs.name.value]"
           },
           "accessPolicy": {
             "value": {
@@ -1541,4 +1541,4 @@
       "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('ResourceGroupName')), 'Microsoft.Resources/deployments', 'firewall'), '2022-09-01').outputs.Id.value]"
     }
   }
-}
+}
diff --git a/deployments/azure/templates/arm/all-in-one/all-in-one-without-lb.json b/deployments/azure/templates/arm/all-in-one/all-in-one-without-lb.json
@@ -313,7 +313,7 @@
         "mode": "Incremental",
         "parameters": {
           "vaultName": {
-            "value": "[parameters('AiUnlimitedName')]"
+            "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('ResourceGroupName')), 'Microsoft.Resources/deployments', 'vault'), '2022-09-01').outputs.name.value]"
           },
           "accessPolicy": {
             "value": {
@@ -1200,4 +1200,4 @@
       "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, parameters('ResourceGroupName')), 'Microsoft.Resources/deployments', 'firewall'), '2022-09-01').outputs.Id.value]"
     }
   }
-}
+}
diff --git a/deployments/azure/templates/bicep/all-in-one/all-in-one-with-nlb.bicep b/deployments/azure/templates/bicep/all-in-one/all-in-one-with-nlb.bicep
@@ -169,7 +169,7 @@ module vaultAccessPolicy '../modules/vault/access-policy.bicep' = if (UseKeyVaul
   scope: rg
   name: 'vault-access-policy'
   params: {
-    vaultName: AiUnlimitedName
+    vaultName: vault.outputs.name
     accessPolicy: {
       tenantId: subscription().tenantId
       objectId: aiUnlimited.outputs.PrincipleId

diff --git a/deployments/azure/templates/bicep/all-in-one/all-in-one-without-lb.bicep b/deployments/azure/templates/bicep/all-in-one/all-in-one-without-lb.bicep
@@ -167,7 +167,7 @@ module vaultAccessPolicy '../modules/vault/access-policy.bicep' = if (UseKeyVaul
   scope: rg
   name: 'vault-access-policy'
   params: {
-    vaultName: AiUnlimitedName
+    vaultName: vault.outputs.name
     accessPolicy: {
       tenantId: subscription().tenantId
       objectId: aiUnlimited.outputs.PrincipleId