remove autogen from script

Author: TravisHilbert

infra/main.bicep

@@ -1,4 +1,6 @@
 targetScope = 'resourceGroup'
+@description('Location for all resources.')
+param location string = resourceGroup().location
 
 @allowed([
   'australiaeast'
@@ -26,23 +28,16 @@ targetScope = 'resourceGroup'
   'westus3'
 ])
 @description('Location for all Ai services resources. This location can be different from the resource group location.')
-param azureOpenAILocation string 
+param azureOpenAILocation string = 'eastus2' // The location used for all deployed resources.  This location must be in the same region as the resource group.
 
 @minLength(3)
 @maxLength(20)
 @description('A unique prefix for all resources in this deployment. This should be 3-20 characters long:')
 param environmentName string
-
-@description('Set this if you want to deploy to a different region than the resource group. Otherwise, it will use the resource group location by default.')
-param AZURE_LOCATION string
-var solutionLocation = empty(AZURE_LOCATION) ? resourceGroup().location : AZURE_LOCATION
-
-var uniqueId = toLower(uniqueString(subscription().id, environmentName, solutionLocation))
+ 
+var uniqueId = toLower(uniqueString(subscription().id, environmentName, resourceGroup().location))
 var solutionPrefix = 'ma${padLeft(take(uniqueId, 12), 12, '0')}'
 
-// Load the abbrevations file required to name the azure resources.
-var abbrs = loadJsonContent('./abbreviations.json')
-
 @description('Tags to apply to all deployed resources')
 param tags object = {}
 
@@ -67,23 +62,23 @@ param resourceSize {
 param capacity int = 140
 
 var modelVersion = '2024-08-06'
-var aiServicesName = '${abbrs.ai.aiServices}${solutionPrefix}'
+var aiServicesName = '${solutionPrefix}-aiservices'
 var deploymentType = 'GlobalStandard'
 var gptModelVersion = 'gpt-4o'
-var appVersion = 'fnd01'
+var appVersion = 'latest'
 var resgistryName = 'biabcontainerreg'
 var dockerRegistryUrl = 'https://${resgistryName}.azurecr.io'
 
 @description('URL for frontend docker image')
 var backendDockerImageURL = '${resgistryName}.azurecr.io/macaebackend:${appVersion}'
 var frontendDockerImageURL = '${resgistryName}.azurecr.io/macaefrontend:${appVersion}'
 
-//var uniqueNameFormat = '${solutionPrefix}-{0}-${uniqueString(resourceGroup().id, solutionPrefix)}'
+var uniqueNameFormat = '${solutionPrefix}-{0}-${uniqueString(resourceGroup().id, solutionPrefix)}'
 var aoaiApiVersion = '2025-01-01-preview'
 
 resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2023-09-01' = {
-  name: '${abbrs.managementGovernance.logAnalyticsWorkspace}${solutionPrefix}'
-  location: solutionLocation
+  name: format(uniqueNameFormat, 'logs')
+  location: location
   tags: tags
   properties: {
     retentionInDays: 30
@@ -94,8 +89,8 @@ resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2023-09-01' = {
 }
 
 resource appInsights 'Microsoft.Insights/components@2020-02-02-preview' = {
-  name: '${abbrs.managementGovernance.applicationInsights}${solutionPrefix}'
-  location: solutionLocation
+  name: format(uniqueNameFormat, 'appins')
+  location: location
   kind: 'web'
   properties: {
     Application_Type: 'web'
@@ -118,7 +113,7 @@ var aiModelDeployments = [
 
 resource aiServices 'Microsoft.CognitiveServices/accounts@2024-04-01-preview' = {
   name: aiServicesName
-  location: azureOpenAILocation
+  location: location
   sku: {
     name: 'S0'
   }
@@ -128,8 +123,7 @@ resource aiServices 'Microsoft.CognitiveServices/accounts@2024-04-01-preview' =
     apiProperties: {
       //statisticsEnabled: false
     }
-    disableLocalAuth: true
-    publicNetworkAccess: 'Enabled'
+    //disableLocalAuth: true
   }
 }
 
@@ -155,9 +149,9 @@ resource aiServicesDeployments 'Microsoft.CognitiveServices/accounts/deployments
 module kvault 'deploy_keyvault.bicep' = {
   name: 'deploy_keyvault'
   params: {
-    solutionLocation: solutionLocation
+    solutionName: solutionPrefix
+    solutionLocation: location
     managedIdentityObjectId: managedIdentityModule.outputs.managedIdentityOutput.objectId
-    keyvaultName: '${abbrs.security.keyVault}${solutionPrefix}'
   }
   scope: resourceGroup(resourceGroup().name)
 }
@@ -197,8 +191,8 @@ resource acaAoaiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-
 }
 
 resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
-  name: '${abbrs.databases.cosmosDBDatabase}${solutionPrefix}'
-  location: solutionLocation
+  name: format(uniqueNameFormat, 'cosmos')
+  location: location
   tags: tags
   kind: 'GlobalDocumentDB'
   properties: {
@@ -207,7 +201,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
     locations: [
       {
         failoverPriority: 0
-        locationName: solutionLocation
+        locationName: location
       }
     ]
     capabilities: [{ name: 'EnableServerless' }]
@@ -247,13 +241,13 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
 // Define existing ACR resource
 
 resource pullIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-07-31-preview' = {
-  name: '${abbrs.security.managedIdentity}${solutionPrefix}-containerapp-pull'
-  location: solutionLocation
+  name: format(uniqueNameFormat, 'containerapp-pull')
+  location: location
 }
 
 resource containerAppEnv 'Microsoft.App/managedEnvironments@2024-03-01' = {
-  name: '${abbrs.containers.containerAppsEnvironment}${solutionPrefix}'
-  location: solutionLocation
+  name: format(uniqueNameFormat, 'containerapp')
+  location: location
   tags: tags
   properties: {
     daprAIConnectionString: appInsights.properties.ConnectionString
@@ -285,8 +279,8 @@ resource acaCosomsRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleA
 
 @description('')
 resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
-  name: '${abbrs.containers.containerApp}${solutionPrefix}-backend'
-  location: solutionLocation
+  name: '${solutionPrefix}-backend'
+  location: location
   tags: tags
   identity: {
     type: 'SystemAssigned, UserAssigned'
@@ -302,8 +296,8 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
         external: true
         corsPolicy: {
           allowedOrigins: [
-            'https://${abbrs.compute.webApp}${solutionPrefix}-frontend.azurewebsites.net'
-            'http://${abbrs.compute.webApp}${solutionPrefix}-frontend.azurewebsites.net'
+            'https://${format(uniqueNameFormat, 'frontend')}.azurewebsites.net'
+            'http://${format(uniqueNameFormat, 'frontend')}.azurewebsites.net'
           ]
         }
       }
@@ -387,7 +381,7 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
             }
             {
               name: 'FRONTEND_SITE_NAME'
-              value: 'https://${abbrs.compute.webApp}${solutionPrefix}-frontend.azurewebsites.net'
+              value: 'https://${format(uniqueNameFormat, 'frontend')}.azurewebsites.net'
             }
           ]
         }
@@ -396,13 +390,13 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
   }
 }
 resource frontendAppServicePlan 'Microsoft.Web/serverfarms@2021-02-01' = {
-  name: '${abbrs.compute.appServicePlan}${solutionPrefix}-frontend'
-  location: solutionLocation
+  name: format(uniqueNameFormat, 'frontend-plan')
+  location: location
   tags: tags
   sku: {
-    name: 'B2'
+    name: 'P1v2'
     capacity: 1
-    tier: 'Basic'
+    tier: 'PremiumV2'
   }
   properties: {
     reserved: true
@@ -411,8 +405,8 @@ resource frontendAppServicePlan 'Microsoft.Web/serverfarms@2021-02-01' = {
 }
 
 resource frontendAppService 'Microsoft.Web/sites@2021-02-01' = {
-  name: '${abbrs.compute.webApp}${solutionPrefix}-frontend'
-  location: solutionLocation
+  name: format(uniqueNameFormat, 'frontend')
+  location: location
   tags: tags
   kind: 'app,linux,container'
   properties: {
@@ -446,15 +440,15 @@ resource frontendAppService 'Microsoft.Web/sites@2021-02-01' = {
   }
   dependsOn: [containerApp]
   identity: {
-    type: 'SystemAssigned, UserAssigned'
+    type: 'SystemAssigned,UserAssigned'
     userAssignedIdentities: {
       '${pullIdentity.id}': {}
     }
   }
 }
 
 resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' existing = {
-  name: '${abbrs.ai.aiHubProject}${solutionPrefix}' // aiProjectName must be calculated - available at main start.
+  name: '${solutionPrefix}-aiproject' // aiProjectName must be calculated - available at main start.
 }
 
 resource aiDeveloper 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = {
@@ -475,11 +469,11 @@ var cosmosAssignCli = 'az cosmosdb sql role assignment create --resource-group "
 module managedIdentityModule 'deploy_managed_identity.bicep' = {
   name: 'deploy_managed_identity'
   params: {
+    solutionName: solutionPrefix
     //solutionLocation: location
     managedIdentityId: pullIdentity.id
     managedIdentityPropPrin: pullIdentity.properties.principalId
     managedIdentityLocation: pullIdentity.location
-    miName: '${abbrs.security.managedIdentity}${solutionPrefix}'
   }
   scope: resourceGroup(resourceGroup().name)
 }
@@ -492,7 +486,7 @@ module deploymentScriptCLI 'br/public:avm/res/resources/deployment-script:0.5.1'
     name: 'rdsmin001'
     // Non-required parameters
     azCliVersion: '2.69.0'
-    location: solutionLocation
+    location: location
     managedIdentities: {
       userAssignedResourceIds: [
         managedIdentityModule.outputs.managedIdentityId

infra/main.bicepparam

@@ -1,6 +1,4 @@
 using './main.bicep'
 
 param environmentName = readEnvironmentVariable('AZURE_ENV_NAME', 'macaetemplate')
-param AZURE_LOCATION = readEnvironmentVariable('AZURE_ENV_LOCATION', 'eastus2')
-param azureOpenAILocation = readEnvironmentVariable('AZURE_OPENAI_LOCATION', 'eastus2')
-
+param azureOpenAILocation = readEnvironmentVariable('AZURE_ENV_LOCATION', 'eastus2')