fix: Added a fallback to post-deployment scripts to derive resource values from solution-suffix naming when deployment outputs are missing

infra/main.bicep

@@ -223,6 +223,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2025-04-01' = {
       Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
       CreatedBy: createdBy
       DeploymentName: deployment().name
+      SolutionSuffix: solutionSuffix
       UseCase: usecase
       ...tags
     }

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.39.26.7824",
-      "templateHash": "9953647735934078307"
+      "templateHash": "8647245938852742232"
     }
   },
   "parameters": {
@@ -423,7 +423,7 @@
       "apiVersion": "2025-04-01",
       "name": "default",
       "properties": {
-        "tags": "[shallowMerge(createArray(resourceGroup().tags, createObject('TemplateName', 'KM-Generic', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name, 'UseCase', parameters('usecase')), parameters('tags')))]"
+        "tags": "[shallowMerge(createArray(resourceGroup().tags, createObject('TemplateName', 'KM-Generic', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name, 'SolutionSuffix', variables('solutionSuffix'), 'UseCase', parameters('usecase')), parameters('tags')))]"
       }
     },
     "avmTelemetry": {
@@ -27515,8 +27515,8 @@
         }
       },
       "dependsOn": [
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "backendUserAssignedIdentity",
         "logAnalyticsWorkspace",
@@ -30040,9 +30040,9 @@
         }
       },
       "dependsOn": [
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "logAnalyticsWorkspace",
         "userAssignedIdentity",
         "virtualNetwork"
@@ -40351,10 +40351,10 @@
         }
       },
       "dependsOn": [
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageDfs)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
         "userAssignedIdentity",
         "virtualNetwork"
       ]

infra/scripts/process_custom_data.sh

@@ -348,18 +348,145 @@ get_values_from_azd_env() {
 	return 0
 }
 
+# Fallback function to get values using solutionSuffix from resource group tags
+get_values_from_solution_suffix() {
+    echo ""
+    echo "==============================================="
+    echo "Attempting fallback method using solutionSuffix"
+    echo "==============================================="
+
+    # Get solutionSuffix from resource group tags
+    local solutionSuffix=$(az group show --name "$resourceGroupName" --query "tags.SolutionSuffix" -o tsv 2>/dev/null)
+
+    if [ -z "$solutionSuffix" ] || [ "$solutionSuffix" = "null" ]; then
+        echo "✗ Could not retrieve solutionSuffix from resource group tags"
+        return 1
+    fi
+
+    echo "✓ Found solutionSuffix: $solutionSuffix"
+    echo ""
+    echo "Generating resource names using naming conventions..."
+
+    # Generate resource names based on naming convention from main.bicep
+    storageAccountName="st${solutionSuffix}"
+    sqlServerName="sql-${solutionSuffix}"
+    SqlDatabaseName="sqldb-${solutionSuffix}"
+    aiSearchName="srch-${solutionSuffix}"
+    backendUserMidDisplayName="id-backend-${solutionSuffix}"
+
+    # Hardcoded values from bicep, if changed in bicep, must be changed here too
+    fileSystem="data"
+    deploymentModel="gpt-4o-mini"
+    embeddingModel="text-embedding-ada-002"
+    cuApiVersion="2024-12-01-preview"
+
+    echo "✓ Storage Account Name: $storageAccountName"
+    echo "✓ Storage Container Name: $fileSystem"
+    echo "✓ SQL Server Name: $sqlServerName"
+    echo "✓ SQL Database Name: $SqlDatabaseName"
+    echo "✓ AI Search Service Name: $aiSearchName"
+    echo "✓ Backend Managed Identity Name: $backendUserMidDisplayName"
+    echo "✓ Deployment Model (default): $deploymentModel"
+    echo "✓ Embedding Model (default): $embeddingModel"
+    echo "✓ CU API Version (default): $cuApiVersion"
+    echo ""
+
+    # Fetch Backend Managed Identity Client ID (needed for operations)
+    echo "Fetching Backend Managed Identity Client ID..."
+    backendUserMidClientId=$(az identity show \
+        --name "$backendUserMidDisplayName" \
+        --resource-group "$resourceGroupName" \
+        --query "clientId" -o tsv 2>/dev/null)
+
+    if [ -z "$backendUserMidClientId" ] || [ "$backendUserMidClientId" = "null" ]; then
+        echo "  ✗ Failed to fetch Backend Managed Identity Client ID"
+        return 1
+    fi
+    echo "  ✓ Client ID: $backendUserMidClientId"
+
+    # Generate AI Search endpoint
+    searchEndpoint="https://${aiSearchName}.search.windows.net"
+    echo "  ✓ Search Endpoint: $searchEndpoint"
+
+    # Fetch AI Foundry Resource ID and OpenAI Endpoint
+    echo "Fetching AI Foundry details..."
+    local aif_name="aif-${solutionSuffix}"
+    local aif_details=$(az cognitiveservices account show \
+        --name "$aif_name" \
+        --resource-group "$resourceGroupName" \
+        --query "{id:id, endpoint:properties.endpoint}" -o tsv 2>/dev/null)
+
+    if [ -z "$aif_details" ]; then
+        echo "  ✗ Failed to fetch AI Foundry details"
+        return 1
+    fi
+
+    # Extract values using awk (tab-separated)
+    aif_resource_id=$(echo "$aif_details" | awk '{print $1}')
+    openaiEndpoint=$(echo "$aif_details" | awk '{print $2}')
+
+    # Ensure openaiEndpoint ends with /
+    [[ "$openaiEndpoint" != */ ]] && openaiEndpoint="${openaiEndpoint}/"
+
+    echo "  ✓ AI Foundry Resource ID: $aif_resource_id"
+    echo "  ✓ OpenAI Endpoint: $openaiEndpoint"
+
+    # Generate AI Agent Endpoint
+    local project_name="proj-${solutionSuffix}"
+    aiAgentEndpoint="https://${aif_name}.services.ai.azure.com/api/projects/${project_name}"
+    echo "  ✓ AI Agent Endpoint: $aiAgentEndpoint"
+
+    # Fetch Content Understanding Foundry Resource ID and Endpoint
+    echo "Fetching Content Understanding Foundry details..."
+    local cu_name="aisa-${solutionSuffix}-cu"
+    local cu_details=$(az cognitiveservices account show \
+        --name "$cu_name" \
+        --resource-group "$resourceGroupName" \
+        --query "{id:id, endpoint:properties.endpoint}" -o tsv 2>/dev/null)
+
+    if [ -z "$cu_details" ]; then
+        echo "  ✗ Failed to fetch Content Understanding details"
+        return 1
+    fi
+
+    # Extract values using awk (tab-separated)
+    cu_foundry_resource_id=$(echo "$cu_details" | awk '{print $1}')
+    cuEndpoint=$(echo "$cu_details" | awk '{print $2}')
+
+    echo "  ✓ CU Foundry Resource ID: $cu_foundry_resource_id"
+    echo "  ✓ CU Endpoint: $cuEndpoint"
+
+    echo ""
+    echo "✓ Successfully retrieved all values using solutionSuffix fallback method"
+    return 0
+}
+
 get_values_from_az_deployment() {
 	echo "Getting values from Azure deployment outputs..."
 
-    deploymentName=$(az group show --name "$resourceGroupName" --query "tags.DeploymentName" -o tsv)
-    echo "Deployment Name (from tag): $deploymentName"
+    deploymentName=$(az group show --name "$resourceGroupName" --query "tags.DeploymentName" -o tsv 2>/dev/null)
+
+	if [ -z "$deploymentName" ] || [ "$deploymentName" = "null" ]; then
+        echo "⚠ Deployment name not found in resource group tags. Deployment may have been deleted."
+        return 1
+    fi
+
+	echo "Deployment Name (from tag): $deploymentName"
 
     echo "Fetching deployment outputs..."
 	# Get all outputs
     deploymentOutputs=$(az deployment group show \
         --name "$deploymentName" \
         --resource-group "$resourceGroupName" \
-        --query "properties.outputs" -o json)
+        --query "properties.outputs" -o json 2>&1)
+
+    deployment_exit_code=$?
+
+	# Check if command failed (deployment not found)
+    if [ $deployment_exit_code -ne 0 ]; then
+        echo "⚠ Deployment '$deploymentName' not found or could not be accessed. It may have been deleted."
+        return 1
+    fi
 
 	# Helper function to extract value from deployment outputs
 	# Usage: extract_value "primaryKey" "fallbackKey"
@@ -506,24 +633,23 @@ if [ -z "$resourceGroupName" ]; then
         exit 1
     fi
 else
-    # Resource group provided - use deployment outputs
+    # Resource group provided - use deployment outputs with fallback to solutionSuffix method
 	echo ""
     echo "Resource group provided: $resourceGroupName"
 
-    # Call deployment function
+    # Try deployment outputs first
     if ! get_values_from_az_deployment; then
-        echo "Failed to get values from deployment outputs."
+        echo ""
+		echo "Deployment outputs method failed."
+		echo "Attempting fallback method using resource group tags and naming conventions..."
 		echo ""
-		echo "Would you like to enter the values manually? (y/n): "
-		read -r manual_input_choice
-		if [[ "$manual_input_choice" == "y" || "$manual_input_choice" == "Y" ]]; then
-			if ! get_values_from_user; then
-				echo "Error: Manual input failed."
-				exit 1
-			fi
-		else
-			echo "Exiting script."
-			exit 1
+
+		# Try fallback method
+        if ! get_values_from_solution_suffix; then
+		    echo ""
+		    echo "Fallback method also failed."
+		    echo "Exiting script."
+		    exit 1
 		fi
 	fi
 fi