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 <[email protected]> Co-authored-by: Or Yesharim <[email protected]> Co-authored-by: jagdeep-sonar <[email protected]>
imperva · Nov 12, 2024 · 88399f3 · 88399f3
1 parent 5ee5a3e
commit 88399f3
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 25 deletions.
diff --git 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
@@ -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
@@ -110,11 +110,11 @@ 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>
+   <a href="https://docs.imperva.com/bundle/z-kb-articles-km/page/7dc4b166.html">DAM v14.16</a>
 
-   <a href="https://docs.imperva.com/bundle/z-kb-articles-km/page/92a5dbc3.html">DRA v4.15</a>
+   <a href="https://docs.imperva.com/bundle/z-kb-articles-km/page/02e3d1fc.html">DRA v4.16</a>
    </td>
    <td>DSF Components Overview
    </td>
@@ -531,6 +531,15 @@ The following table lists the _latest_ eDSF Kit releases, their release date and
       Improvements and bug fixes.
     </td>
   </tr>
+    <tr>
+    <td>TBD
+    </td>
+    <td>1.7.20
+    </td>
+    <td>
+      Added support for DSF version 4.16/14.16
+    </td>
+  </tr>
   
 </table>
 
@@ -722,18 +731,18 @@ 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>
   <tr>
-    <td>DAM</td><td>14.15.1.10</td><td>14.11.1.10 and up
+    <td>DAM</td><td>14.16.1.10</td><td>14.11.1.10 and up
 
 14.7.x.y (LTS)
 
   </tr>
   <tr>
-    <td>DRA</td><td>4.15.0.10</td><td>4.11.0.10 and up</td>
+    <td>DRA</td><td>4.16.0.10</td><td>4.11.0.10 and up</td>
   </tr>
 </table>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {