From 815b2d4bd630fa3dc0f8c81c3b55e1d261b36155 Mon Sep 17 00:00:00 2001
From: "segev.elmalech" <segev.elmalech@imperva.com>
Date: Thu, 20 Jul 2023 11:19:38 +0300
Subject: [PATCH 1/2] fix elif [skip actions]

---
 .github/workflows/terraform_apply_cli_dam_poc.yml | 2 +-
 .github/workflows/terraform_dsf_poc_cli.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/terraform_apply_cli_dam_poc.yml b/.github/workflows/terraform_apply_cli_dam_poc.yml
index 1d1d4dcaa..594a31be6 100644
--- a/.github/workflows/terraform_apply_cli_dam_poc.yml
+++ b/.github/workflows/terraform_apply_cli_dam_poc.yml
@@ -196,7 +196,7 @@ jobs:
       run: |
         if [ ${{ env.REF }} == 'master' ]; then
           curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} Prod ${{ inputs.workspace }} automation Failed*\n<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Please check the job!>\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#dsfkit-prod"}' ${{ secrets.SLACK_WEBHOOK_URL }}
-        if [ ${{ env.REF }} == 'dev' ]; then
+        elif [ ${{ env.REF }} == 'dev' ]; then
           curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} dev ${{ inputs.workspace }} automation Failed*\n<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Please check the job!>\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#edsf_automation"}' ${{ secrets.SLACK_WEBHOOK_URL }}
         else
           curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} private branch ${{ inputs.workspace }} automation Failed*\n<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Please check the job!>\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#edsf_automation"}' ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/terraform_dsf_poc_cli.yml b/.github/workflows/terraform_dsf_poc_cli.yml
index aad70c4e4..684f03cad 100644
--- a/.github/workflows/terraform_dsf_poc_cli.yml
+++ b/.github/workflows/terraform_dsf_poc_cli.yml
@@ -171,7 +171,7 @@ jobs:
       run: |
         if [ ${{ env.REF }} == 'master' ]; then
           curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} Prod ${{ inputs.workspace }} automation Failed*\n<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Please check the job!>\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#dsfkit-prod"}' ${{ secrets.SLACK_WEBHOOK_URL }}
-        if [ ${{ env.REF }} == 'dev' ]; then
+        elif [ ${{ env.REF }} == 'dev' ]; then
           curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} dev ${{ inputs.workspace }} automation Failed*\n<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Please check the job!>\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#edsf_automation"}' ${{ secrets.SLACK_WEBHOOK_URL }}
         else
           curl -X POST -H 'Content-type: application/json' --data '{"text":":exclamation: :exclamation: :exclamation:\n*${{ matrix.name }} private branch ${{ inputs.workspace }} automation Failed*\n<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Please check the job!>\nRun by: ${{ steps.check-trigger.outputs.run-by }}", "channel": "#edsf_automation"}' ${{ secrets.SLACK_WEBHOOK_URL }}

From da5f0e76c8687a2cf3c4b25c2782c1be2f9f1236 Mon Sep 17 00:00:00 2001
From: "segev.elmalech" <segev.elmalech@imperva.com>
Date: Thu, 20 Jul 2023 11:57:53 +0300
Subject: [PATCH 2/2] add timeout to mx readiness, remove destroy in dam on
 failure [skip actions]

---
 .github/workflows/terraform_apply_cli_dam_poc.yml | 2 +-
 modules/aws/mx/main.tf                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/terraform_apply_cli_dam_poc.yml b/.github/workflows/terraform_apply_cli_dam_poc.yml
index 594a31be6..547c44108 100644
--- a/.github/workflows/terraform_apply_cli_dam_poc.yml
+++ b/.github/workflows/terraform_apply_cli_dam_poc.yml
@@ -168,7 +168,7 @@ jobs:
 
     - name: Terraform Destroy
       id: destroy
-      if: always()
+#      if: always()
       run: terraform -chdir=$EXAMPLE_DIR destroy -var license=license.mprv -auto-approve
 
     - name: Terraform Delete Workspace
diff --git a/modules/aws/mx/main.tf b/modules/aws/mx/main.tf
index 43f56fe6d..8d873067f 100644
--- a/modules/aws/mx/main.tf
+++ b/modules/aws/mx/main.tf
@@ -62,7 +62,7 @@ locals {
   ]
 
   https_auth_header = base64encode("admin:${var.mx_password}")
-  timeout           = 60 * 30
+  timeout           = 60 * 60
 
   readiness_commands = templatefile("${path.module}/readiness.tftpl", {
     mx_address        = local.mx_address_for_api