Infra - bug fixes and cleanup

Author: Seth

infra/main.bicep

@@ -190,7 +190,7 @@ module storageAccount 'modules/storageAccount.bicep' = {
       }
     ], searchEnabled ? [
       {
-        principalId: aiSearch.outputs.?systemAssignedMIPrincipalId ?? ''
+        principalId: aiSearch.outputs.systemAssignedMIPrincipalId
         principalType: 'ServicePrincipal'
         roleDefinitionIdOrName: 'Storage Blob Data Contributor'
       }
@@ -356,6 +356,8 @@ module apim 'modules/apim.bicep' = if (apiManagementEnabled) {
     location: location
     publisherEmail: apiManagementPublisherEmail
     publisherName: '${name} API Management'
+    sku: 'Developer'
+    networkIsolation: networkIsolation
     logAnalyticsWorkspaceResourceId: logAnalyticsWorkspace.outputs.resourceId
     virtualNetworkResourceId: networkIsolation ? network.outputs.virtualNetworkId : ''
     virtualNetworkSubnetResourceId: networkIsolation ? network.outputs.vmSubnetId : ''

infra/modules/aisearch.bicep

@@ -78,3 +78,4 @@ import { roleAssignmentType } from 'br/public:avm/utl/types/avm-common-types:0.5
 
 output resourceId string = aiSearch.outputs.resourceId
 output name string = aiSearch.outputs.name
+output systemAssignedMIPrincipalId string = aiSearch.outputs.?systemAssignedMIPrincipalId ?? ''

infra/modules/apim.bicep

@@ -20,10 +20,10 @@ param publisherEmail string
   'StandardV2'
   'BasicV2'
 ])
-param sku string = 'Developer'
+param sku string
 
 @description('Specifies whether to create a private endpoint for the API Management service.')
-param networkIsolation bool = false
+param networkIsolation bool
 
 @description('The resource ID of the Log Analytics workspace to use for diagnostic settings.')
 param logAnalyticsWorkspaceResourceId string

infra/modules/cognitive-services/main.bicep

@@ -125,6 +125,7 @@ module vision 'service.bicep' = if (visionEnabled) {
     name: 'vision${name}${resourceToken}'
     location: location
     kind: 'ComputerVision'
+    sku: 'S1'
     networkIsolation: networkIsolation
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
     privateDnsZonesResourceIds: networkIsolation ? [ 
@@ -142,6 +143,7 @@ module language 'service.bicep' = if (languageEnabled) {
     name: 'lang${name}${resourceToken}'
     location: location
     kind: 'TextAnalytics'
+    sku: 'S'
     networkIsolation: networkIsolation
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
     privateDnsZonesResourceIds: networkIsolation ? [ 
@@ -176,6 +178,7 @@ module translator 'service.bicep' = if (translatorEnabled) {
     name: 'translator${name}${resourceToken}'
     location: location
     kind: 'TextTranslation'
+    sku: 'S1'
     networkIsolation: networkIsolation
     virtualNetworkSubnetResourceId: networkIsolation ? virtualNetworkSubnetResourceId : ''
     privateDnsZonesResourceIds: networkIsolation ? [ 

infra/modules/cognitive-services/service.bicep

@@ -33,6 +33,21 @@ param location string
 ])
 param kind string
 
+@description('Required. The SKU of the Cognitive Services account. Use \'Get-AzCognitiveServicesAccountSku\' to determine a valid combinations of \'kind\' and \'SKU\' for your Azure region.')
+@allowed([
+  'S'
+  'S0'
+  'S1'
+  'S2'
+  'S3'
+  'S4'
+  'S5'
+  'S6'
+  'S7'
+  'S8'
+])
+param sku string = 'S0'
+
 @description('Category of the Cognitive Services account.')
 param category string = 'CognitiveService'
 
@@ -71,7 +86,7 @@ module cognitiveService 'br/public:avm/res/cognitive-services/account:0.10.1' =
     name: nameFormatted
     location: location
     tags: tags
-    sku: 'S0'
+    sku: sku
     kind: kind
     managedIdentities: {
       systemAssigned: true