Skip to content

Commit d037aef

Browse files
changes related to Bicep Standards
1 parent 1bb4cc0 commit d037aef

12 files changed

Lines changed: 263 additions & 72 deletions

infra/deploy_ai_foundry.bicep

Lines changed: 62 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,57 @@
11
// Creates Azure dependent resources for Azure AI studio
2+
3+
@minLength(3)
4+
@maxLength(15)
5+
@description('Solution Name')
26
param solutionName string
7+
8+
@description('Solution Location')
39
param solutionLocation string
10+
11+
@description('Contains Name of KeyVault.')
412
param keyVaultName string
13+
14+
@description('Indicates the type of Deployment.')
515
param deploymentType string
16+
17+
@description('GPT Model Name')
618
param gptModelName string
19+
20+
@description('GPT Model Version.')
721
param gptModelVersion string
22+
23+
@description('Azure OepnAI API Version.')
824
param azureOpenaiAPIVersion string
25+
26+
@description('Param to get Deployment Capacity.')
927
param gptDeploymentCapacity int
28+
29+
@description('Embedding Model.')
1030
param embeddingModel string
31+
32+
@description('Info about Embedding Deployment Capacity.')
1133
param embeddingDeploymentCapacity int
34+
35+
@description('Managed Identity Object ID.')
1236
param managedIdentityObjectId string
37+
38+
@description('Existing Log Analytics WorkspaceID.')
1339
param existingLogAnalyticsWorkspaceId string = ''
40+
41+
@description('Azure Existing AI Project ResourceID.')
1442
param azureExistingAIProjectResourceId string = ''
1543

16-
var abbrs = loadJsonContent('./abbreviations.json')
44+
//var abbrs = loadJsonContent('./abbreviations.json')
1745

18-
var aiFoundryName = '${abbrs.ai.aiFoundry}${solutionName}'
19-
var applicationInsightsName = '${abbrs.managementGovernance.applicationInsights}${solutionName}'
20-
var keyvaultName = '${abbrs.security.keyVault}${solutionName}'
46+
var aiFoundryName = 'aif-${solutionName}'
47+
var applicationInsightsName = 'appi-${solutionName}'
48+
var keyvaultName = 'kv-${solutionName}'
2149
var location = solutionLocation //'eastus2'
22-
var aiProjectName = '${abbrs.ai.aiFoundryProject}${solutionName}'
50+
var aiProjectName = 'aifp-${solutionName}'
2351
var aiProjectFriendlyName = aiProjectName
2452
var aiProjectDescription = 'AI Foundry Project'
25-
var aiSearchName = '${abbrs.ai.aiSearch}${solutionName}'
26-
var workspaceName = '${abbrs.managementGovernance.logAnalyticsWorkspace}${solutionName}'
53+
var aiSearchName = 'srch-${solutionName}'
54+
var workspaceName = 'log-${solutionName}'
2755
// var aiSearchConnectionName = 'myVectorStoreProjectConnectionName-${solutionName}'
2856

2957
var useExisting = !empty(existingLogAnalyticsWorkspaceId)
@@ -414,30 +442,57 @@ resource azureLocatioEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview
414442
}
415443
}
416444

445+
@description('Contains Name of KeyVault.')
417446
output keyvaultName string = keyvaultName
447+
448+
@description('Contains KeyVault ID.')
418449
output keyvaultId string = keyVault.id
419450

420451
// output aiServicesTarget string = aiFoundry.properties.endpoint //aiServices_m.properties.endpoint
421452
// output aiServicesName string = aiFoundryName //aiServicesName_m
422453
// output aiServicesId string = aiFoundry.id //aiServices_m.id
423454

455+
@description('Contains AI Search Name.')
424456
output aiSearchName string = aiSearchName
457+
458+
@description('Contains AI SearchID.')
425459
output aiSearchId string = aiSearch.id
460+
461+
@description('Contains AI Search Target.')
426462
output aiSearchTarget string = 'https://${aiSearch.name}.search.windows.net'
463+
464+
@description('Contains AI Search Service.')
427465
output aiSearchService string = aiSearch.name
466+
467+
@description('Contains Name of AI Search Connection.')
428468
output aiSearchConnectionName string = aiSearchConnectionName
469+
470+
@description('Contains Name of AI Foundry Project.')
429471
output aiFoundryProjectName string = !empty(existingAIProjectName) ? existingAIProjectName : aiFoundryProject.name
430472
// output aiFoundryProjectEndpoint string = aiFoundryProject.properties.endpoints['AI Foundry API']
473+
474+
@description('Contains Name of AI Foundry Project Endpoint.')
431475
output aiFoundryProjectEndpoint string = !empty(existingProjEndpoint)
432476
? existingProjEndpoint
433477
: aiFoundryProject.properties.endpoints['AI Foundry API']
434478
// output aoaiEndpoint string = aiFoundry.properties.endpoints['OpenAI Language Model Instance API']
479+
480+
@description('Contains AI Endpoint.')
435481
output aoaiEndpoint string = !empty(existingOpenAIEndpoint)
436482
? existingOpenAIEndpoint
437483
: aiFoundry.properties.endpoints['OpenAI Language Model Instance API']
484+
485+
@description('Contains Name of AI Foundry.')
438486
output aiFoundryName string = !empty(existingAIFoundryName) ? existingAIFoundryName : aiFoundryName
487+
488+
@description('Contains Name of AI Foundry RG.')
439489
output aiFoundryRgName string = !empty(existingAIServiceResourceGroup) ? existingAIServiceResourceGroup : resourceGroup().name
440490

491+
@description('Contains Application Insights ID.')
441492
output applicationInsightsId string = applicationInsights.id
493+
494+
@description('Contains Log Analytics Workspace Resource Name.')
442495
output logAnalyticsWorkspaceResourceName string = useExisting ? existingLogAnalyticsWorkspace.name : logAnalytics.name
496+
497+
@description('Contains Application Insights Connection String.')
443498
output applicationInsightsConnectionString string = applicationInsights.properties.ConnectionString

infra/deploy_aifp_aisearch_connection.bicep

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1+
@description('Existing AI Project Name')
12
param existingAIProjectName string
3+
4+
@description('Existing AI Foundry Name')
25
param existingAIFoundryName string
6+
7+
@description('AI Search Name')
38
param aiSearchName string
9+
10+
@description('AI Search Resource ID')
411
param aiSearchResourceId string
12+
13+
@description('AI Search Location')
514
param aiSearchLocation string
15+
16+
@description('AI Search Connection Name')
617
param aiSearchConnectionName string
718

819
resource projectAISearchConnection 'Microsoft.CognitiveServices/accounts/projects/connections@2025-04-01-preview' = {

0 commit comments

Comments
 (0)