From b4dae12d9b5ad3f697fc80c8b04073f6ae5f77cc Mon Sep 17 00:00:00 2001 From: Roi Klorin Date: Mon, 14 Oct 2024 15:25:28 +0300 Subject: [PATCH] added the update for dsf single account cli --- .github/workflows/dsf_poc_cli.yml | 4 ++-- .github/workflows/dsf_single_account_cli.yml | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dsf_poc_cli.yml b/.github/workflows/dsf_poc_cli.yml index ce0600384..12238f7f6 100644 --- a/.github/workflows/dsf_poc_cli.yml +++ b/.github/workflows/dsf_poc_cli.yml @@ -12,7 +12,7 @@ on: additional_tags: required: true type: string - default: '{"OwnerEmail": "ex1", "ManagerEmail": "ex2", "TeamEmail": "ex3", "Description": "ex4", "Environment": "ex5", "DataClassification": "ex6"}' + default: '{"OwnerEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "ManagerEmail": "gabi.beyo@thalesgroup.com", "TeamEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "Description": "DSFKit_Tests", "Environment": "Test", "DataClassification": "Internal"}' secrets: AWS_ACCESS_KEY_ID: required: true @@ -38,7 +38,7 @@ on: additional_tags: required: true type: string - default: '{"OwnerEmail": "ex1", "ManagerEmail": "ex2", "TeamEmail": "ex3", "Description": "ex4", "Environment": "ex5", "DataClassification": "ex6"}' + default: '{"OwnerEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "ManagerEmail": "gabi.beyo@thalesgroup.com", "TeamEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "Description": "DSFKit_Tests", "Environment": "Test", "DataClassification": "Internal"}' push: diff --git a/.github/workflows/dsf_single_account_cli.yml b/.github/workflows/dsf_single_account_cli.yml index c5a5246d4..525fd21d9 100644 --- a/.github/workflows/dsf_single_account_cli.yml +++ b/.github/workflows/dsf_single_account_cli.yml @@ -9,6 +9,10 @@ on: branch: required: true type: string + additional_tags: + required: true + type: string + default: '{"OwnerEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "ManagerEmail": "gabi.beyo@thalesgroup.com", "TeamEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "Description": "DSFKit_Tests", "Environment": "Test", "DataClassification": "Internal"}' secrets: AWS_ACCESS_KEY_ID: required: true @@ -35,6 +39,11 @@ on: type: boolean default: false required: false + additional_tags: + required: true + type: string + default: '{"OwnerEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "ManagerEmail": "gabi.beyo@thalesgroup.com", "TeamEmail": "ww.dis.imperva.pd_datasec_technology_office@thalesgroup.com", "Description": "DSFKit_Tests", "Environment": "Test", "DataClassification": "Internal"}' + push: branches: @@ -80,6 +89,7 @@ env: JUMP_SERVER_KEY: ${{ secrets.JUMP_SERVER_KEY }} AWS_KEY_PATH: "jump_server_key.cer" DESTROY_DELAY_SECONDS: 1800 + TF_VAR_additional_tags: ${{ inputs.additional_tags }} permissions: contents: read @@ -209,10 +219,10 @@ jobs: # Generates an execution plan for Terraform - name: Terraform Plan - run: terraform -chdir=$EXAMPLE_DIR plan + run: terraform -chdir=$EXAMPLE_DIR plan -var additional_tags='${{ env.TF_VAR_additional_tags }}' - name: Terraform Apply - run: terraform -chdir=$EXAMPLE_DIR apply -auto-approve + run: terraform -chdir=$EXAMPLE_DIR apply -var additional_tags='${{ env.TF_VAR_additional_tags }}' -auto-approve - name: Terraform Output if: always()