refactor: standardize Bicep resource naming, simplify parameters, and upgrade OpenAI model

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_search_service.bicep

@@ -4,7 +4,7 @@
 param solutionName string
 param solutionLocation string
 
-param searchServices_byc_cs_name string = '${ solutionName }-cs'
+param searchServices_byc_cs_name string 
 
 resource searchServices_byc_cs_name_resource 'Microsoft.Search/searchServices@2023-11-01' = {
   name: searchServices_byc_cs_name

infra/bicep/deploy_app_service.bicep

@@ -12,7 +12,7 @@ param solutionLocation string
 param identity string
 
 @description('Name of App Service plan')
-param HostingPlanName string = '${ solutionName }-app-service-plan'
+param HostingPlanName string 
 
 @description('The pricing tier for the App Service plan')
 @allowed(
@@ -21,10 +21,10 @@ param HostingPlanName string = '${ solutionName }-app-service-plan'
 param HostingPlanSku string = 'B1'
 
 @description('Name of Web App')
-param WebsiteName string = '${ solutionName }-app-service'
+param WebsiteName string 
 
 @description('Name of Application Insights')
-param ApplicationInsightsName string = '${ solutionName }-app-insights'
+param ApplicationInsightsName string 
 
 @description('Name of Azure Search Service')
 param AzureSearchService string = ''

infra/bicep/deploy_azure_ai_service.bicep

@@ -4,7 +4,7 @@
 param solutionName string
 param solutionLocation string
 
-param accounts_byc_cogser_name string = '${ solutionName }-cogser'
+param accounts_byc_cogser_name string 
 
 resource accounts_byc_cogser_name_resource 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
   name: accounts_byc_cogser_name

infra/bicep/deploy_azure_open_ai.bicep

@@ -4,7 +4,7 @@
 param solutionName string
 param solutionLocation string
 
-param accounts_byc_openai_name string = '${ solutionName }-openai'
+param accounts_byc_openai_name string 
 
 resource accounts_byc_openai_name_resource 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
   name: accounts_byc_openai_name
@@ -26,16 +26,16 @@ resource accounts_byc_openai_name_resource 'Microsoft.CognitiveServices/accounts
 
 resource accounts_byc_openai_name_gpt_35_turbo 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = {
   parent: accounts_byc_openai_name_resource
-  name: 'gpt-35-turbo-16k'
+  name: 'gpt-35-turbo'
   sku: {
     name: 'Standard'
     capacity: 30
   }
   properties: {
     model: {
       format: 'OpenAI'
-      name: 'gpt-35-turbo-16k'
-      version: '0613'
+      name: 'gpt-35-turbo'
+      version: '0125'
     }
     versionUpgradeOption: 'OnceNewDefaultVersionAvailable'
     raiPolicyName: 'Microsoft.Default'

infra/bicep/deploy_keyvault.bicep

@@ -12,7 +12,7 @@ param solutionLocation string
 param utc string = utcNow()
 
 @description('Name')
-param kvName string = '${ solutionName }-kv-${uniqueString(utc)}'
+param kvName string 
 
 @description('Object Id. The object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault.')
 param objectId string

infra/bicep/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 
 
 resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
   name: miName

infra/bicep/deploy_storage_account.bicep

@@ -10,7 +10,7 @@ param solutionName string
 param solutionLocation string
 
 @description('Name')
-param saName string = '${ solutionName }storageaccount'
+param saName string 
 
 param managedIdentityObjectId string