[EC-68] Replace terraform.sh with tf commands (#823)

pagopa · Jan 9, 2024 · 636a53e · 636a53e
1 parent 5fca76d
commit 636a53e
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 10 deletions.
diff --git a/.github/workflows/ioweb_prod_cd.yml b/.github/workflows/ioweb_prod_cd.yml
@@ -121,15 +121,32 @@ jobs:
           terraform_version: ${{ needs.terraform_plan_job.outputs.terraform_version }}
           terraform_wrapper: true
 
+      - name: Terraform init common
+        id: terraform_init_common
+        shell: bash
+        working-directory: ${{ env.DIR }}-common
+        env:
+          AZURE_ENVIRONMENT: prod
+        run: |
+          bash ./terraform.sh init ${{ env.AZURE_ENVIRONMENT }}
+
       - name: Terraform apply common
         id: terraform_apply_common
         shell: bash
         working-directory: ${{ env.DIR }}-common
         env:
           AZURE_ENVIRONMENT: prod
         run: |
-          bash ./terraform.sh apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
-          rm -rf tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+          terraform apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+
+      - name: Terraform init weu-prod01
+        id: terraform_init_weu-prod01
+        shell: bash
+        working-directory: ${{ env.DIR }}-app
+        env:
+          AZURE_ENVIRONMENT: weu-prod01
+        run: |
+          bash ./terraform.sh init ${{ env.AZURE_ENVIRONMENT }}
 
       - name: Terraform apply weu-prod01
         id: terraform_apply_weu-prod01
@@ -138,5 +155,4 @@ jobs:
         env:
           AZURE_ENVIRONMENT: weu-prod01
         run: |
-          bash ./terraform.sh apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
-          rm -rf tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+          terraform apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
diff --git a/.github/workflows/prod_cd_citizen-auth.yml b/.github/workflows/prod_cd_citizen-auth.yml
@@ -137,15 +137,32 @@ jobs:
           terraform_version: ${{ needs.terraform_plan_job.outputs.terraform_version }}
           terraform_wrapper: true
 
+      - name: Terraform init common
+        id: terraform_init_common
+        shell: bash
+        working-directory: ${{ env.DIR }}-common
+        env:
+          AZURE_ENVIRONMENT: prod
+        run: |
+          bash ./terraform.sh init ${{ env.AZURE_ENVIRONMENT }}
+
       - name: Terraform apply common
         id: terraform_apply_common
         shell: bash
         working-directory: ${{ env.DIR }}-common
         env:
           AZURE_ENVIRONMENT: prod
         run: |
-          bash ./terraform.sh apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
-          rm -rf tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+          terraform apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+
+      - name: Terraform init weu-beta
+        id: terraform_init_weu-beta
+        shell: bash
+        working-directory: ${{ env.DIR }}-app
+        env:
+          AZURE_ENVIRONMENT: weu-beta
+        run: |
+          bash ./terraform.sh init ${{ env.AZURE_ENVIRONMENT }}
 
       - name: Terraform apply weu-beta
         id: terraform_apply_weu-beta
@@ -154,8 +171,16 @@ jobs:
         env:
           AZURE_ENVIRONMENT: weu-beta
         run: |
-          bash ./terraform.sh apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
-          rm -rf tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+          terraform apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+
+      - name: Terraform init weu-prod01
+        id: terraform_init_weu-prod01
+        shell: bash
+        working-directory: ${{ env.DIR }}-app
+        env:
+          AZURE_ENVIRONMENT: weu-prod01
+        run: |
+          bash ./terraform.sh init ${{ env.AZURE_ENVIRONMENT }}
 
       - name: Terraform apply weu-prod01
         id: terraform_apply_weu-prod01
@@ -164,5 +189,4 @@ jobs:
         env:
           AZURE_ENVIRONMENT: weu-prod01
         run: |
-          bash ./terraform.sh apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
-          rm -rf tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}
+          terraform apply -lock-timeout=3000s -auto-approve -input=false tfplan-${{ env.AZURE_ENVIRONMENT }}-${{ github.sha }}