From 3b8e91205bec48b3e911e480ba586bdf2a569aa0 Mon Sep 17 00:00:00 2001 From: Merav Chajaj Date: Mon, 3 Feb 2025 12:49:29 +0200 Subject: [PATCH 1/3] DGW-13922 updating dam gw version to 15 --- .../aws/installation/dsf_single_account_deployment/variables.tf | 2 +- examples/aws/poc/dsf_deployment/variables.tf | 2 +- examples/azure/poc/dsf_deployment/variables.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf index ad5dda16..6110b363 100644 --- a/examples/aws/installation/dsf_single_account_deployment/variables.tf +++ b/examples/aws/installation/dsf_single_account_deployment/variables.tf @@ -455,7 +455,7 @@ variable "sonar_machine_base_directory" { variable "dam_version" { type = string description = "The DAM version to install" - default = "14.17.1.10" + default = "15.0.1.10" validation { condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf index 98236a09..ef3f0314 100644 --- a/examples/aws/poc/dsf_deployment/variables.tf +++ b/examples/aws/poc/dsf_deployment/variables.tf @@ -123,7 +123,7 @@ variable "subnet_ids" { variable "dam_version" { type = string description = "The DAM version to install" - default = "14.17.1.10" + default = "15.0.1.10" validation { condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" diff --git a/examples/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index 07d4c886..9a3e9286 100644 --- a/examples/azure/poc/dsf_deployment/variables.tf +++ b/examples/azure/poc/dsf_deployment/variables.tf @@ -118,7 +118,7 @@ variable "subnet_ids" { variable "dam_version" { type = string description = "The DAM version to install" - default = "14.17.1.10" + default = "15.0.1.10" validation { condition = can(regex("^(\\d{1,2}\\.){3}\\d{1,3}$", var.dam_version)) error_message = "Version must be in the format dd.dd.dd.dd where each dd is a number between 1-99 (e.g 14.10.1.10)" From 63288dd9b82a0c4d0b10de7515fe8328b48af626 Mon Sep 17 00:00:00 2001 From: Roi Klorin Date: Wed, 5 Feb 2025 13:04:55 +0200 Subject: [PATCH 2/3] increased destroy delay to 7,200 secs removed the cond that delays destruction only upon failure --- .github/workflows/dsf_poc_cli.yml | 3 +-- .github/workflows/dsf_poc_cli_azure.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dsf_poc_cli.yml b/.github/workflows/dsf_poc_cli.yml index 330b10f5..805b5e01 100644 --- a/.github/workflows/dsf_poc_cli.yml +++ b/.github/workflows/dsf_poc_cli.yml @@ -64,7 +64,7 @@ env: TF_INPUT: 0 AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - DESTROY_DELAY_SECONDS: 1800 + DESTROY_DELAY_SECONDS: 7200 TF_VAR_additional_tags: ${{ secrets.DEPLOYMENT_TAGS }} permissions: @@ -242,7 +242,6 @@ jobs: # This step allows time for investigation of the failed resources before destroying them - name: Conditional Delay - if: ${{ failure() }} run: | echo "delay_destroy: ${{ inputs.delay_destroy }}" if [ "${{ inputs.delay_destroy }}" == "true" ]; then diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index e145b761..de6a20bd 100644 --- a/.github/workflows/dsf_poc_cli_azure.yml +++ b/.github/workflows/dsf_poc_cli_azure.yml @@ -60,7 +60,7 @@ env: ARM_CLIENT_ID: ${{ vars.ARM_CLIENT_ID }} ARM_TENANT_ID: ${{ vars.ARM_TENANT_ID }} ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} - DESTROY_DELAY_SECONDS: 1800 + DESTROY_DELAY_SECONDS: 7200 permissions: contents: read @@ -263,7 +263,6 @@ jobs: # This step allows time for investigation of the failed resources before destroying them - name: Conditional Delay - if: ${{ failure() }} run: | echo "delay_destroy: ${{ inputs.delay_destroy }}" if [ "${{ inputs.delay_destroy }}" == "true" ]; then From 65aff41408fd2d5f8d42d7287b514a7fa569142a Mon Sep 17 00:00:00 2001 From: Roi Klorin Date: Wed, 5 Feb 2025 13:15:49 +0200 Subject: [PATCH 3/3] undo change --- .github/workflows/dsf_poc_cli.yml | 3 ++- .github/workflows/dsf_poc_cli_azure.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dsf_poc_cli.yml b/.github/workflows/dsf_poc_cli.yml index 805b5e01..3e34a22d 100644 --- a/.github/workflows/dsf_poc_cli.yml +++ b/.github/workflows/dsf_poc_cli.yml @@ -64,7 +64,7 @@ env: TF_INPUT: 0 AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - DESTROY_DELAY_SECONDS: 7200 + DESTROY_DELAY_SECONDS: 1800 TF_VAR_additional_tags: ${{ secrets.DEPLOYMENT_TAGS }} permissions: @@ -242,6 +242,7 @@ jobs: # This step allows time for investigation of the failed resources before destroying them - name: Conditional Delay + if: failure() run: | echo "delay_destroy: ${{ inputs.delay_destroy }}" if [ "${{ inputs.delay_destroy }}" == "true" ]; then diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index de6a20bd..e145b761 100644 --- a/.github/workflows/dsf_poc_cli_azure.yml +++ b/.github/workflows/dsf_poc_cli_azure.yml @@ -60,7 +60,7 @@ env: ARM_CLIENT_ID: ${{ vars.ARM_CLIENT_ID }} ARM_TENANT_ID: ${{ vars.ARM_TENANT_ID }} ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} - DESTROY_DELAY_SECONDS: 7200 + DESTROY_DELAY_SECONDS: 1800 permissions: contents: read @@ -263,6 +263,7 @@ jobs: # This step allows time for investigation of the failed resources before destroying them - name: Conditional Delay + if: ${{ failure() }} run: | echo "delay_destroy: ${{ inputs.delay_destroy }}" if [ "${{ inputs.delay_destroy }}" == "true" ]; then