testing location policy issue

ARPA-H · Oct 24, 2024 · c859a75 · c859a75
1 parent 78abe26
commit c859a75
Showing 1 changed file with 34 additions and 34 deletions.
diff --git a/workload/bicep/modules/identity/deploy.bicep b/workload/bicep/modules/identity/deploy.bicep
@@ -115,46 +115,46 @@ module startVMonConnectRoleAssignCompute '../../../../avm/1.0.0/ptn/authorizatio
 }]
 
 // Scaling plan role assignments
-module scalingPlanRoleAssignCompute '../../../../avm/1.0.0/ptn/authorization/role-assignment/modules/resource-group.bicep' = [for computeAndServiceObjectsRg in computeAndServiceObjectsRgs: if (deployScalingPlan && !empty(avdEnterpriseObjectId)) {
-  name: 'ScalingPlan-RolAssign-${computeAndServiceObjectsRg.name}-${time}'
-  scope: resourceGroup('${subscriptionId}', '${computeAndServiceObjectsRg.rgName}')
-  params: {
-    roleDefinitionIdOrName: '/subscriptions/${subscriptionId}/providers/Microsoft.Authorization/roleDefinitions/${varDesktopVirtualizationPowerOnOffContributorRole.id}'
-    principalId: avdEnterpriseObjectId
-    resourceGroupName: computeAndServiceObjectsRg.rgName
-    subscriptionId: subscriptionId
-    principalType: 'ServicePrincipal'
-  }
-}]
-
-// // Storage role assignments
-// module storageContributorRoleAssign '../../../../avm/1.0.0/ptn/authorization/role-assignment/modules/resource-group.bicep' = [for storageRoleAssignment in storageRoleAssignments: if (createStorageDeployment) {
-//   name: 'Stora-RolAssign-${storageRoleAssignment.acronym}-${time}'
-//   scope: resourceGroup('${subscriptionId}', '${storageObjectsRgName}')
+// module scalingPlanRoleAssignCompute '../../../../avm/1.0.0/ptn/authorization/role-assignment/modules/resource-group.bicep' = [for computeAndServiceObjectsRg in computeAndServiceObjectsRgs: if (deployScalingPlan && !empty(avdEnterpriseObjectId)) {
+//   name: 'ScalingPlan-RolAssign-${computeAndServiceObjectsRg.name}-${time}'
+//   scope: resourceGroup('${subscriptionId}', '${computeAndServiceObjectsRg.rgName}')
 //   params: {
-//     roleDefinitionIdOrName: '/subscriptions/${subscriptionId}/providers/Microsoft.Authorization/roleDefinitions/${storageRoleAssignment.id}'
-//     principalId: createStorageDeployment ? managedIdentityStorage.outputs.principalId : ''
-//     resourceGroupName: storageObjectsRgName
+//     roleDefinitionIdOrName: '/subscriptions/${subscriptionId}/providers/Microsoft.Authorization/roleDefinitions/${varDesktopVirtualizationPowerOnOffContributorRole.id}'
+//     principalId: avdEnterpriseObjectId
+//     resourceGroupName: computeAndServiceObjectsRg.rgName
 //     subscriptionId: subscriptionId
 //     principalType: 'ServicePrincipal'
 //   }
-//   dependsOn: [
-//     managedIdentityStorage
-//   ]
 // }]
 
-// // Storage File Data SMB Share Contributor
-// module storageSmbShareContributorRoleAssign '../../../../avm/1.0.0/ptn/authorization/role-assignment/modules/resource-group.bicep' = if (createStorageDeployment && (!empty(securityPrincipalId))) {
-//   name: 'Stora-SmbContri-RolAssign${take('${securityPrincipalId}', 6)}-${time}'
-//   scope: resourceGroup('${subscriptionId}', '${storageObjectsRgName}')
-//   params: {
-//     roleDefinitionIdOrName: '/subscriptions/${subscriptionId}/providers/Microsoft.Authorization/roleDefinitions/${varStorageSmbShareContributorRole.id}'
-//     principalId: !empty(securityPrincipalId) ? securityPrincipalId: ''
-//     resourceGroupName: storageObjectsRgName
-//     subscriptionId: subscriptionId
-//     principalType: 'Group'
-//   }
-// }
+// Storage role assignments
+module storageContributorRoleAssign '../../../../avm/1.0.0/ptn/authorization/role-assignment/modules/resource-group.bicep' = [for storageRoleAssignment in storageRoleAssignments: if (createStorageDeployment) {
+  name: 'Stora-RolAssign-${storageRoleAssignment.acronym}-${time}'
+  scope: resourceGroup('${subscriptionId}', '${storageObjectsRgName}')
+  params: {
+    roleDefinitionIdOrName: '/subscriptions/${subscriptionId}/providers/Microsoft.Authorization/roleDefinitions/${storageRoleAssignment.id}'
+    principalId: createStorageDeployment ? managedIdentityStorage.outputs.principalId : ''
+    resourceGroupName: storageObjectsRgName
+    subscriptionId: subscriptionId
+    principalType: 'ServicePrincipal'
+  }
+  dependsOn: [
+    managedIdentityStorage
+  ]
+}]
+
+// Storage File Data SMB Share Contributor
+module storageSmbShareContributorRoleAssign '../../../../avm/1.0.0/ptn/authorization/role-assignment/modules/resource-group.bicep' = if (createStorageDeployment && (!empty(securityPrincipalId))) {
+  name: 'Stora-SmbContri-RolAssign${take('${securityPrincipalId}', 6)}-${time}'
+  scope: resourceGroup('${subscriptionId}', '${storageObjectsRgName}')
+  params: {
+    roleDefinitionIdOrName: '/subscriptions/${subscriptionId}/providers/Microsoft.Authorization/roleDefinitions/${varStorageSmbShareContributorRole.id}'
+    principalId: !empty(securityPrincipalId) ? securityPrincipalId: ''
+    resourceGroupName: storageObjectsRgName
+    subscriptionId: subscriptionId
+    principalType: 'Group'
+  }
+}
 
 // // Virtual machine Microsoft Entra ID access roles on the compute resource group
 // module aadIdentityLoginRoleAssign '../../../../avm/1.0.0/ptn/authorization/role-assignment/modules/resource-group.bicep' = if (identityServiceProvider == 'EntraID' && !empty(securityPrincipalId)) {