@@ -346,18 +346,54 @@ get_values_from_az_deployment() {
346346 --query " properties.outputs" -o json)
347347
348348 # Extract each value
349- cosmosDbAccountName=$( echo " $deploymentOutputs " | grep -A 3 ' "cosmosDbAccountName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
350- storageAccount=$( echo " $deploymentOutputs " | grep -A 3 ' "storageAccountName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
351- fileSystem=$( echo " $deploymentOutputs " | grep -A 3 ' "storageContainerName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
352- keyvaultName=$( echo " $deploymentOutputs " | grep -A 3 ' "keyVaultName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
353- sqlServerName=$( echo " $deploymentOutputs " | grep -A 3 ' "sqlDbServerName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
354- webAppManagedIdentityDisplayName=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentityWebAppName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
355- webAppManagedIdentityClientId=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentityWebAppClientId"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
356- SqlDatabaseName=$( echo " $deploymentOutputs " | grep -A 3 ' "sqlDbDatabase"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
357- sqlManagedIdentityClientId=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentitySqlClientId"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
358- sqlManagedIdentityDisplayName=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentitySqlName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
359- aiSearchName=$( echo " $deploymentOutputs " | grep -A 3 ' "aiSearchServiceName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
360- aif_resource_id=$( echo " $deploymentOutputs " | grep -A 3 ' "aiFoundryResourceId"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
349+ cosmosDbAccountName=$( echo " $deploymentOutputs " | grep -A 3 ' "cosmosdB_ACCOUNT_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
350+ if [ -z " $cosmosDbAccountName " ]; then
351+ cosmosDbAccountName=$( echo " $deploymentOutputs " | grep -A 3 ' "cosmosDbAccountName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
352+ fi
353+ storageAccount=$( echo " $deploymentOutputs " | grep -A 3 ' "storagE_ACCOUNT_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
354+ if [ -z " $storageAccount " ]; then
355+ storageAccount=$( echo " $deploymentOutputs " | grep -A 3 ' "storageAccountName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
356+ fi
357+ fileSystem=$( echo " $deploymentOutputs " | grep -A 3 ' "storagE_CONTAINER_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
358+ if [ -z " $fileSystem " ]; then
359+ fileSystem=$( echo " $deploymentOutputs " | grep -A 3 ' "storageContainerName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
360+ fi
361+ keyvaultName=$( echo " $deploymentOutputs " | grep -A 3 ' "keY_VAULT_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
362+ if [ -z " $keyvaultName " ]; then
363+ keyvaultName=$( echo " $deploymentOutputs " | grep -A 3 ' "keyVaultName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
364+ fi
365+ sqlServerName=$( echo " $deploymentOutputs " | grep -A 3 ' "sqlDb_SERVER_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
366+ if [ -z " $sqlServerName " ]; then
367+ sqlServerName=$( echo " $deploymentOutputs " | grep -A 3 ' "sqlDbServerName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
368+ fi
369+ webAppManagedIdentityDisplayName=$( echo " $deploymentOutputs " | grep -A 3 ' "managedidentitY_WEBAPP_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
370+ if [ -z " $webAppManagedIdentityDisplayName " ]; then
371+ webAppManagedIdentityDisplayName=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentityWebAppName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
372+ fi
373+ webAppManagedIdentityClientId=$( echo " $deploymentOutputs " | grep -A 3 ' "managedidentitY_WEBAPP_CLIENTID"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
374+ if [ -z " $webAppManagedIdentityClientId " ]; then
375+ webAppManagedIdentityClientId=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentityWebAppClientId"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
376+ fi
377+ SqlDatabaseName=$( echo " $deploymentOutputs " | grep -A 3 ' "sqlDb_DATABASE"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
378+ if [ -z " $SqlDatabaseName " ]; then
379+ SqlDatabaseName=$( echo " $deploymentOutputs " | grep -A 3 ' "sqlDbDatabase"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
380+ fi
381+ sqlManagedIdentityClientId=$( echo " $deploymentOutputs " | grep -A 3 ' "managedidentitY_SQL_CLIENTID"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
382+ if [ -z " $sqlManagedIdentityClientId " ]; then
383+ sqlManagedIdentityClientId=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentitySqlClientId"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
384+ fi
385+ sqlManagedIdentityDisplayName=$( echo " $deploymentOutputs " | grep -A 3 ' "managedidentitY_SQL_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
386+ if [ -z " $sqlManagedIdentityDisplayName " ]; then
387+ sqlManagedIdentityDisplayName=$( echo " $deploymentOutputs " | grep -A 3 ' "managedIdentitySqlName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
388+ fi
389+ aiSearchName=$( echo " $deploymentOutputs " | grep -A 3 ' "aI_SEARCH_SERVICE_NAME"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
390+ if [ -z " $aiSearchName " ]; then
391+ aiSearchName=$( echo " $deploymentOutputs " | grep -A 3 ' "aiSearchServiceName"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
392+ fi
393+ aif_resource_id=$( echo " $deploymentOutputs " | grep -A 3 ' "aI_FOUNDRY_RESOURCE_ID"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
394+ if [ -z " $aif_resource_id " ]; then
395+ aif_resource_id=$( echo " $deploymentOutputs " | grep -A 3 ' "aiFoundryResourceId"' | grep ' "value"' | sed ' s/.*"value": *"\([^"]*\)".*/\1/' )
396+ fi
361397
362398 # Validate that we extracted all required values
363399 if [ -z " $cosmosDbAccountName " ] || [ -z " $storageAccount " ] || [ -z " $fileSystem " ] || [ -z " $keyvaultName " ] || [ -z " $sqlServerName " ] || [ -z " $SqlDatabaseName " ] || [ -z " $sqlManagedIdentityClientId " ] || [ -z " $sqlManagedIdentityDisplayName " ] || [ -z " $aiSearchName " ] || [ -z " $aif_resource_id " ]; then
0 commit comments