chore(infra): update managed identity

Azure-Samples · Feb 29, 2024 · 6f314a6 · 6f314a6
1 parent 4cd1d40
commit 6f314a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 32 deletions.
diff --git a/infra/core/security/managed-identity.bicep b/infra/core/security/managed-identity.bicep
diff --git a/infra/main.bicep b/infra/main.bicep
@@ -83,9 +83,6 @@ var resourceToken = toLower(uniqueString(subscription().id, environmentName, loc
 var tags = union({ 'azd-env-name': environmentName }, empty(aliasTag) ? {} : { alias: aliasTag })
 var allowedOrigins = empty(allowedOrigin) ? [webApp.outputs.uri] : [webApp.outputs.uri, allowedOrigin]
 
-var indexerApiIdentityName = '${abbrs.managedIdentityUserAssignedIdentities}indexer-api-${resourceToken}'
-var searchApiIdentityName = '${abbrs.managedIdentityUserAssignedIdentities}search-api-${resourceToken}'
-
 // Organize resources in a resource group
 resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
   name: !empty(resourceGroupName) ? resourceGroupName : '${abbrs.resourcesResourceGroups}${environmentName}'
@@ -145,16 +142,6 @@ module webApp './core/host/staticwebapp.bicep' = {
   }
 }
 
-// search API identity
-module searchApiIdentity 'core/security/managed-identity.bicep' = {
-  name: 'search-api-identity'
-  scope: resourceGroup
-  params: {
-    name: searchApiIdentityName
-    location: location
-  }
-}
-
 // The search API
 module searchApi './core/host/container-app.bicep' = {
   name: 'search-api'
@@ -165,7 +152,7 @@ module searchApi './core/host/container-app.bicep' = {
     tags: union(tags, { 'azd-service-name': searchApiName })
     containerAppsEnvironmentName: containerApps.outputs.environmentName
     containerRegistryName: containerApps.outputs.registryName
-    identityName: searchApiIdentityName
+    identityType: 'SystemAssigned'
     allowedOrigins: allowedOrigins
     containerCpuCoreCount: '1.0'
     containerMemory: '2.0Gi'
@@ -222,16 +209,6 @@ module searchApi './core/host/container-app.bicep' = {
   }
 }
 
-// Indexer API identity
-module indexerApiIdentity 'core/security/managed-identity.bicep' = {
-  name: 'indexer-api-identity'
-  scope: resourceGroup
-  params: {
-    name: indexerApiIdentityName
-    location: location
-  }
-}
-
 // The indexer API
 module indexerApi './core/host/container-app.bicep' = {
   name: 'indexer-api'
@@ -242,7 +219,7 @@ module indexerApi './core/host/container-app.bicep' = {
     tags: union(tags, { 'azd-service-name': indexerApiName })
     containerAppsEnvironmentName: containerApps.outputs.environmentName
     containerRegistryName: containerApps.outputs.registryName
-    identityName: indexerApiIdentityName
+    identityType: 'SystemAssigned'
     containerCpuCoreCount: '1.0'
     containerMemory: '2.0Gi'
     secrets: [