Fix: Filter out empty FQDNs for Traffic Manager endpoints in Bicep, improve deployment robustness

Author: srnichols

AzureArchitecture/main.bicep

@@ -1,3 +1,11 @@
+// Filter out regional endpoints with empty FQDNs for Traffic Manager
+var filteredRegionalEndpoints = [
+  for (region, index) in regions: {
+    fqdn: regionalLayers[index].outputs.regionalEndpointFqdn
+    location: region.regionName
+  }
+  if !empty(regionalLayers[index].outputs.regionalEndpointFqdn)
+]
 
 // Azure Stamps Pattern - Main Orchestration Template
 //
@@ -354,11 +362,16 @@ module globalLayer './globalLayer.bicep' = {
     enableGlobalCosmos: !isSmoke
     // Pass APIM gateway URL for Front Door configuration
     apimGatewayUrl: geodesLayer.outputs.apimGatewayUrl
-    // Pass regional Application Gateway endpoints for Traffic Manager
+    // Pass regional Application Gateway endpoints for Traffic Manager, filtering out empty FQDNs
     regionalEndpoints: [for (region, index) in regions: {
       fqdn: regionalLayers[index].outputs.regionalEndpointFqdn
       location: region.regionName
-    }]
+    } if !empty(regionalLayers[index].outputs.regionalEndpointFqdn)]
+// Filter out regional endpoints with empty FQDNs for Traffic Manager
+var filteredRegionalEndpoints = [for (region, index) in regions: {
+  fqdn: regionalLayers[index].outputs.regionalEndpointFqdn
+  location: region.regionName
+} if (!empty(regionalLayers[index].outputs.regionalEndpointFqdn))]
   }
   dependsOn: [
     geodesLayer

AzureArchitecture/regionalLayer.bicep

@@ -323,7 +323,9 @@ resource publicIp 'Microsoft.Network/publicIPAddresses@2022-05-01' existing = {
 output regionalEndpointIpAddress string = publicIp.properties.ipAddress
 
 // Output the regional public IP FQDN for use in Front Door origins and Traffic Manager endpoints
-output regionalEndpointFqdn string = publicIp.properties.dnsSettings.fqdn
+// Output the regional public IP FQDN for use in Front Door origins and Traffic Manager endpoints
+// If dnsSettings is missing, output an empty string
+output regionalEndpointFqdn string = contains(publicIp.properties, 'dnsSettings') && contains(publicIp.properties.dnsSettings, 'fqdn') ? publicIp.properties.dnsSettings.fqdn : ''
 
 // Output the Automation Account resource ID for integration or runbook assignment
 output automationAccountId string = enableAutomation ? automationAccount.id : ''

docs/TWO_STEP_DEPLOYMENT_GUIDE.md

@@ -7,13 +7,12 @@ This guide outlines the recommended two-step process for deploying the Stamps Pa
 ## Step 1: Deploy Core Infrastructure
 
 1. **Automated Step 1: Deploy and Extract Outputs**
-    - Run the `single-sub-deployment-step1.ps1` PowerShell script located in the `AzureArchitecture` folder to deploy `AzureArchitecture/main.bicep` and automatically extract the outputs needed for the management portal deployment.
+   - Run the `single-sub-deployment-step1.ps1` PowerShell script from the `scripts` folder to deploy `AzureArchitecture/main.bicep` and automatically extract the outputs needed for the management portal deployment.
     - This script provisions all resource groups, core assets, and the management portal resource group, then writes the required outputs to `management-portal.parameters.json`.
-    - Example usage:
-       ```pwsh
-       cd AzureArchitecture
-       pwsh ./single-sub-deployment-step1.ps1
-       ```
+   - Example usage:
+      ```pwsh
+      pwsh ./scripts/single-sub-deployment-step1.ps1
+      ```
 
    - The script will:
      - Deploy the Bicep template using `main.parameters.json`.

management-portal/src/Portal/Services/AzureInfrastructureService.cs

@@ -32,12 +32,26 @@ public static ResourceGroupType Classify(string rgName)
         {
             if (string.IsNullOrWhiteSpace(rgName)) return ResourceGroupType.Other;
             var name = rgName.ToLowerInvariant();
-            if (System.Text.RegularExpressions.Regex.IsMatch(name, @"^rg-.*cell.*", System.Text.RegularExpressions.RegexOptions.IgnoreCase))
+            
+            // Specific stamps pattern filtering rules
+            // CELL RGs = only show RGs that contain "stamps-cell" in name
+            if (name.Contains("stamps-cell"))
+            {
                 return ResourceGroupType.Cell;
-            if (System.Text.RegularExpressions.Regex.IsMatch(name, @"^rg-.*region.*", System.Text.RegularExpressions.RegexOptions.IgnoreCase))
+            }
+            
+            // Regional RGs = only show RGs that contain "stamps-region" in name
+            if (name.Contains("stamps-region"))
+            {
                 return ResourceGroupType.Regional;
-            if (System.Text.RegularExpressions.Regex.IsMatch(name, @"^rg-.*global.*", System.Text.RegularExpressions.RegexOptions.IgnoreCase))
+            }
+            
+            // Global RGs = only show RGs that contain "stamps-management" or "stamps-global" in name
+            if (name.Contains("stamps-management") || name.Contains("stamps-global"))
+            {
                 return ResourceGroupType.Global;
+            }
+            
             return ResourceGroupType.Other;
         }
     }