Skip to content

Commit 18ea1e8

Browse files
Kingshuk-MicrosoftKingshuk-Microsoft
committed
output parameters format changes
1 parent b5397be commit 18ea1e8

3 files changed

Lines changed: 94 additions & 35 deletions

File tree

‎infra/deploy_ai_foundry.bicep‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ module existing_AIProject_SearchConnectionModule 'deploy_aifp_aisearch_connectio
259259
aiSearchResourceId: aiSearch.id
260260
aiSearchLocation: aiSearch.location
261261
aiSearchConnectionName: aiSearchConnectionName
262-
tags : tags
263262
}
264263
}
265264

@@ -511,7 +510,6 @@ output aiFoundryName string = !empty(existingAIFoundryName) ? existingAIFoundryN
511510

512511
@description('Contains Name of AI Foundry RG.')
513512
output aiFoundryRgName string = !empty(existingAIServiceResourceGroup) ? existingAIServiceResourceGroup : resourceGroup().name
514-
=======
515513
output aiFoundryId string = !empty(azureExistingAIProjectResourceId)
516514
? existingAiFoundry.id
517515
: aiFoundry.id

‎infra/deploy_app_service.bicep‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ param AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = ''
111111
param AZURE_COSMOSDB_DATABASE string = ''
112112

113113
@description('Optional. Enable feedback in Cosmos DB')
114-
param AZURE_COSMOSDB_ENABLE_FEEDBACK string = 'True'
114+
param azureCosmosDbEnableFeedback string = 'True'
115115

116116
@description('Required. Contains Image Tag.')
117117
param imageTag string
@@ -309,7 +309,7 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
309309
}
310310
{ name: 'AZURE_COSMOSDB_CONVERSATIONS_CONTAINER', value: AZURE_COSMOSDB_CONVERSATIONS_CONTAINER }
311311
{ name: 'AZURE_COSMOSDB_DATABASE', value: AZURE_COSMOSDB_DATABASE }
312-
{ name: 'AZURE_COSMOSDB_ENABLE_FEEDBACK', value: AZURE_COSMOSDB_ENABLE_FEEDBACK }
312+
{ name: 'azureCosmosDbEnableFeedback', value: azureCosmosDbEnableFeedback }
313313
{
314314
name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
315315
value: 'true'
@@ -439,15 +439,37 @@ module assignAiUserRoleToAiProject 'deploy_foundry_role_assignment.bicep' = {
439439

440440
@description('Contains the URL of WebApp.')
441441
output webAppUrl string = 'https://${websiteName}.azurewebsites.net'
442+
443+
@description('Contains OpenAI System Message.')
442444
output azureOpenAISystemMessage string = azureOpenAISystemMessage
445+
446+
@description('Contains OpenAI Generate Section Content Prompt.')
443447
output azureOpenAiGenerateSectionContentPrompt string = azureOpenAiGenerateSectionContentPrompt
448+
449+
@description('Contains OpenAI Template System Message.')
444450
output azureOpenAiTemplateSystemMessage string = azureOpenAiTemplateSystemMessage
451+
452+
@description('Contains OpenAI Title Prompt.')
445453
output azureOpenAiTitlePrompt string = azureOpenAiTitlePrompt
454+
455+
@description('Contains OpenAI Model.')
446456
output azureOpenAIModel string = azureOpenAIModel
457+
458+
@description('Contains OpenAI Resource.')
447459
output azureOpenAIResource string = azureOpenaiResource
460+
461+
@description('Contains the Azure Search Index.')
448462
output AzureSearchIndex string = azureSearchIndex
463+
464+
@description('Contains AI Search Service.')
449465
output aiSearchService string = aiSearchService
450-
output AZURE_COSMOSDB_ENABLE_FEEDBACK string = AZURE_COSMOSDB_ENABLE_FEEDBACK
466+
467+
@description('Contains the URL of WebApp.')
468+
output azureCosmosDbEnableFeedback string = azureCosmosDbEnableFeedback
469+
470+
@description('Contains the URL of WebApp.')
451471
output AzureSearchQueryType string = azureSearchQueryType
472+
473+
@description('Contains the URL of WebApp.')
452474
output AzureSearchVectorFields string = azureSearchVectorFields
453475

‎infra/main.bicep‎

Lines changed: 69 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ module appserviceModule 'deploy_app_service.bicep' = {
208208
AZURE_COSMOSDB_CONVERSATIONS_CONTAINER: cosmosDBModule.outputs.cosmosContainerName
209209
AZURE_COSMOSDB_DATABASE: cosmosDBModule.outputs.cosmosDatabaseName
210210
appInsightsConnectionString: aifoundry.outputs.applicationInsightsConnectionString
211-
AZURE_COSMOSDB_ENABLE_FEEDBACK: 'True'
211+
azureCosmosDbEnableFeedback: 'True'
212212
hostingPlanName: 'asp-${solutionSuffix}'
213213
websiteName: 'app-${solutionSuffix}'
214214
aiSearchProjectConnectionName: aifoundry.outputs.aiSearchConnectionName
@@ -219,7 +219,8 @@ module appserviceModule 'deploy_app_service.bicep' = {
219219
// dependsOn:[sqlDBModule]
220220
}
221221

222-
output WEB_APP_URL string = appserviceModule.outputs.webAppUrl
222+
@description('Contains WebApp URL')
223+
output webAppUrl string = appserviceModule.outputs.webAppUrl
223224

224225
// ========== Cosmos DB module ========== //
225226
module cosmosDBModule 'deploy_cosmos_db.bicep' = {
@@ -235,47 +236,85 @@ module cosmosDBModule 'deploy_cosmos_db.bicep' = {
235236
}
236237

237238
@description('Contains Storage Account Name')
238-
output STORAGE_ACCOUNT_NAME string = storageAccount.outputs.storageName
239+
output storageAccountName string = storageAccount.outputs.storageName
239240

240241
@description('Contains Storage Container Name')
241-
output STORAGE_CONTAINER_NAME string = storageAccount.outputs.storageContainer
242+
output storageContainerName string = storageAccount.outputs.storageContainer
242243

243244
@description('Contains KeyVault Name')
244-
output KEY_VAULT_NAME string = kvault.outputs.keyvaultName
245+
output keyVaultName string = kvault.outputs.keyvaultName
245246

246247
@description('Contains CosmosDB Account Name')
247-
output COSMOSDB_ACCOUNT_NAME string = cosmosDBModule.outputs.cosmosAccountName
248+
output cosmosDbAccountName string = cosmosDBModule.outputs.cosmosAccountName
248249

249250
@description('Contains Resource Group Name')
250-
output RESOURCE_GROUP_NAME string = resourceGroup().name
251+
output resourceGroupName string = resourceGroup().name
251252

252253
@description('Contains AI Foundry Name')
253-
output AI_FOUNDRY_NAME string = aifoundry.outputs.aiFoundryName
254+
output aiFoundryName string = aifoundry.outputs.aiFoundryName
254255

255256
@description('Contains AI Foundry RG Name')
256-
output AI_FOUNDRY_RG_NAME string = aifoundry.outputs.aiFoundryRgName
257+
output aiFoundryRgName string = aifoundry.outputs.aiFoundryRgName
258+
259+
@description('Contains AI Foundry Resource ID')
260+
output aiFoundryResourceId string = aifoundry.outputs.aiFoundryId
257261

258262
@description('Contains AI Search Service Name')
259-
output AI_FOUNDRY_RESOURCE_ID string = aifoundry.outputs.aiFoundryId
260-
output AI_SEARCH_SERVICE_NAME string = aifoundry.outputs.aiSearchService
263+
output aiSearchServiceName string = aifoundry.outputs.aiSearchService
261264

262265
@description('Contains Azure Search Connection Name')
263-
output AZURE_SEARCH_CONNECTION_NAME string = aifoundry.outputs.aiSearchConnectionName
264-
output AZURE_OPENAI_TITLE_PROMPT string = appserviceModule.outputs.azureOpenAiTitlePrompt
265-
output AZURE_OPENAI_GENERATE_SECTION_CONTENT_PROMPT string = appserviceModule.outputs.azureOpenAiGenerateSectionContentPrompt
266-
output AZURE_OPENAI_TEMPLATE_SYSTEM_MESSAGE string = appserviceModule.outputs.azureOpenAiTemplateSystemMessage
267-
output AZURE_OPENAI_SYSTEM_MESSAGE string = appserviceModule.outputs.azureOpenAISystemMessage
268-
output AZURE_OPENAI_MODEL string = appserviceModule.outputs.azureOpenAIModel
269-
output AZURE_OPENAI_RESOURCE string = appserviceModule.outputs.azureOpenAIResource
270-
output AZURE_SEARCH_SERVICE string = appserviceModule.outputs.aiSearchService
271-
output AZURE_SEARCH_INDEX string = appserviceModule.outputs.AzureSearchIndex
272-
output AZURE_COSMOSDB_ACCOUNT string = cosmosDBModule.outputs.cosmosAccountName
273-
output AZURE_COSMOSDB_DATABASE string = cosmosDBModule.outputs.cosmosDatabaseName
274-
output AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = cosmosDBModule.outputs.cosmosContainerName
275-
output AZURE_COSMOSDB_ENABLE_FEEDBACK string = appserviceModule.outputs.AZURE_COSMOSDB_ENABLE_FEEDBACK
276-
output AZURE_SEARCH_QUERY_TYPE string = appserviceModule.outputs.AzureSearchQueryType
277-
output AZURE_SEARCH_VECTOR_COLUMNS string = appserviceModule.outputs.AzureSearchVectorFields
278-
output AZURE_AI_AGENT_ENDPOINT string = aifoundry.outputs.aiFoundryProjectEndpoint
279-
output AZURE_AI_AGENT_API_VERSION string = azureAiAgentApiVersion
280-
output AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME string = appserviceModule.outputs.azureOpenAIModel
281-
output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = aifoundry.outputs.applicationInsightsConnectionString
266+
output azureSearchConnectionName string = aifoundry.outputs.aiSearchConnectionName
267+
268+
@description('Contains OpenAI Title Prompt')
269+
output azureOpenaiTitlePrompt string = appserviceModule.outputs.azureOpenAiTitlePrompt
270+
271+
@description('Contains OpenAI Generate Section Content Prompt')
272+
output azureOpenaiGENERATE_SECTION_CONTENT_PROMPT string = appserviceModule.outputs.azureOpenAiGenerateSectionContentPrompt
273+
274+
@description('Contains OpenAI Template System Message')
275+
output azureOpenaiTemplateSystemMessage string = appserviceModule.outputs.azureOpenAiTemplateSystemMessage
276+
277+
@description('Contains OpenAI System Message')
278+
output azureOpenaiSystemMessage string = appserviceModule.outputs.azureOpenAISystemMessage
279+
280+
@description('Contains OpenAI Model')
281+
output azureOpenaiModel string = appserviceModule.outputs.azureOpenAIModel
282+
283+
@description('Contains OpenAI Resource')
284+
output azureOpenaiResource string = appserviceModule.outputs.azureOpenAIResource
285+
286+
@description('Contains Azure Search Service')
287+
output azureSearchService string = appserviceModule.outputs.aiSearchService
288+
289+
@description('Contains Azure Search Index')
290+
output azureSearchIndex string = appserviceModule.outputs.AzureSearchIndex
291+
292+
@description('Contains CosmosDB Account')
293+
output azureCosmosDbAccount string = cosmosDBModule.outputs.cosmosAccountName
294+
295+
@description('Contains CosmosDB Database')
296+
output azureCOSMOSDB_DATABASE string = cosmosDBModule.outputs.cosmosDatabaseName
297+
298+
@description('Contains CosmosDB Conversations Container')
299+
output azureCosmosDbConversationsContainer string = cosmosDBModule.outputs.cosmosContainerName
300+
301+
@description('Contains CosmosDB Enabled Feedback')
302+
output azureCosmosDbEnableFeedback string = appserviceModule.outputs.azureCosmosDbEnableFeedback
303+
304+
@description('Contains Search Query Type')
305+
output azureSearchQueryType string = appserviceModule.outputs.AzureSearchQueryType
306+
307+
@description('Contains Search Vector Columns')
308+
output azureSearchVectorColumns string = appserviceModule.outputs.AzureSearchVectorFields
309+
310+
@description('Contains AI Agent Endpoint')
311+
output azureAiAgentEndpoint string = aifoundry.outputs.aiFoundryProjectEndpoint
312+
313+
@description('Contains AI Agent API Version')
314+
output azureAiAgentApiVersion string = azureAiAgentApiVersion
315+
316+
@description('Contains AI Agent Model Deployment Name')
317+
output azureAiAgentModelDeploymentName string = appserviceModule.outputs.azureOpenAIModel
318+
319+
@description('Contains Application Insights Connection String')
320+
output azureApplicationInsightsConnectionString string = aifoundry.outputs.applicationInsightsConnectionString

0 commit comments

Comments
 (0)