fixing gha tf scenario deployment yaml

Azure · Oct 22, 2024 · dbc4967 · dbc4967
1 parent 34f1a75
commit dbc4967
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/.github/workflows/scenario1.terraform.yml b/.github/workflows/scenario1.terraform.yml
@@ -57,31 +57,17 @@ jobs:
       backendStateKey: ${{ env.backendStateKey }}
       tfvarPath: ${{ env.tfvarPath }}
 
-  terraform-deploy-hub:
-    name: 'Terraform CICD (Hub Multi-tenant Secure Baseline)'
+  terraform-deploy:
+    name: 'Terraform CICD (Hub & Spoke Multi-tenant Secure Baseline)'
     needs: 
     - prepare-environment
     uses: ./.github/workflows/.template.terraform.yml
     with:
-      modulePath: ${{ needs.prepare-environment.outputs.modulePath }}/hub
+      modulePath: ${{ needs.prepare-environment.outputs.modulePath }}
       terraformVersion: ${{ needs.prepare-environment.outputs.terraformVersion }}
       backendStateKey: 'scenario1.hub.tfstate'
       tfvarPath: ${{ needs.prepare-environment.outputs.tfvarPath }}
       # Ensure this value is a boolean
       destroy: ${{ github.event.inputs.destroy == 'true' }}
     secrets: inherit
 
-  terraform-deploy-spoke:
-    name: 'Terraform CICD (Spoke Multi-tenant Secure Baseline)'
-    needs: 
-    - prepare-environment
-    - terraform-deploy-hub
-    uses: ./.github/workflows/.template.terraform.yml
-    with:
-      modulePath: ${{ needs.prepare-environment.outputs.modulePath }}/spoke
-      terraformVersion: ${{ needs.prepare-environment.outputs.terraformVersion }}
-      backendStateKey: 'scenario1.spoke.tfstate'
-      tfvarPath: ${{ needs.prepare-environment.outputs.tfvarPath }}
-      # Ensure this value is a boolean
-      destroy: ${{ github.event.inputs.destroy == 'true' }}
-    secrets: inherit