feat: Naming standard and post deployment script related bicep changes (#492)

* adding aifoundry related changes

* removed the keyvault renaming from aifoundry

* updated main.json

* bicep change for ai foundry

* added more bicep changes for ai foundry

* upgraded bicep version

* Included bicep changes for naming standards and updates related to the post deployment script.

Author: Abdul-Microsoft

infra/bicep/abbreviations.json

@@ -0,0 +1,227 @@
+{
+  "ai": {
+    "aiSearch": "srch-",
+    "aiServices": "aisa-",
+    "aiVideoIndexer": "avi-",
+    "machineLearningWorkspace": "mlw-",
+    "openAIService": "oai-",
+    "botService": "bot-",
+    "computerVision": "cv-",
+    "contentModerator": "cm-",
+    "contentSafety": "cs-",
+    "customVisionPrediction": "cstv-",
+    "customVisionTraining": "cstvt-",
+    "documentIntelligence": "di-",
+    "faceApi": "face-",
+    "healthInsights": "hi-",
+    "immersiveReader": "ir-",
+    "languageService": "lang-",
+    "speechService": "spch-",
+    "translator": "trsl-",
+    "aiHub": "aih-",
+    "aiHubProject": "aihp-"
+  },
+  "analytics": {
+    "analysisServicesServer": "as",
+    "databricksWorkspace": "dbw-",
+    "dataExplorerCluster": "dec",
+    "dataExplorerClusterDatabase": "dedb",
+    "dataFactory": "adf-",
+    "digitalTwin": "dt-",
+    "streamAnalytics": "asa-",
+    "synapseAnalyticsPrivateLinkHub": "synplh-",
+    "synapseAnalyticsSQLDedicatedPool": "syndp",
+    "synapseAnalyticsSparkPool": "synsp",
+    "synapseAnalyticsWorkspaces": "synw",
+    "dataLakeStoreAccount": "dls",
+    "dataLakeAnalyticsAccount": "dla",
+    "eventHubsNamespace": "evhns-",
+    "eventHub": "evh-",
+    "eventGridDomain": "evgd-",
+    "eventGridSubscriptions": "evgs-",
+    "eventGridTopic": "evgt-",
+    "eventGridSystemTopic": "egst-",
+    "hdInsightHadoopCluster": "hadoop-",
+    "hdInsightHBaseCluster": "hbase-",
+    "hdInsightKafkaCluster": "kafka-",
+    "hdInsightSparkCluster": "spark-",
+    "hdInsightStormCluster": "storm-",
+    "hdInsightMLServicesCluster": "mls-",
+    "iotHub": "iot-",
+    "provisioningServices": "provs-",
+    "provisioningServicesCertificate": "pcert-",
+    "powerBIEmbedded": "pbi-",
+    "timeSeriesInsightsEnvironment": "tsi-"
+  },
+  "compute": {
+    "appServiceEnvironment": "ase-",
+    "appServicePlan": "asp-",
+    "loadTesting": "lt-",
+    "availabilitySet": "avail-",
+    "arcEnabledServer": "arcs-",
+    "arcEnabledKubernetesCluster": "arck",
+    "batchAccounts": "ba-",
+    "cloudService": "cld-",
+    "communicationServices": "acs-",
+    "diskEncryptionSet": "des",
+    "functionApp": "func-",
+    "gallery": "gal",
+    "hostingEnvironment": "host-",
+    "imageTemplate": "it-",
+    "managedDiskOS": "osdisk",
+    "managedDiskData": "disk",
+    "notificationHubs": "ntf-",
+    "notificationHubsNamespace": "ntfns-",
+    "proximityPlacementGroup": "ppg-",
+    "restorePointCollection": "rpc-",
+    "snapshot": "snap-",
+    "staticWebApp": "stapp-",
+    "virtualMachine": "vm",
+    "virtualMachineScaleSet": "vmss-",
+    "virtualMachineMaintenanceConfiguration": "mc-",
+    "virtualMachineStorageAccount": "stvm",
+    "webApp": "app-"
+  },
+  "containers": {
+    "aksCluster": "aks-",
+    "aksSystemNodePool": "npsystem-",
+    "aksUserNodePool": "np-",
+    "containerApp": "ca-",
+    "containerAppsEnvironment": "cae-",
+    "containerRegistry": "cr",
+    "containerInstance": "ci",
+    "serviceFabricCluster": "sf-",
+    "serviceFabricManagedCluster": "sfmc-"
+  },
+  "databases": {
+    "cosmosDBDatabase": "cosmos-",
+    "cosmosDBApacheCassandra": "coscas-",
+    "cosmosDBMongoDB": "cosmon-",
+    "cosmosDBNoSQL": "cosno-",
+    "cosmosDBTable": "costab-",
+    "cosmosDBGremlin": "cosgrm-",
+    "cosmosDBPostgreSQL": "cospos-",
+    "cacheForRedis": "redis-",
+    "sqlDatabaseServer": "sql-",
+    "sqlDatabase": "sqldb-",
+    "sqlElasticJobAgent": "sqlja-",
+    "sqlElasticPool": "sqlep-",
+    "mariaDBServer": "maria-",
+    "mariaDBDatabase": "mariadb-",
+    "mySQLDatabase": "mysql-",
+    "postgreSQLDatabase": "psql-",
+    "sqlServerStretchDatabase": "sqlstrdb-",
+    "sqlManagedInstance": "sqlmi-"
+  },
+  "developerTools": {
+    "appConfigurationStore": "appcs-",
+    "mapsAccount": "map-",
+    "signalR": "sigr",
+    "webPubSub": "wps-"
+  },
+  "devOps": {
+    "managedGrafana": "amg-"
+  },
+  "integration": {
+    "apiManagementService": "apim-",
+    "integrationAccount": "ia-",
+    "logicApp": "logic-",
+    "serviceBusNamespace": "sbns-",
+    "serviceBusQueue": "sbq-",
+    "serviceBusTopic": "sbt-",
+    "serviceBusTopicSubscription": "sbts-"
+  },
+  "managementGovernance": {
+    "automationAccount": "aa-",
+    "applicationInsights": "appi-",
+    "monitorActionGroup": "ag-",
+    "monitorDataCollectionRules": "dcr-",
+    "monitorAlertProcessingRule": "apr-",
+    "blueprint": "bp-",
+    "blueprintAssignment": "bpa-",
+    "dataCollectionEndpoint": "dce-",
+    "logAnalyticsWorkspace": "log-",
+    "logAnalyticsQueryPacks": "pack-",
+    "managementGroup": "mg-",
+    "purviewInstance": "pview-",
+    "resourceGroup": "rg-",
+    "templateSpecsName": "ts-"
+  },
+  "migration": {
+    "migrateProject": "migr-",
+    "databaseMigrationService": "dms-",
+    "recoveryServicesVault": "rsv-"
+  },
+  "networking": {
+    "applicationGateway": "agw-",
+    "applicationSecurityGroup": "asg-",
+    "cdnProfile": "cdnp-",
+    "cdnEndpoint": "cdne-",
+    "connections": "con-",
+    "dnsForwardingRuleset": "dnsfrs-",
+    "dnsPrivateResolver": "dnspr-",
+    "dnsPrivateResolverInboundEndpoint": "in-",
+    "dnsPrivateResolverOutboundEndpoint": "out-",
+    "firewall": "afw-",
+    "firewallPolicy": "afwp-",
+    "expressRouteCircuit": "erc-",
+    "expressRouteGateway": "ergw-",
+    "frontDoorProfile": "afd-",
+    "frontDoorEndpoint": "fde-",
+    "frontDoorFirewallPolicy": "fdfp-",
+    "ipGroups": "ipg-",
+    "loadBalancerInternal": "lbi-",
+    "loadBalancerExternal": "lbe-",
+    "loadBalancerRule": "rule-",
+    "localNetworkGateway": "lgw-",
+    "natGateway": "ng-",
+    "networkInterface": "nic-",
+    "networkSecurityGroup": "nsg-",
+    "networkSecurityGroupSecurityRules": "nsgsr-",
+    "networkWatcher": "nw-",
+    "privateLink": "pl-",
+    "privateEndpoint": "pep-",
+    "publicIPAddress": "pip-",
+    "publicIPAddressPrefix": "ippre-",
+    "routeFilter": "rf-",
+    "routeServer": "rtserv-",
+    "routeTable": "rt-",
+    "serviceEndpointPolicy": "se-",
+    "trafficManagerProfile": "traf-",
+    "userDefinedRoute": "udr-",
+    "virtualNetwork": "vnet-",
+    "virtualNetworkGateway": "vgw-",
+    "virtualNetworkManager": "vnm-",
+    "virtualNetworkPeering": "peer-",
+    "virtualNetworkSubnet": "snet-",
+    "virtualWAN": "vwan-",
+    "virtualWANHub": "vhub-"
+  },
+  "security": {
+    "bastion": "bas-",
+    "keyVault": "kv-",
+    "keyVaultManagedHSM": "kvmhsm-",
+    "managedIdentity": "id-",
+    "sshKey": "sshkey-",
+    "vpnGateway": "vpng-",
+    "vpnConnection": "vcn-",
+    "vpnSite": "vst-",
+    "webApplicationFirewallPolicy": "waf",
+    "webApplicationFirewallPolicyRuleGroup": "wafrg"
+  },
+  "storage": {
+    "storSimple": "ssimp",
+    "backupVault": "bvault-",
+    "backupVaultPolicy": "bkpol-",
+    "fileShare": "share-",
+    "storageAccount": "st",
+    "storageSyncService": "sss-"
+  },
+  "virtualDesktop": {
+    "labServicesPlan": "lp-",
+    "virtualDesktopHostPool": "vdpool-",
+    "virtualDesktopApplicationGroup": "vdag-",
+    "virtualDesktopWorkspace": "vdws-",
+    "virtualDesktopScalingPlan": "vdscaling-"
+  }
+}

infra/bicep/deploy_ai_foundry.bicep

@@ -10,22 +10,23 @@ param embeddingModel string
 param embeddingDeploymentCapacity int 
 param managedIdentityObjectId string
 
-var storageName = 'st${solutionName}hub'
+// Load the abbrevations file required to name the azure resources.
+var abbrs = loadJsonContent('./abbreviations.json')
+
+var storageName = '${abbrs.storage.storageAccount}${solutionName}hub'
 var storageSkuName = 'Standard_LRS'
-var aiServicesName = 'ais-${solutionName}'
-// var aiServicesName_m = '${solutionName}-aiservices_m'
-// var location_m = solutionLocation
-var applicationInsightsName = 'appi-${solutionName}'
-var containerRegistryName = 'cr-${solutionName}'
+var aiServicesName = '${abbrs.ai.aiServices}${solutionName}'
+var applicationInsightsName = '${abbrs.managementGovernance.applicationInsights}${solutionName}'
+var containerRegistryName = '${abbrs.containers.containerRegistry}${solutionName}'
 var keyvaultName = keyVaultName
 var location = solutionLocation //'eastus2'
-var aiHubName = 'hub-${solutionName}'
+var aiHubName = '${abbrs.ai.aiHub}${solutionName}-hub'
 var aiHubFriendlyName = aiHubName
 var aiHubDescription = 'AI Hub'
-var aiProjectName = 'proj-${solutionName}'
+var aiProjectName = '${abbrs.ai.aiHubProject}${solutionName}'
 var aiProjectFriendlyName = aiProjectName
-var aiSearchName = 'srch-${solutionName}'
-var workspaceName = 'log-${solutionName}-hub'
+var aiSearchName = '${abbrs.ai.aiSearch}${solutionName}'
+var workspaceName = '${abbrs.managementGovernance.logAnalyticsWorkspace}${solutionName}'
 var aiModelDeployments = [
   {
     name: gptModelName

infra/bicep/deploy_app_service.bicep

@@ -1,14 +1,6 @@
 // ========== Key Vault ========== //
 targetScope = 'resourceGroup'
 
-@minLength(3)
-@maxLength(15)
-@description('Solution Name')
-param solutionName string
-
-@description('Name of App Service plan')
-param HostingPlanName string = '${ solutionName }-app-service-plan'
-
 @description('The pricing tier for the App Service plan')
 @allowed(
   ['F1', 'D1', 'B1', 'B2', 'B3', 'S1', 'S2', 'S3', 'P1', 'P2', 'P3', 'P4','P0v3']
@@ -17,8 +9,8 @@ param HostingPlanName string = '${ solutionName }-app-service-plan'
 
 param HostingPlanSku string = 'B2'
 
-@description('Name of Web App')
-param WebsiteName string = '${ solutionName }-app-service'
+param HostingPlanName string
+param WebsiteName string
 
 // @description('Name of Application Insights')
 // param ApplicationInsightsName string = '${ solutionName }-app-insights'
@@ -164,7 +156,7 @@ param AZURE_COSMOSDB_ENABLE_FEEDBACK string = 'True'
 //@description('Power BI Embed URL')
 //param VITE_POWERBI_EMBED_URL string = ''
 
-param Appversion string
+param imageTag string
 
 param userassignedIdentityId string
 param userassignedIdentityClientId string
@@ -174,7 +166,7 @@ param applicationInsightsId string
 
 // var WebAppImageName = 'DOCKER|ncwaappcontainerreg1.azurecr.io/ncqaappimage:v1.0.0'
 
-var WebAppImageName = 'DOCKER|bycwacontainerreg.azurecr.io/byc-wa-app:${Appversion}'
+var WebAppImageName = 'DOCKER|bycwacontainerreg.azurecr.io/byc-wa-app:${imageTag}'
 
 resource HostingPlan 'Microsoft.Web/serverfarms@2020-06-01' = {
   name: HostingPlanName
@@ -428,3 +420,5 @@ module cosmosUserRole 'core/database/cosmos/cosmos-role-assign.bicep' = {
     Website
   ]
 }
+
+output webAppUrl string = 'https://${WebsiteName}.azurewebsites.net'

infra/bicep/deploy_azure_function.bicep

@@ -1,5 +1,3 @@
-@description('Specifies the location for resources.')
-param solutionName string 
 param solutionLocation string
 @secure()
 param azureOpenAIApiKey string
@@ -14,7 +12,7 @@ param sqlDbName string
 param sqlDbUser string
 @secure()
 param sqlDbPwd string
-param functionAppVersion string
+param imageTag string
 @description('Azure Function App SQL System Prompt')
 param sqlSystemPrompt string
 @description('Azure Function App CallTranscript System Prompt')
@@ -25,12 +23,20 @@ param userassignedIdentityId string
 param userassignedIdentityClientId string
 param storageAccountName string
 param applicationInsightsId string
+param functionAppName string
+param containerAppEnvame string
+param logAnalyticsWorkspaceName string
 
-var functionAppName = '${solutionName}fn'
 var azureOpenAIDeploymentModel = 'gpt-4o-mini'
 var azureOpenAIEmbeddingDeployment = 'text-embedding-ada-002'
 var valueOne = '1'
 
+var FnAppImageName = 'DOCKER|bycwacontainerreg.azurecr.io/byc-wa-fn:${imageTag}'
+
+resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
+  name: logAnalyticsWorkspaceName
+}
+
 // resource storageAccount 'Microsoft.Storage/storageAccounts@2021-04-01' = {
 //   name: '${solutionName}fnstorage'
 //   location: solutionLocation
@@ -61,19 +67,19 @@ var valueOne = '1'
 // }
 
 resource containerAppEnv 'Microsoft.App/managedEnvironments@2022-06-01-preview' = {
-  name: '${solutionName}env'
+  name: containerAppEnvame
   location: solutionLocation
   sku: {
     name: 'Consumption'
   }
   properties: {
-    // appLogsConfiguration: {
-    //   destination: 'log-analytics'
-    //   logAnalyticsConfiguration: {
-    //     customerId: logAnalyticsWorkspace.properties.customerId
-    //     sharedKey: logAnalyticsWorkspace.listKeys().primarySharedKey
-    //   }
-    // }
+    appLogsConfiguration: {
+      destination: 'log-analytics'
+      logAnalyticsConfiguration: {
+        customerId: logAnalyticsWorkspace.properties.customerId
+        sharedKey: logAnalyticsWorkspace.listKeys().primarySharedKey
+      }
+    }
   }
 }
 
@@ -90,7 +96,7 @@ resource functionApp 'Microsoft.Web/sites@2024-04-01' = {
   properties: {
     managedEnvironmentId: containerAppEnv.id
     siteConfig: {
-      linuxFxVersion: 'DOCKER|bycwacontainerreg.azurecr.io/byc-wa-fn:${functionAppVersion}'
+      linuxFxVersion: FnAppImageName
       appSettings: [
         {
           name: 'AzureWebJobsStorage__accountname'
@@ -180,3 +186,5 @@ resource functionApp 'Microsoft.Web/sites@2024-04-01' = {
     }
   }
 }
+
+output functionAppName string = functionApp.name