diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index c8aa09e4..44ad8cbf 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.16.0.20.0.tar.gz" + az_blob = "jsonar-4.17.0.20.0.tar.gz" } dam_agent_installation_location = { az_resource_group = "dsf-rg" diff --git a/.github/workflows/sonar_upgrade.yml b/.github/workflows/sonar_upgrade.yml index 82744a56..342a8082 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.16.0.20.0 + SONAR_TARGET_VERSION: 4.17.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.14.0.20 + TF_VAR_sonar_version: 4.15.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 00453f00..846ffac0 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ This guide references the following information and links, some of which are ava - Sonar v4.16 + Sonar v4.17 DAM v14.16 @@ -731,7 +731,7 @@ This includes the following version of the DSF sub-products: - Sonar4.16.0.204.9 and up + Sonar4.17.0.204.9 and up Restrictions on modules may apply diff --git a/examples/aws/installation/dsf_single_account_deployment/variables.tf b/examples/aws/installation/dsf_single_account_deployment/variables.tf index bb9d17b4..1225b01c 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.16" + 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/installation/sonar_multi_account_deployment/variables.tf b/examples/aws/installation/sonar_multi_account_deployment/variables.tf index 223f7be5..f91a511b 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.16" + 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/installation/sonar_single_account_deployment/variables.tf b/examples/aws/installation/sonar_single_account_deployment/variables.tf index f205c72a..accb5cf2 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.16" + 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 632e1a1a..b896a253 100644 --- a/examples/aws/poc/dsf_deployment/variables.tf +++ b/examples/aws/poc/dsf_deployment/variables.tf @@ -214,7 +214,7 @@ variable "dam_agent_installation_location" { variable "sonar_version" { type = string - default = "4.16" + 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/sonar_basic_deployment/variables.tf b/examples/aws/poc/sonar_basic_deployment/variables.tf index 0b756b92..6d645562 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.16" + 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/sonar_hadr_deployment/variables.tf b/examples/aws/poc/sonar_hadr_deployment/variables.tf index 5107852b..32375274 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.16" + 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/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index 91bcd4cd..0cfc244c 100644 --- a/examples/azure/poc/dsf_deployment/variables.tf +++ b/examples/azure/poc/dsf_deployment/variables.tf @@ -176,7 +176,7 @@ variable "simulation_db_types_for_agent" { variable "sonar_version" { type = string - default = "4.16" + 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/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf index 1e0f94cc..91d986c9 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.17" = "jsonar-4.17.0.20.0.tar.gz" + "4.17.0.20" = "jsonar-4.17.0.20.0.tar.gz" + "4.16" = "jsonar-4.16.0.20.0.tar.gz" "4.16.0.20" = "jsonar-4.16.0.20.0.tar.gz"