From 88399f30e43f4b2bd7834d351c4e4a990d36d65c Mon Sep 17 00:00:00 2001 From: Eytan Naim <80354890+eytannnaim@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:36:44 +0200 Subject: [PATCH] dsfkit 4.16 (#446) Added support for DSF 4.16 * Added DRA version v4.16.0.10 * Added DAM version 14.16.1.10 * Added Sonar version 4.16.0.20.0 --------- Co-authored-by: idan.nof Co-authored-by: Or Yesharim Co-authored-by: jagdeep-sonar --- .github/workflows/dsf_poc_cli_azure.yml | 6 +++--- .github/workflows/sonar_upgrade.yml | 4 ++-- README.md | 21 +++++++++++++------ .../variables.tf | 6 +++--- .../variables.tf | 2 +- .../variables.tf | 2 +- examples/aws/poc/dsf_deployment/variables.tf | 6 +++--- .../poc/sonar_basic_deployment/variables.tf | 2 +- .../poc/sonar_hadr_deployment/variables.tf | 2 +- .../azure/poc/dsf_deployment/variables.tf | 4 ++-- modules/aws/core/globals/main.tf | 6 ++++++ modules/aws/dra-admin/variables.tf | 2 +- modules/aws/dra-analytics/variables.tf | 2 +- 13 files changed, 40 insertions(+), 25 deletions(-) diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index ee6dba30d..c8aa09e4e 100644 --- a/.github/workflows/dsf_poc_cli_azure.yml +++ b/.github/workflows/dsf_poc_cli_azure.yml @@ -155,7 +155,7 @@ jobs: az_resource_group = "dsf-rg" az_storage_account = "dsfinstallation" az_container = "sonar" - az_blob = "jsonar-4.15.0.10.0.tar.gz" + az_blob = "jsonar-4.16.0.20.0.tar.gz" } dam_agent_installation_location = { az_resource_group = "dsf-rg" @@ -167,12 +167,12 @@ jobs: dra_admin_vhd_details = { storage_account_name = "dsfinstallation" container_name = "dra" - path_to_vhd = "DRA-4.15.0.11.0.12_30650_x86_64-Admin.vhd" + path_to_vhd = "DRA-4.16.0.10.0.119_30763_x86_64-Admin.vhd" } dra_analytics_vhd_details = { storage_account_name = "dsfinstallation" container_name = "dra" - path_to_vhd = "DRA-4.15.0.11.0.12_30650_x86_64-Analytics.vhd" + path_to_vhd = "DRA-4.16.0.10.0.119_30763_x86_64-Analytics.vhd" } EOF diff --git a/.github/workflows/sonar_upgrade.yml b/.github/workflows/sonar_upgrade.yml index b6ff8e8f7..82744a56d 100644 --- a/.github/workflows/sonar_upgrade.yml +++ b/.github/workflows/sonar_upgrade.yml @@ -61,11 +61,11 @@ jobs: DEPLOYMENT_EXAMPLE_DIR: ./examples/aws/poc/dsf_deployment UPGRADE_EXAMPLE_DIR: ./examples/aws/sonar_upgrade AWS_REGION: eu-west-2 - SONAR_TARGET_VERSION: 4.15.0.10.0 + SONAR_TARGET_VERSION: 4.16.0.20.0 TF_VAR_enable_sonar: ${{ matrix.enable_sonar }} TF_VAR_enable_dam: ${{ matrix.enable_dam }} TF_VAR_enable_dra: ${{ matrix.enable_dra }} - TF_VAR_sonar_version: 4.13.0.10 + TF_VAR_sonar_version: 4.14.0.20 TF_VAR_hub_hadr: ${{ matrix.hub_hadr }} TF_VAR_agentless_gw_hadr: ${{ matrix.agentless_gw_hadr }} TF_VAR_simulation_db_types_for_agentless: ${{ matrix.simulation_db_types_for_agentless }} diff --git a/README.md b/README.md index f90fb3e1e..00453f00c 100644 --- a/README.md +++ b/README.md @@ -110,11 +110,11 @@ This guide references the following information and links, some of which are ava - Sonar v4.14 + Sonar v4.16 - DAM v14.15 + DAM v14.16 - DRA v4.15 + DRA v4.16 DSF Components Overview @@ -531,6 +531,15 @@ The following table lists the _latest_ eDSF Kit releases, their release date and Improvements and bug fixes. + + TBD + + 1.7.20 + + + Added support for DSF version 4.16/14.16 + + @@ -722,18 +731,18 @@ This includes the following version of the DSF sub-products: - Sonar4.14.0.104.9 and up + Sonar4.16.0.204.9 and up Restrictions on modules may apply - DAM14.15.1.1014.11.1.10 and up + DAM14.16.1.1014.11.1.10 and up 14.7.x.y (LTS) - DRA4.15.0.104.11.0.10 and up + DRA4.16.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 9da9da082..bb9d17b4d 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.15" + default = "4.16" 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.") @@ -455,7 +455,7 @@ variable "sonar_machine_base_directory" { variable "dam_version" { type = string description = "The DAM version to install" - default = "14.15.1.10" + default = "14.16.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)" @@ -572,7 +572,7 @@ variable "cluster_name" { variable "dra_version" { type = string - default = "4.15" + default = "4.16" 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/examples/aws/installation/sonar_multi_account_deployment/variables.tf b/examples/aws/installation/sonar_multi_account_deployment/variables.tf index c8ba2255a..223f7be5a 100644 --- a/examples/aws/installation/sonar_multi_account_deployment/variables.tf +++ b/examples/aws/installation/sonar_multi_account_deployment/variables.tf @@ -12,7 +12,7 @@ variable "deployment_name" { variable "sonar_version" { type = string - default = "4.15" + default = "4.16" 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/installation/sonar_single_account_deployment/variables.tf b/examples/aws/installation/sonar_single_account_deployment/variables.tf index df86781bb..f205c72ad 100644 --- a/examples/aws/installation/sonar_single_account_deployment/variables.tf +++ b/examples/aws/installation/sonar_single_account_deployment/variables.tf @@ -22,7 +22,7 @@ variable "aws_region" { variable "sonar_version" { type = string - default = "4.15" + default = "4.16" 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 93a56fb08..632e1a1a8 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.15.1.10" + default = "14.16.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)" @@ -214,7 +214,7 @@ variable "dam_agent_installation_location" { variable "sonar_version" { type = string - default = "4.15" + default = "4.16" 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.") @@ -307,7 +307,7 @@ variable "simulation_db_types_for_agentless" { variable "dra_version" { type = string - default = "4.15" + default = "4.16" 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/examples/aws/poc/sonar_basic_deployment/variables.tf b/examples/aws/poc/sonar_basic_deployment/variables.tf index 91c732c3e..0b756b926 100644 --- a/examples/aws/poc/sonar_basic_deployment/variables.tf +++ b/examples/aws/poc/sonar_basic_deployment/variables.tf @@ -12,7 +12,7 @@ variable "deployment_name" { variable "sonar_version" { type = string - default = "4.15" + default = "4.16" 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/sonar_hadr_deployment/variables.tf b/examples/aws/poc/sonar_hadr_deployment/variables.tf index 7ac8bd376..5107852b9 100644 --- a/examples/aws/poc/sonar_hadr_deployment/variables.tf +++ b/examples/aws/poc/sonar_hadr_deployment/variables.tf @@ -12,7 +12,7 @@ variable "deployment_name" { variable "sonar_version" { type = string - default = "4.15" + default = "4.16" 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/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index a25f7e403..91bcd4cd9 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.15.1.10" + default = "14.16.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)" @@ -176,7 +176,7 @@ variable "simulation_db_types_for_agent" { variable "sonar_version" { type = string - default = "4.15" + default = "4.16" 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/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf index 96911a286..1e0f94ccb 100644 --- a/modules/aws/core/globals/main.tf +++ b/modules/aws/core/globals/main.tf @@ -1,5 +1,8 @@ locals { sonar_tarball_s3_key_map = { + "4.16" = "jsonar-4.16.0.20.0.tar.gz" + "4.16.0.20" = "jsonar-4.16.0.20.0.tar.gz" + "4.15" = "jsonar-4.15.0.20.0.tar.gz" "4.15.0.20" = "jsonar-4.15.0.20.0.tar.gz" "4.15.0.10" = "jsonar-4.15.0.10.0.tar.gz" @@ -39,6 +42,9 @@ locals { locals { dra_version_map = { + "4.16" = "4.16.0.10.0.119", + "4.16.0.10" = "4.16.0.10.0.119", + "4.15" = "4.15.0.11.0.12", "4.15.0.11" = "4.15.0.11.0.12", diff --git a/modules/aws/dra-admin/variables.tf b/modules/aws/dra-admin/variables.tf index ef700c7a4..221ffeb91 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.15" + default = "4.16" 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 d370a9701..8c6c99222 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.15" + default = "4.16" 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 {