Change naming conventions and ai to AzureAI

Author: TravisHilbert

infra/deploy_ai_foundry.bicep

@@ -9,18 +9,18 @@ param aiServicesEndpoint string
 param aiServicesKey string
 param aiServicesId string
 
-var storageName = '${solutionName}hubstorage'
+var storageName = '${solutionName}hubstr'
 var storageSkuName = 'Standard_LRS'
-var aiServicesName = '${solutionName}-aiservices'
-var workspaceName = '${solutionName}-workspace'
+var aiServicesName = '${solutionName}-ais'
+var workspaceName = '${solutionName}-wrksp'
 var keyvaultName = '${solutionName}-kv'
 var location = solutionLocation 
-var aiHubName = '${solutionName}-aihub'
-var aiHubFriendlyName = aiHubName
+var azureAiHubName = '${solutionName}-aihub'
+var aiHubFriendlyName = azureAiHubName
 var aiHubDescription = 'AI Hub for KM template'
-var aiProjectName = '${solutionName}-aiproject'
+var aiProjectName = '${solutionName}-aiprj'
 var aiProjectFriendlyName = aiProjectName
-var aiSearchName = '${solutionName}-search'
+var aiSearchName = '${solutionName}-srch'
 
 
 resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
@@ -112,7 +112,7 @@ resource storageroleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-
 }
 
 resource aiHub 'Microsoft.MachineLearningServices/workspaces@2023-08-01-preview' = {
-  name: aiHubName
+  name: azureAiHubName
   location: location
   identity: {
     type: 'SystemAssigned'
@@ -129,7 +129,7 @@ resource aiHub 'Microsoft.MachineLearningServices/workspaces@2023-08-01-preview'
   kind: 'hub'
 
   resource aiServicesConnection 'connections@2024-07-01-preview' = {
-    name: '${aiHubName}-connection-AzureOpenAI'
+    name: '${azureAiHubName}-connection-AzureOpenAI'
     properties: {
       category: 'AIServices'
       target: aiServicesEndpoint

infra/deploy_managed_identity.bicep

@@ -10,7 +10,7 @@ param solutionName string
 param solutionLocation string
 
 @description('Name')
-param miName string = '${ solutionName }-managed-identity'
+param miName string = '${ solutionName }-mng-id'
 
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   name: miName

infra/main.bicep

@@ -30,12 +30,13 @@ param Prefix string
   'westus3'
 ])
 @description('Location for all Ai services resources. This location can be different from the resource group location.')
-param AiLocation string  // The location used for all deployed resources.  This location must be in the same region as the resource group.
+param AzureAiServiceLocation string  // The location used for all deployed resources.  This location must be in the same region as the resource group.
 param capacity int = 5
 
 var uniqueId = toLower(uniqueString(subscription().id, Prefix, resourceGroup().location))
-var ResourcePrefix = 'cm${padLeft(take(uniqueId, 12), 12, '0')}'
-var imageVersion = 'rc1'
+var UniquePrefix = 'cm${padLeft(take(uniqueId, 12), 12, '0')}'
+var ResourcePrefix = take('cm${Prefix}${UniquePrefix}', 15)
+var imageVersion = 'rc1' // Change to 'fnd01' when ready
 var location  = resourceGroup().location
 var dblocation  = resourceGroup().location
 var cosmosdbDatabase  = 'cmsadb'
@@ -46,9 +47,9 @@ var deploymentType  = 'GlobalStandard'
 var containerName  = 'appstorage'
 var llmModel  = 'gpt-4o'
 var storageSkuName = 'Standard_LRS'
-var storageContainerName = '${ResourcePrefix}ctstor'
+var storageContainerName = '${ResourcePrefix}cts'
 var gptModelVersion = '2024-08-06'
-var aiServicesName = '${ResourcePrefix}-aiservices'
+var azureAiServicesName = '${ResourcePrefix}-ais'
 
 
 
@@ -65,24 +66,24 @@ var aiModelDeployments = [
   }
 ]
 
-resource aiServices 'Microsoft.CognitiveServices/accounts@2024-04-01-preview' = {
-  name: aiServicesName
+resource azureAiServices 'Microsoft.CognitiveServices/accounts@2024-04-01-preview' = {
+  name: azureAiServicesName
   location: location
   sku: {
     name: 'S0'
   }
   kind: 'AIServices'
   properties: {
-    customSubDomainName: aiServicesName
+    customSubDomainName: azureAiServicesName
     apiProperties: {
       statisticsEnabled: false
     }
   }
 }
 
 @batchSize(1)
-resource aiServicesDeployments 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = [for aiModeldeployment in aiModelDeployments: {
-  parent: aiServices //aiServices_m
+resource azureAiServicesDeployments 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = [for aiModeldeployment in aiModelDeployments: {
+  parent: azureAiServices //aiServices_m
   name: aiModeldeployment.name
   properties: {
     model: {
@@ -124,26 +125,26 @@ module kvault 'deploy_keyvault.bicep' = {
 
 
 // ==========AI Foundry and related resources ========== //
-module aifoundry 'deploy_ai_foundry.bicep' = {
+module azureAifoundry 'deploy_ai_foundry.bicep' = {
   name: 'deploy_ai_foundry'
   params: {
     solutionName: ResourcePrefix
-    solutionLocation: AiLocation
+    solutionLocation: AzureAiServiceLocation
     keyVaultName: kvault.outputs.keyvaultName
     gptModelName: llmModel
     gptModelVersion: gptModelVersion
     managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
-    aiServicesEndpoint: aiServices.properties.endpoint
-    aiServicesKey: aiServices.listKeys().key1
-    aiServicesId: aiServices.id
+    aiServicesEndpoint: azureAiServices.properties.endpoint
+    aiServicesKey: azureAiServices.listKeys().key1
+    aiServicesId: azureAiServices.id
   }
   scope: resourceGroup(resourceGroup().name)
 }
 
 module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.9.1' = {
   name: toLower('${ResourcePrefix}conAppsEnv')
   params: {
-    logAnalyticsWorkspaceResourceId: aifoundry.outputs.logAnalyticsId
+    logAnalyticsWorkspaceResourceId: azureAifoundry.outputs.logAnalyticsId
     name: toLower('${ResourcePrefix}manenv')
     location: location
     zoneRedundant: false
@@ -310,7 +311,7 @@ resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
             }
             {
               name: 'AZURE_OPENAI_ENDPOINT'
-              value: 'https://${aifoundry.outputs.aiServicesName}.openai.azure.com/'
+              value: 'https://${azureAifoundry.outputs.aiServicesName}.openai.azure.com/'
             }
             {
               name: 'MIGRATOR_AGENT_MODEL_DEPLOY'
@@ -413,7 +414,7 @@ var openAiContributorRoleId = 'a001fd3d-188f-4b5d-821b-7da978bf7442'  // Fixed R
 
 resource openAiRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
   name: guid(containerAppBackend.id, openAiContributorRoleId)
-  scope: aiServices
+  scope: azureAiServices
   properties: {
     roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', openAiContributorRoleId) // OpenAI Service Contributor
     principalId: containerAppBackend.identity.principalId
@@ -430,7 +431,7 @@ resource containers 'Microsoft.Storage/storageAccounts/blobServices/containers@2
   properties: {
     publicAccess: 'None'
   }
-  dependsOn: [aifoundry]
+  dependsOn: [azureAifoundry]
 }]
 
 

infra/main.json

@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.34.44.8038",
-      "templateHash": "13937422806437579370"
+      "templateHash": "372840055428460103"
     }
   },
   "parameters": {
@@ -17,7 +17,7 @@
         "description": "Prefix for all resources created by this template.  This prefix will be used to create unique names for all resources.  The prefix must be unique within the resource group."
       }
     },
-    "AiLocation": {
+    "AzureAiServiceLocation": {
       "type": "string",
       "allowedValues": [
         "australiaeast",
@@ -55,7 +55,8 @@
   },
   "variables": {
     "uniqueId": "[toLower(uniqueString(subscription().id, parameters('Prefix'), resourceGroup().location))]",
-    "ResourcePrefix": "[format('cm{0}', padLeft(take(variables('uniqueId'), 12), 12, '0'))]",
+    "UniquePrefix": "[format('cm{0}', padLeft(take(variables('uniqueId'), 12), 12, '0'))]",
+    "ResourcePrefix": "[take(format('cm{0}{1}', parameters('Prefix'), variables('UniquePrefix')), 15)]",
     "imageVersion": "rc1",
     "location": "[resourceGroup().location]",
     "dblocation": "[resourceGroup().location]",
@@ -67,9 +68,9 @@
     "containerName": "appstorage",
     "llmModel": "gpt-4o",
     "storageSkuName": "Standard_LRS",
-    "storageContainerName": "[format('{0}ctstor', variables('ResourcePrefix'))]",
+    "storageContainerName": "[format('{0}cts', variables('ResourcePrefix'))]",
     "gptModelVersion": "2024-08-06",
-    "aiServicesName": "[format('{0}-aiservices', variables('ResourcePrefix'))]",
+    "azureAiServicesName": "[format('{0}-ais', variables('ResourcePrefix'))]",
     "aiModelDeployments": [
       {
         "name": "[variables('llmModel')]",
@@ -91,29 +92,29 @@
     {
       "type": "Microsoft.CognitiveServices/accounts",
       "apiVersion": "2024-04-01-preview",
-      "name": "[variables('aiServicesName')]",
+      "name": "[variables('azureAiServicesName')]",
       "location": "[variables('location')]",
       "sku": {
         "name": "S0"
       },
       "kind": "AIServices",
       "properties": {
-        "customSubDomainName": "[variables('aiServicesName')]",
+        "customSubDomainName": "[variables('azureAiServicesName')]",
         "apiProperties": {
           "statisticsEnabled": false
         }
       }
     },
     {
       "copy": {
-        "name": "aiServicesDeployments",
+        "name": "azureAiServicesDeployments",
         "count": "[length(variables('aiModelDeployments'))]",
         "mode": "serial",
         "batchSize": 1
       },
       "type": "Microsoft.CognitiveServices/accounts/deployments",
       "apiVersion": "2023-05-01",
-      "name": "[format('{0}/{1}', variables('aiServicesName'), variables('aiModelDeployments')[copyIndex()].name)]",
+      "name": "[format('{0}/{1}', variables('azureAiServicesName'), variables('aiModelDeployments')[copyIndex()].name)]",
       "properties": {
         "model": {
           "format": "OpenAI",
@@ -127,7 +128,7 @@
         "capacity": "[variables('aiModelDeployments')[copyIndex()].sku.capacity]"
       },
       "dependsOn": [
-        "[resourceId('Microsoft.CognitiveServices/accounts', variables('aiServicesName'))]"
+        "[resourceId('Microsoft.CognitiveServices/accounts', variables('azureAiServicesName'))]"
       ]
     },
     {
@@ -302,14 +303,14 @@
     {
       "type": "Microsoft.Authorization/roleAssignments",
       "apiVersion": "2022-04-01",
-      "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', variables('aiServicesName'))]",
+      "scope": "[format('Microsoft.CognitiveServices/accounts/{0}', variables('azureAiServicesName'))]",
       "name": "[guid(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), variables('openAiContributorRoleId'))]",
       "properties": {
         "roleDefinitionId": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', variables('openAiContributorRoleId'))]",
         "principalId": "[reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), '2023-05-01', 'full').identity.principalId]"
       },
       "dependsOn": [
-        "[resourceId('Microsoft.CognitiveServices/accounts', variables('aiServicesName'))]",
+        "[resourceId('Microsoft.CognitiveServices/accounts', variables('azureAiServicesName'))]",
         "[resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix'))))]"
       ]
     },
@@ -353,7 +354,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.34.44.8038",
-              "templateHash": "17863870312619064541"
+              "templateHash": "15524749849693178338"
             }
           },
           "parameters": {
@@ -373,7 +374,7 @@
             },
             "miName": {
               "type": "string",
-              "defaultValue": "[format('{0}-managed-identity', parameters('solutionName'))]",
+              "defaultValue": "[format('{0}-mng-id', parameters('solutionName'))]",
               "metadata": {
                 "description": "Name"
               }
@@ -558,7 +559,7 @@
             "value": "[variables('ResourcePrefix')]"
           },
           "solutionLocation": {
-            "value": "[parameters('AiLocation')]"
+            "value": "[parameters('AzureAiServiceLocation')]"
           },
           "keyVaultName": {
             "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_keyvault'), '2022-09-01').outputs.keyvaultName.value]"
@@ -573,13 +574,13 @@
             "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]"
           },
           "aiServicesEndpoint": {
-            "value": "[reference(resourceId('Microsoft.CognitiveServices/accounts', variables('aiServicesName')), '2024-04-01-preview').endpoint]"
+            "value": "[reference(resourceId('Microsoft.CognitiveServices/accounts', variables('azureAiServicesName')), '2024-04-01-preview').endpoint]"
           },
           "aiServicesKey": {
-            "value": "[listKeys(resourceId('Microsoft.CognitiveServices/accounts', variables('aiServicesName')), '2024-04-01-preview').key1]"
+            "value": "[listKeys(resourceId('Microsoft.CognitiveServices/accounts', variables('azureAiServicesName')), '2024-04-01-preview').key1]"
           },
           "aiServicesId": {
-            "value": "[resourceId('Microsoft.CognitiveServices/accounts', variables('aiServicesName'))]"
+            "value": "[resourceId('Microsoft.CognitiveServices/accounts', variables('azureAiServicesName'))]"
           }
         },
         "template": {
@@ -589,7 +590,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.34.44.8038",
-              "templateHash": "12550713338937452696"
+              "templateHash": "1990190368109519471"
             }
           },
           "parameters": {
@@ -622,18 +623,18 @@
             }
           },
           "variables": {
-            "storageName": "[format('{0}hubstorage', parameters('solutionName'))]",
+            "storageName": "[format('{0}hubstr', parameters('solutionName'))]",
             "storageSkuName": "Standard_LRS",
-            "aiServicesName": "[format('{0}-aiservices', parameters('solutionName'))]",
-            "workspaceName": "[format('{0}-workspace', parameters('solutionName'))]",
+            "aiServicesName": "[format('{0}-ais', parameters('solutionName'))]",
+            "workspaceName": "[format('{0}-wrksp', parameters('solutionName'))]",
             "keyvaultName": "[format('{0}-kv', parameters('solutionName'))]",
             "location": "[parameters('solutionLocation')]",
             "aiHubName": "[format('{0}-aihub', parameters('solutionName'))]",
             "aiHubFriendlyName": "[variables('aiHubName')]",
             "aiHubDescription": "AI Hub for KM template",
-            "aiProjectName": "[format('{0}-aiproject', parameters('solutionName'))]",
+            "aiProjectName": "[format('{0}-aiprj', parameters('solutionName'))]",
             "aiProjectFriendlyName": "[variables('aiProjectName')]",
-            "aiSearchName": "[format('{0}-search', parameters('solutionName'))]",
+            "aiSearchName": "[format('{0}-srch', parameters('solutionName'))]",
             "storageNameCleaned": "[replace(variables('storageName'), '-', '')]"
           },
           "resources": [
@@ -943,7 +944,7 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.CognitiveServices/accounts', variables('aiServicesName'))]",
+        "[resourceId('Microsoft.CognitiveServices/accounts', variables('azureAiServicesName'))]",
         "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_keyvault')]",
         "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]"
       ]