Merge pull request #33 from microsoft/infra/userobject-fix

Infra - bug fix to apim private endpoint and userobjectid checks

Author: mswantek68

infra/main.bicep

@@ -109,7 +109,7 @@ module keyvault 'br/public:avm/res/key-vault/vault:0.11.0' = {
         workspaceResourceId: logAnalyticsWorkspace.outputs.resourceId
       } 
     ]
-    roleAssignments: [
+    roleAssignments: empty(userObjectId) ? [] : [
       {
         principalId: userObjectId
         principalType: 'User'
@@ -166,12 +166,13 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.17.0' = {
         workspaceResourceId: logAnalyticsWorkspace.outputs.resourceId
       }
     ]
-    roleAssignments: [
+    roleAssignments: union(empty(userObjectId) ? [] : [
       {
         principalId: userObjectId
         principalType: 'User'
         roleDefinitionIdOrName: 'Storage Blob Data Contributor'
       }
+    ], [
       {
         principalId: aiServices.outputs.?systemAssignedMIPrincipalId ?? ''
         principalType: 'ServicePrincipal'
@@ -182,7 +183,7 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.17.0' = {
         principalType: 'ServicePrincipal'
         roleDefinitionIdOrName: 'Storage Blob Data Contributor'
       }
-    ]
+    ])
   }
 }
 
@@ -206,7 +207,7 @@ module aiServices 'br/public:avm/res/cognitive-services/account:0.10.1' = {
         workspaceResourceId: logAnalyticsWorkspace.outputs.resourceId
       } 
     ]
-    roleAssignments: [
+    roleAssignments: empty(userObjectId) ? [] : [
       {
         principalId: userObjectId
         principalType: 'User'
@@ -230,12 +231,13 @@ module aiSearch 'br/public:avm/res/search/search-service:0.9.0' = {
       sku: 'standard'
       partitionCount:1
       replicaCount:3
-      roleAssignments: [
+      roleAssignments: union(empty(userObjectId) ? [] : [
         {
           principalId: userObjectId
           principalType: 'User'
           roleDefinitionIdOrName: 'Search Index Data Contributor'
         }
+      ], [
         {
           principalId: aiServices.outputs.?systemAssignedMIPrincipalId ?? ''
           principalType: 'ServicePrincipal'
@@ -246,7 +248,7 @@ module aiSearch 'br/public:avm/res/search/search-service:0.9.0' = {
           principalType: 'ServicePrincipal'
           roleDefinitionIdOrName: 'Search Service Contributor'
         }
-      ]
+      ])
       diagnosticSettings: [
         {
           workspaceResourceId: logAnalyticsWorkspace.outputs.resourceId
@@ -345,7 +347,7 @@ module aiHub 'br/public:avm/res/machine-learning-services/workspace:0.10.1' = {
         }
       }
     ])
-    roleAssignments: [
+    roleAssignments: empty(userObjectId) ? [] : [
       {
         roleDefinitionIdOrName: 'f6c7c914-8db3-469d-8ca1-694a8f32e121' // ML Data Scientist Role
         principalId: userObjectId
@@ -413,18 +415,19 @@ module aiProject 'br/public:avm/res/machine-learning-services/workspace:0.10.1'
     publicNetworkAccess: networkIsolation ? 'Disabled' : 'Enabled'
     hbiWorkspace: false
     systemDatastoresAuthMode: 'identity'
-    roleAssignments: [
+    roleAssignments: union(empty(userObjectId) ? [] : [
       {
         roleDefinitionIdOrName: 'f6c7c914-8db3-469d-8ca1-694a8f32e121' // ML Data Scientist Role
         principalId: userObjectId
         principalType: 'User'
       }
+    ], [
       {
         roleDefinitionIdOrName: 'f6c7c914-8db3-469d-8ca1-694a8f32e121' // ML Data Scientist Role
         principalId: aiServices.outputs.?systemAssignedMIPrincipalId ?? ''
         principalType: 'ServicePrincipal'
       }
-    ]
+    ])
     diagnosticSettings: [
       {
         workspaceResourceId: logAnalyticsWorkspace.outputs.resourceId