Update main.bicep

Author: ManjulaChintharla

infra/main.bicep

@@ -9,7 +9,8 @@ param name string
 @description('Primary location for all resources')
 param location string
 
-@description('Name of the existing resource group')
+@description('Name of the existing resource group to use')
+@minLength(1)
 param existingResourceGroupName string
 
 @description('Whether the deployment is running on GitHub Actions')
@@ -70,10 +71,6 @@ var chatConfig = {
   deploymentCapacity: chatDeploymentCapacity != 0 ? chatDeploymentCapacity : 30
 }
 
-// Reference the existing resource group
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = {
-  name: existingResourceGroupName
-}
 
 param embedModelName string = ''
 param embedDeploymentName string = ''
@@ -95,12 +92,12 @@ var resourceToken = toLower(uniqueString(subscription().id, name, location))
 var prefix = '${name}-${resourceToken}'
 var tags = { 'azd-env-name': name }
 
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
-  name: '${name}-rg'
-  location: location
-  tags: tags
+// Use the existing resource group
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = {
+  name: existingResourceGroupName
 }
 
+// PostgreSQL Server
 var postgresServerName = '${prefix}-postgresql'
 var postgresDatabaseName = 'postgres'
 var postgresEntraAdministratorObjectId = principalId
@@ -109,7 +106,7 @@ var postgresEntraAdministratorName = 'admin${uniqueString(resourceGroup.id, prin
 
 module postgresServer 'core/database/postgresql/flexibleserver.bicep' = {
   name: 'postgresql'
-  scope: resourceGroup
+  scope: existingResourceGroup
   params: {
     name: postgresServerName
     location: location
@@ -134,7 +131,7 @@ module postgresServer 'core/database/postgresql/flexibleserver.bicep' = {
 // Monitor application with Azure Monitor
 module monitoring 'core/monitor/monitoring.bicep' = {
   name: 'monitoring'
-  scope: resourceGroup
+  scope: existingResourceGroup
   params: {
     location: location
     tags: tags
@@ -147,7 +144,7 @@ module monitoring 'core/monitor/monitoring.bicep' = {
 // Container apps host (including container registry)
 module containerApps 'core/host/container-apps.bicep' = {
   name: 'container-apps'
-  scope: resourceGroup
+  scope: existingResourceGroup
   params: {
     name: 'app'
     location: location
@@ -247,7 +244,7 @@ var secrets = !empty(azureOpenAIKey) ? {
 
 module web 'web.bicep' = {
   name: 'web'
-  scope: resourceGroup
+  scope: existingResourceGroup
   params: {
     name: webAppName
     location: location
@@ -261,14 +258,10 @@ module web 'web.bicep' = {
   }
 }
 
-resource openAIResourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing =
-  if (!empty(openAIResourceGroupName)) {
-    name: !empty(openAIResourceGroupName) ? openAIResourceGroupName : resourceGroup.name
-  }
 
 module openAI 'core/ai/cognitiveservices.bicep' = if (deployAzureOpenAI) {
   name: 'openai'
-  scope: openAIResourceGroup
+  scope: existingResourceGroup
   params: {
     name: '${prefix}-openai'
     location: openAILocation
@@ -309,7 +302,7 @@ module openAI 'core/ai/cognitiveservices.bicep' = if (deployAzureOpenAI) {
 // USER ROLES
 module openAIRoleUser 'core/security/role.bicep' =
   if (empty(runningOnGh)) {
-    scope: openAIResourceGroup
+    scope: existingResourceGroup
     name: 'openai-role-user'
     params: {
       principalId: principalId
@@ -320,7 +313,7 @@ module openAIRoleUser 'core/security/role.bicep' =
 
 // Backend roles
 module openAIRoleBackend 'core/security/role.bicep' = {
-  scope: openAIResourceGroup
+  scope: existingResourceGroup
   name: 'openai-role-backend'
   params: {
     principalId: web.outputs.SERVICE_WEB_IDENTITY_PRINCIPAL_ID