feat: adding child platform management groups (#67)

* feat: adding child platform management groups * terraform fmt * Skip alz module version check in e2e tests * Add missing flag * Fix GitHub deprecated task versions --------- Co-authored-by: sdeguchi <[email protected]> Co-authored-by: Jared Holgate <[email protected]>
Azure · Jan 23, 2025 · b07866a · b07866a
1 parent c4fe147
commit b07866a
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 243 deletions.
diff --git a/.github/tests/scripts/destroy.ps1 b/.github/tests/scripts/destroy.ps1
@@ -28,7 +28,7 @@ do {
         if($infrastructureAsCode -eq "terraform") { 
           $starterModuleOverrideFolderPath = "$starterModuleOverrideFolderPath/templates"
         }
-        Deploy-Accelerator -output "$($env:TARGET_FOLDER)" -inputs "./inputs.json" -bootstrapModuleOverrideFolderPath "$($env:BOOTSTRAP_MODULE_FOLDER)" -starterModuleOverrideFolderPath $starterModuleOverrideFolderPath -starterRelease "$($env.ALZ_ON_DEMAND_FOLDER_RELEASE_TAG)" -autoApprove -destroy -ErrorAction Stop
+        Deploy-Accelerator -output "$($env:TARGET_FOLDER)" -inputs "./inputs.json" -bootstrapModuleOverrideFolderPath "$($env:BOOTSTRAP_MODULE_FOLDER)" -starterModuleOverrideFolderPath $starterModuleOverrideFolderPath -starterRelease "$($env.ALZ_ON_DEMAND_FOLDER_RELEASE_TAG)" -autoApprove -skipAlzModuleVersionRequirementsCheck -destroy -ErrorAction Stop
         if ($LastExitCode -eq 0) {
             $success = $true
         } else {

diff --git a/.github/workflows/end-to-end-test.yml b/.github/workflows/end-to-end-test.yml
@@ -294,7 +294,7 @@ jobs:
               if($infrastructureAsCode -eq "terraform") {
                 $starterModuleOverrideFolderPath = "$starterModuleOverrideFolderPath/templates"
               }
-              Deploy-Accelerator -output "${{ env.TARGET_FOLDER }}" -inputs "./inputs.json" -bootstrapModuleOverrideFolderPath "${{ env.BOOTSTRAP_MODULE_FOLDER }}" -starterModuleOverrideFolderPath $starterModuleOverrideFolderPath -starterRelease "${{ env.ALZ_ON_DEMAND_FOLDER_RELEASE_TAG }}" -autoApprove -ErrorAction Stop -Verbose
+              Deploy-Accelerator -output "${{ env.TARGET_FOLDER }}" -inputs "./inputs.json" -bootstrapModuleOverrideFolderPath "${{ env.BOOTSTRAP_MODULE_FOLDER }}" -starterModuleOverrideFolderPath $starterModuleOverrideFolderPath -starterRelease "${{ env.ALZ_ON_DEMAND_FOLDER_RELEASE_TAG }}" -autoApprove -skipAlzModuleVersionRequirementsCheck -ErrorAction Stop -Verbose
 
               if ($LastExitCode -eq 0) {
                 $success = $true

diff --git a/alz/github/actions/terraform/templates/workflows/cd-template.yaml b/alz/github/actions/terraform/templates/workflows/cd-template.yaml
@@ -73,7 +73,7 @@ jobs:
         shell: pwsh
 
       - name: Publish Module Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: module
           path: ./staging/
@@ -105,7 +105,7 @@ jobs:
 
     steps:
       - name: Download a Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: module
 

diff --git a/modules/template_architecture_definition/locals.tf b/modules/template_architecture_definition/locals.tf
diff --git a/modules/template_architecture_definition/templates/architecture_definition.json.tftpl b/modules/template_architecture_definition/templates/architecture_definition.json.tftpl
@@ -0,0 +1,13 @@
+{
+  "name": "${architecture_definition_name}",
+  "management_groups": [
+    %{ for management_group in management_groups }{
+      "archetypes": ${management_group.archetypes},
+      "display_name": ${management_group.display_name},
+      "id": ${management_group.id},
+      "exists": ${management_group.exists},
+      "parent_id": ${management_group.parent_id}
+    }%{ if management_group != management_groups[length(management_groups) - 1] && length(management_groups) != 0},
+    %{ endif }%{ endfor }
+  ]
+}
diff --git a/...les/template_architecture_definition/templates/fsi.alz_architecture_definition.json.tftpl b/...les/template_architecture_definition/templates/fsi.alz_architecture_definition.json.tftpl
diff --git a/...les/template_architecture_definition/templates/slz.alz_architecture_definition.json.tftpl b/...les/template_architecture_definition/templates/slz.alz_architecture_definition.json.tftpl