From ebf7439d8e490b7029af77bfb2362af7957ad8bc Mon Sep 17 00:00:00 2001
From: "linda.nasredin" <linda.nasredin@imperva.com>
Date: Sun, 28 Apr 2024 19:41:21 +0300
Subject: [PATCH] Optionally delay destroy in github actions to allow
 investigation time

---
 .github/workflows/sonar_poc_cli.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/sonar_poc_cli.yml b/.github/workflows/sonar_poc_cli.yml
index 65130eee2..99cbd480d 100644
--- a/.github/workflows/sonar_poc_cli.yml
+++ b/.github/workflows/sonar_poc_cli.yml
@@ -66,16 +66,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - test_name: Sonar Basic CLI
-            test_name_safe: sonar_basic_cli
-            workspace: basic_cli-${{ github.run_number }}-${{ github.run_attempt }}
+          - name: Sonar Basic CLI
+            workspace: sonar_basic_cli-${{ github.run_number }}-${{ github.run_attempt }}
             example_dir: ./examples/aws/poc/sonar_basic_deployment
             aws_region: eu-west-2
             hub_output: '.dsf_hub.value.public_dns'
             gw_output: '.dsf_agentless_gw.value."agentless-gw-0".private_ip'
           - name: Sonar HADR CLI
-            test_name_safe: sonar_hadr_cli
-            workspace: hadr_cli-${{ github.run_number }}-${{ github.run_attempt }}
+            workspace: sonar_hadr_cli-${{ github.run_number }}-${{ github.run_attempt }}
             example_dir: ./examples/aws/poc/sonar_hadr_deployment
             aws_region: eu-west-1
             hub_output: '.dsf_hubs.value.main.public_dns'
@@ -84,7 +82,6 @@ jobs:
     name: 'Terraform ${{ matrix.workspace }}'
     runs-on: ubuntu-latest
     env:
-      TEST_NAME_SAFE: ${{ matrix.test_name_safe }}
       EXAMPLE_DIR: ${{ matrix.example_dir }}
       TF_WORKSPACE: ${{ matrix.workspace }}
       AWS_REGION: ${{ matrix.aws_region }}
@@ -172,9 +169,9 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: collected-keys-${{ env.TEST_NAME_SAFE }}
+        name: collected-keys-${{ env.TF_WORKSPACE }}
         path: |
-          ${{ env.EXAMPLE_DIR }}/main.tf
+          ${{ env.EXAMPLE_DIR }}/ssh_keys
 
     - name: Set Environment Variables
       run: |