Skip to content

Commit

Permalink
Merge pull request #424 from imperva/addingmajorversion4.16
Browse files Browse the repository at this point in the history
adding sonar major version 4.16
  • Loading branch information
jagdeep-sonar authored Oct 28, 2024
2 parents ec03d1f + 22eab18 commit 58f0fed
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dsf_poc_cli_azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar_upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,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 }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ This guide references the following information and links, some of which are ava
</tr>
<tr>
<td>
<a href="https://docs.imperva.com/bundle/z-kb-articles-km/page/0006d074.html">Sonar v4.14</a>
<a href="https://docs.imperva.com/bundle/z-kb-articles-km/page/0006d074.html">Sonar v4.16</a>
<a href="https://docs.imperva.com/bundle/z-kb-articles-km/page/7c2caf7d.html">DAM v14.15</a>
Expand Down Expand Up @@ -713,7 +713,7 @@ This includes the following version of the DSF sub-products:
</td>
</tr>
<tr>
<td>Sonar</td><td>4.14.0.10</td><td>4.9 and up
<td>Sonar</td><td>4.16.0.20</td><td>4.9 and up
Restrictions on modules may apply</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/poc/dsf_deployment/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/poc/sonar_basic_deployment/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/poc/sonar_hadr_deployment/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion examples/azure/poc/dsf_deployment/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
3 changes: 3 additions & 0 deletions modules/aws/core/globals/main.tf
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 58f0fed

Please sign in to comment.