fix e2e tests

Author: jaredfholgate

.github/tests/scripts/generate-matrix.ps1

@@ -8,14 +8,14 @@ $combinations = [ordered]@{
     infrastructureAsCode = @("bicep")
     agentType            = @("public", "private", "none")
     operatingSystem      = @("ubuntu")
-    starterModule        = @("platform_landing_zone")
+    starterModule        = @("test")
     regions              = @("multi")
     terraformVersion     = @("latest")
     deployAzureResources = @("true")
   }
   azuredevops_bicep_classic                = [ordered]@{
     versionControlSystem = @("azuredevops")
-    infrastructureAsCode = @("bicep")
+    infrastructureAsCode = @("bicep-classic")
     agentType            = @("public", "private", "none")
     operatingSystem      = @("ubuntu")
     starterModule        = @("test")
@@ -28,7 +28,7 @@ $combinations = [ordered]@{
     infrastructureAsCode = @("bicep")
     agentType            = @("public", "private", "none")
     operatingSystem      = @("ubuntu")
-    starterModule        = @("platform_landing_zone")
+    starterModule        = @("test")
     regions              = @("multi")
     terraformVersion     = @("latest")
     deployAzureResources = @("true")
@@ -117,7 +117,7 @@ $combinations = [ordered]@{
     versionControlSystem = @("local")
     infrastructureAsCode = @("bicep-classic")
     agentType            = @("none")
-    operatingSystem      = @("ubuntu", "windows", "macos")
+    operatingSystem      = @("ubuntu")
     starterModule        = @("complete")
     regions              = @("multi")
     terraformVersion     = @("latest")

modules/file_manipulation/locals.bicep.tf

@@ -28,6 +28,7 @@ locals {
     primary_location                = try(local.bicep_parameters.LOCATION_PRIMARY, "eastus")
     secondary_location              = try(local.bicep_parameters.LOCATION_SECONDARY, "westus")
     root_parent_management_group_id = var.root_parent_management_group_id
+    unique_postfix                  = local.resource_names.unique_postfix
   }
 }
 

modules/resource_names/locals.tf

@@ -12,7 +12,7 @@ locals {
   formatted_postfix_number_plus_2 = format("%03d", var.postfix_number + 2)
   formatted_postfix_number_plus_3 = format("%03d", var.postfix_number + 3)
   random_string                   = random_string.alz.result
-  resource_names = {
+  resource_names = merge({
     for key, value in var.resource_names : key => replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(replace(value,
       "{{service_name}}", var.service_name),
       "{{service_name_short}}", substr(var.service_name, 0, 3)),
@@ -25,5 +25,7 @@ locals {
       "{{postfix_number_plus_2}}", local.formatted_postfix_number_plus_2),
       "{{postfix_number_plus_3}}", local.formatted_postfix_number_plus_3),
     "{{random_string}}", local.random_string)
-  }
+    }, {
+    "unique_postfix" = local.random_string
+  })
 }