From da76715276d99b97fe53a309905d3e8d56151a8a Mon Sep 17 00:00:00 2001 From: "idan.nof" Date: Sun, 16 Jun 2024 13:17:52 +0300 Subject: [PATCH] COUN-2749: DSFKit | Add DRA v4.16.0.10 --- .github/workflows/dsf_poc_cli_azure.yml | 4 ++-- README.md | 4 ++-- .../installation/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, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml index ee6dba30d..d7f8f4137 100644 --- a/.github/workflows/dsf_poc_cli_azure.yml +++ b/.github/workflows/dsf_poc_cli_azure.yml @@ -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/README.md b/README.md index ca704842e..4549b9665 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.15 - DRA v4.15 + DRA v4.16 DSF Components Overview @@ -702,7 +702,7 @@ Restrictions on modules may apply - 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 032c245f3..3f82a20f3 100644 --- a/examples/aws/installation/dsf_single_account_deployment/variables.tf +++ b/examples/aws/installation/dsf_single_account_deployment/variables.tf @@ -578,7 +578,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/poc/dsf_deployment/variables.tf b/examples/aws/poc/dsf_deployment/variables.tf index 8e755ae50..1d028ef6d 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.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/modules/aws/core/globals/main.tf b/modules/aws/core/globals/main.tf index 0a73c78f5..03f354b78 100644 --- a/modules/aws/core/globals/main.tf +++ b/modules/aws/core/globals/main.tf @@ -36,6 +36,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 {