Skip to content

Commit 86ebab4

Browse files
fix: hardcoded abbreviations in bicep (#1805)
1 parent 5383461 commit 86ebab4

File tree

2 files changed

+319
-223
lines changed

2 files changed

+319
-223
lines changed

infra/main.bicep

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ param resourceToken string = toLower(uniqueString(subscription().id, environment
1212
param location string
1313

1414
@description('Name of App Service plan')
15-
var hostingPlanName = '${abbrs.compute.appServicePlan}${resourceToken}'
15+
param hostingPlanName string = 'asp-${resourceToken}'
1616

1717
@description('The pricing tier for the App Service plan')
1818
@allowed([
@@ -51,19 +51,19 @@ param skuTier string = 'Basic'
5151
param databaseType string = 'PostgreSQL'
5252

5353
@description('Azure Cosmos DB Account Name')
54-
var azureCosmosDBAccountName = '${abbrs.databases.cosmosDBDatabase}${resourceToken}'
54+
param azureCosmosDBAccountName string = 'cosmos-${resourceToken}'
5555

5656
@description('Azure Postgres DB Account Name')
57-
var azurePostgresDBAccountName = '${abbrs.databases.postgreSQLDatabase}${resourceToken}'
57+
param azurePostgresDBAccountName string = 'psql-${resourceToken}'
5858

5959
@description('Name of Web App')
60-
var websiteName = '${abbrs.compute.webApp}${resourceToken}'
60+
param websiteName string = 'app-${resourceToken}'
6161

6262
@description('Name of Admin Web App')
63-
var adminWebsiteName = '${websiteName}-admin'
63+
param adminWebsiteName string = '${websiteName}-admin'
6464

6565
@description('Name of Application Insights')
66-
var applicationInsightsName = '${abbrs.managementGovernance.applicationInsights}${resourceToken}'
66+
param applicationInsightsName string = 'appi-${resourceToken}'
6767

6868
@description('Name of the Workbook')
6969
param workbookDisplayName string = 'workbook-${resourceToken}'
@@ -120,7 +120,7 @@ param azureSearchUrlColumn string = 'url'
120120
param azureSearchUseIntegratedVectorization bool = false
121121

122122
@description('Name of Azure OpenAI Resource')
123-
var azureOpenAIResourceName = '${abbrs.ai.openAIService}${resourceToken}'
123+
param azureOpenAIResourceName string = 'oai-${resourceToken}'
124124

125125
@description('Name of Azure OpenAI Resource SKU')
126126
param azureOpenAISkuName string = 'S0'
@@ -205,7 +205,7 @@ param azureOpenAIEmbeddingModelVersion string = '2'
205205
param azureOpenAIEmbeddingModelCapacity int = 30
206206

207207
@description('Name of Computer Vision Resource (if useAdvancedImageProcessing=true)')
208-
var computerVisionName = '${abbrs.ai.computerVision}${resourceToken}'
208+
param computerVisionName string = 'cv-${resourceToken}'
209209

210210
@description('Name of Computer Vision Resource SKU (if useAdvancedImageProcessing=true)')
211211
@allowed([
@@ -235,7 +235,7 @@ param computerVisionVectorizeImageApiVersion string = '2024-02-01'
235235
param computerVisionVectorizeImageModelVersion string = '2023-04-15'
236236

237237
@description('Azure AI Search Resource')
238-
var azureAISearchName = '${abbrs.ai.aiSearch}${resourceToken}'
238+
param azureAISearchName string = 'srch-${resourceToken}'
239239

240240
@description('The SKU of the search service you want to create. E.g. free or standard')
241241
@allowed([
@@ -260,22 +260,22 @@ param azureSearchDatasource string = 'datasource-${resourceToken}'
260260
param azureSearchConversationLogIndex string = 'conversations'
261261

262262
@description('Name of Storage Account')
263-
var storageAccountName = '${abbrs.storage.storageAccount}${resourceToken}'
263+
param storageAccountName string = 'st${resourceToken}'
264264

265265
@description('Name of Function App for Batch document processing')
266-
var functionName = '${abbrs.compute.functionApp}${resourceToken}'
266+
param functionName string = 'func-${resourceToken}'
267267

268268
@description('Azure Form Recognizer Name')
269-
var formRecognizerName = '${abbrs.ai.documentIntelligence}${resourceToken}'
269+
param formRecognizerName string = 'di-${resourceToken}'
270270

271271
@description('Azure Content Safety Name')
272-
var contentSafetyName = '${abbrs.ai.contentSafety}${resourceToken}'
272+
param contentSafetyName string = 'cs-${resourceToken}'
273273

274274
@description('Azure Speech Service Name')
275-
var speechServiceName = '${abbrs.ai.speechService}${resourceToken}'
275+
param speechServiceName string = 'spch-${resourceToken}'
276276

277277
@description('Log Analytics Name')
278-
var logAnalyticsName = '${abbrs.managementGovernance.logAnalyticsWorkspace}${resourceToken}'
278+
param logAnalyticsName string = 'log-${resourceToken}'
279279

280280
param newGuidString string = newGuid()
281281
param searchTag string = 'chatwithyourdata-sa'
@@ -309,7 +309,7 @@ param logLevel string = 'INFO'
309309
param recognizedLanguages string = 'en-US,fr-FR,de-DE,it-IT'
310310

311311
@description('Azure Machine Learning Name')
312-
var azureMachineLearningName = '${abbrs.ai.machineLearningWorkspace}${resourceToken}'
312+
param azureMachineLearningName string = 'mlw-${resourceToken}'
313313

314314
var blobContainerName = 'documents'
315315
var queueName = 'doc-processing'

0 commit comments

Comments
 (0)