Fix tf plan show issue

Azure · Oct 23, 2024 · 5483953 · 5483953
1 parent 1441e84
commit 5483953
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/alz/azuredevops/pipelines/terraform/templates/cd-template.yaml b/alz/azuredevops/pipelines/terraform/templates/cd-template.yaml
@@ -58,7 +58,11 @@ stages:
                     targetPath: '$(Build.ArtifactsStagingDirectory)'
                     artifact: 'module'
                     publishLocation: 'pipeline'
-                - pwsh: terraform show tfplan
+                - pwsh: |
+                    terraform `
+                    -chdir="$${{ parameters.root_module_folder_relative_path }}" `
+                    show `
+                    tfplan
                   displayName: Show the Plan for Review
   - stage: apply
     displayName: Apply

diff --git a/alz/github/actions/terraform/templates/workflows/cd-template.yaml b/alz/github/actions/terraform/templates/workflows/cd-template.yaml
@@ -52,7 +52,7 @@ jobs:
         run: |
           # shellcheck disable=SC2086
           terraform \
-          -chdir="$${inputs.root_module_folder_relative_path}}" \
+          
           plan \
           -out=tfplan \
           -input=false \
@@ -73,7 +73,10 @@ jobs:
           path: ./staging/
 
       - name: Show the Plan for Review
-        run: terraform show tfplan
+        run: terraform \
+          -chdir="$${inputs.root_module_folder_relative_path}}" \
+          show \
+          tfplan
 
   apply:
     needs: plan