From a70ecbeae1c9739a46d9bc5ec23f7340e7371316 Mon Sep 17 00:00:00 2001 From: "idan.nof" Date: Sun, 11 May 2025 16:51:25 +0300 Subject: [PATCH 1/2] COUN-3109: DSFKit | Add DRA v4.18.0.10 --- .github/workflows/dsf_poc_cli_azure.yml | 4 ++-- README.md | 13 +++++++++++-- .../dsf_single_account_deployment/variables.tf | 2 +- examples/aws/poc/dsf_deployment/variables.tf | 2 +- modules/aws/core/globals/main.tf | 3 +++ modules/aws/dra-admin/variables.tf | 2 +- modules/aws/dra-analytics/variables.tf | 2 +- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index 048f65ea0..ab92e0d0f 100644 --- a/.github/workflows/dsf_poc_cli_azure.yml +++ b/.github/workflows/dsf_poc_cli_azure.yml @@ -188,8 +188,8 @@ jobs: PATH_TO_DRA_ANALYTICS_VHD="DRA-${{ github.event.inputs.product_full_version }}_x86_64-Analytics.vhd" PATH_TO_DRA_ADMIN_VHD="DRA-${{ github.event.inputs.product_full_version }}_x86_64-Admin.vhd" else - PATH_TO_DRA_ANALYTICS_VHD="DRA-4.17.0.10.0.6_31077_x86_64-Analytics.vhd" - PATH_TO_DRA_ADMIN_VHD="DRA-4.17.0.10.0.6_31077_x86_64-Admin.vhd" + PATH_TO_DRA_ANALYTICS_VHD="DRA-4.18.0.10.0.12_31582_x86_64-Analytics.vhd" + PATH_TO_DRA_ADMIN_VHD="DRA-4.18.0.10.0.12_31582_x86_64-Admin.vhd" fi if [ "${{ github.event.inputs.deployment_type }}" == "sonar" ] && [ "${{ github.event.inputs.product_full_version }}" != "latest" ] && [ -n "${{ github.event.inputs.product_full_version }}" ]; then diff --git a/README.md b/README.md index 6c603a74b..bd31dfadc 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ This guide references the following information and links, some of which are ava DAM v14.17 - DRA v4.17 + DRA v4.18 DSF Components Overview @@ -576,6 +576,15 @@ The following table lists the _latest_ DSF Kit releases, their release date and Improvements and bug fixes + + TBD + + 1.7.29 + + + Added support for DRA version 4.18.0.10 + + @@ -778,7 +787,7 @@ Restrictions on modules may apply - DRA4.17.0.104.11.0.10 and up + DRA4.18.0.104.11.0.10 and up diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf index ad5dda16a..17be8eaf8 100644 --- a/examples/aws/installation/dsf_single_account_deployment/variables.tf +++ b/examples/aws/installation/dsf_single_account_deployment/variables.tf @@ -227,7 +227,7 @@ variable "dra_analytics_key_pair" { variable "sonar_version" { type = string - default = "4.17" + default = "4.18" description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch." validation { condition = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.") diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf index 98236a090..ea3886b64 100644 --- a/examples/aws/poc/dsf_deployment/variables.tf +++ b/examples/aws/poc/dsf_deployment/variables.tf @@ -307,7 +307,7 @@ variable "simulation_db_types_for_agentless" { variable "dra_version" { type = string - default = "4.17" + default = "4.18" description = "The DRA version to install. Supported versions are 4.11.0.10 and up. Both long and short version formats are supported, for example, 4.11.0.10 or 4.11. The short format maps to the latest patch." validation { condition = !startswith(var.dra_version, "4.10.") && !startswith(var.dra_version, "4.9.") && !startswith(var.dra_version, "4.8.") && !startswith(var.dra_version, "4.3.") && !startswith(var.dra_version, "4.2.") && !startswith(var.dra_version, "4.1.") diff --git a/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf index 6561d4979..df3f8c0ab 100644 --- a/modules/aws/core/globals/main.tf +++ b/modules/aws/core/globals/main.tf @@ -45,6 +45,9 @@ locals { locals { dra_version_map = { + "4.18" = "4.18.0.10.0.12", + "4.18.0.10" = "4.18.0.10.0.12", + "4.17" = "4.17.0.10.0.6", "4.17.0.10" = "4.17.0.10.0.6", diff --git a/modules/aws/dra-admin/variables.tf b/modules/aws/dra-admin/variables.tf index cfae03e97..48c11a3a3 100644 --- a/modules/aws/dra-admin/variables.tf +++ b/modules/aws/dra-admin/variables.tf @@ -31,7 +31,7 @@ variable "key_pair" { variable "dra_version" { type = string - default = "4.17" + default = "4.18" description = "The DRA version to install. Supported versions are 4.11.0.10.0.7 and up. Full version format is supported, for example, 4.11.0.10.0.7." nullable = false validation { diff --git a/modules/aws/dra-analytics/variables.tf b/modules/aws/dra-analytics/variables.tf index 60b38e17f..c2c4e2c99 100644 --- a/modules/aws/dra-analytics/variables.tf +++ b/modules/aws/dra-analytics/variables.tf @@ -86,7 +86,7 @@ variable "archiver_user" { variable "dra_version" { type = string - default = "4.17" + default = "4.18" description = "The DRA version to install. Supported versions are 4.11.0.10.0.7 and up. Full version format is supported, for example, 4.11.0.10.0.7." nullable = false validation { From 9587d04c0706784d8cb03ad3d591d483303f5ed0 Mon Sep 17 00:00:00 2001 From: "idan.nof" Date: Sun, 11 May 2025 18:35:09 +0300 Subject: [PATCH 2/2] COUN-3109: DSFKit | Add DRA v4.18.0.10 to adhere to the new "internal" dsfkit release procedure: - revert variables.tf changes - adjust readme --- README.md | 4 ++-- .../installation/dsf_single_account_deployment/variables.tf | 2 +- examples/aws/poc/dsf_deployment/variables.tf | 2 +- modules/aws/dra-admin/variables.tf | 2 +- modules/aws/dra-analytics/variables.tf | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bd31dfadc..af2e1b367 100644 --- a/README.md +++ b/README.md @@ -582,7 +582,7 @@ The following table lists the _latest_ DSF Kit releases, their release date and 1.7.29 - Added support for DRA version 4.18.0.10 + Added internal support for DRA version 4.18. Set the variable ‘dra_version’ to 4.18 to use it. @@ -787,7 +787,7 @@ Restrictions on modules may apply - DRA4.18.0.104.11.0.10 and up + DRA4.17.0.104.11.0.10 - 4.18.0.10 diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf index 17be8eaf8..ad5dda16a 100644 --- a/examples/aws/installation/dsf_single_account_deployment/variables.tf +++ b/examples/aws/installation/dsf_single_account_deployment/variables.tf @@ -227,7 +227,7 @@ variable "dra_analytics_key_pair" { variable "sonar_version" { type = string - default = "4.18" + default = "4.17" description = "The Sonar version to install. Supported versions are: 4.11 and up. Both long and short version formats are supported, for example, 4.12.0.10 or 4.12. The short format maps to the latest patch." validation { condition = !startswith(var.sonar_version, "4.9.") && !startswith(var.sonar_version, "4.10.") diff --git a/examples/aws/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf index ea3886b64..98236a090 100644 --- a/examples/aws/poc/dsf_deployment/variables.tf +++ b/examples/aws/poc/dsf_deployment/variables.tf @@ -307,7 +307,7 @@ variable "simulation_db_types_for_agentless" { variable "dra_version" { type = string - default = "4.18" + default = "4.17" description = "The DRA version to install. Supported versions are 4.11.0.10 and up. Both long and short version formats are supported, for example, 4.11.0.10 or 4.11. The short format maps to the latest patch." validation { condition = !startswith(var.dra_version, "4.10.") && !startswith(var.dra_version, "4.9.") && !startswith(var.dra_version, "4.8.") && !startswith(var.dra_version, "4.3.") && !startswith(var.dra_version, "4.2.") && !startswith(var.dra_version, "4.1.") diff --git a/modules/aws/dra-admin/variables.tf b/modules/aws/dra-admin/variables.tf index 48c11a3a3..cfae03e97 100644 --- a/modules/aws/dra-admin/variables.tf +++ b/modules/aws/dra-admin/variables.tf @@ -31,7 +31,7 @@ variable "key_pair" { variable "dra_version" { type = string - default = "4.18" + default = "4.17" description = "The DRA version to install. Supported versions are 4.11.0.10.0.7 and up. Full version format is supported, for example, 4.11.0.10.0.7." nullable = false validation { diff --git a/modules/aws/dra-analytics/variables.tf b/modules/aws/dra-analytics/variables.tf index c2c4e2c99..60b38e17f 100644 --- a/modules/aws/dra-analytics/variables.tf +++ b/modules/aws/dra-analytics/variables.tf @@ -86,7 +86,7 @@ variable "archiver_user" { variable "dra_version" { type = string - default = "4.18" + default = "4.17" description = "The DRA version to install. Supported versions are 4.11.0.10.0.7 and up. Full version format is supported, for example, 4.11.0.10.0.7." nullable = false validation {