Merge branch 'dev' of https://github.com/imperva/dsfkit into terrafor…

…m-1_7_0-linda
imperva · Jan 24, 2024 · 0ef41aa · 0ef41aa
2 parents c86944d + a646e74
commit 0ef41aa
Show file tree

Hide file tree

Showing 73 changed files with 321 additions and 305 deletions.
diff --git a/.github/workflows/deploy_module.yml b/.github/workflows/deploy_module.yml
@@ -116,16 +116,15 @@ jobs:
             hidden_submodules: "aws/statistics null/statistics"
             begin_tag: 1.0.0
 
-            # todo - hadar add when deploying dra
-#          ## azurerm provider
-#          - source_module: "azurerm/dra-admin"
-#            destination_repo: "terraform-azurerm-dsf-dra-admin"
-#            hidden_submodules: "azurerm/statistics null/statistics"
-#            begin_tag: 1.7.5
-#          - source_module: "azurerm/dra-analytics"
-#            destination_repo: "terraform-azurerm-dsf-dra-analytics"
-#            hidden_submodules: "azurerm/statistics null/statistics"
-#            begin_tag: 1.7.5
+          ## azurerm provider
+          - source_module: "azurerm/dra-admin"
+            destination_repo: "terraform-azurerm-dsf-dra-admin"
+            hidden_submodules: "azurerm/statistics null/statistics"
+            begin_tag: 1.7.6
+          - source_module: "azurerm/dra-analytics"
+            destination_repo: "terraform-azurerm-dsf-dra-analytics"
+            hidden_submodules: "azurerm/statistics null/statistics"
+            begin_tag: 1.7.6
 
           # Globals
           ## aws provider

diff --git a/.github/workflows/dsf_poc_cli_azure.yml b/.github/workflows/dsf_poc_cli_azure.yml
@@ -207,6 +207,7 @@ jobs:
           mv $EXAMPLE_DIR/dam.tf{,_}
           mv $EXAMPLE_DIR/dra.tf{,_}
           mv $EXAMPLE_DIR/agent_sources.tf{,_}
+          mv $EXAMPLE_DIR/agentless_sources.tf{,_}
           mv $EXAMPLE_DIR/networking.tf{,_}
           ls -la $EXAMPLE_DIR
           terraform -chdir=$EXAMPLE_DIR destroy -var dam_license=license.mprv -auto-approve
@@ -216,6 +217,7 @@ jobs:
           mv $EXAMPLE_DIR/dam.tf{_,}
           mv $EXAMPLE_DIR/dra.tf{,_}
           mv $EXAMPLE_DIR/agent_sources.tf{_,}
+          mv $EXAMPLE_DIR/agentless_sources.tf{_,}
           mv $EXAMPLE_DIR/networking.tf{_,}
         fi
 

diff --git a/README.md b/README.md
diff --git a/examples/aws/installation/dsf_single_account_deployment/dam.tf b/examples/aws/installation/dsf_single_account_deployment/dam.tf
@@ -8,7 +8,7 @@ locals {
 
 module "mx" {
   source  = "imperva/dsf-mx/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = var.enable_dam ? 1 : 0
 
   friendly_name                     = join("-", [local.deployment_name_salted, "mx"])
@@ -38,7 +38,7 @@ module "mx" {
 
 module "agent_gw" {
   source  = "imperva/dsf-agent-gw/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = local.agent_gw_count
 
   friendly_name             = join("-", [local.deployment_name_salted, "agent", "gw", count.index])
@@ -68,7 +68,7 @@ module "agent_gw" {
 
 module "agent_gw_cluster_setup" {
   source  = "imperva/dsf-agent-gw-cluster-setup/null"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = local.create_agent_gw_cluster
 
   cluster_name       = var.cluster_name != null ? var.cluster_name : join("-", [local.deployment_name_salted, "agent", "gw", "cluster"])

diff --git a/examples/aws/installation/dsf_single_account_deployment/dra.tf b/examples/aws/installation/dsf_single_account_deployment/dra.tf
@@ -6,7 +6,7 @@ locals {
 
 module "dra_admin" {
   source  = "imperva/dsf-dra-admin/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = var.enable_dra ? 1 : 0
 
   name                        = join("-", [local.deployment_name_salted, "dra", "admin"])
@@ -28,7 +28,7 @@ module "dra_admin" {
 
 module "dra_analytics" {
   source  = "imperva/dsf-dra-analytics/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = local.dra_analytics_count
 
   name                         = join("-", [local.deployment_name_salted, "dra", "analytics", count.index])

diff --git a/...es/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_5.zip b/...es/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_5.zip
diff --git a/...es/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_8.zip b/...es/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_8.zip
diff --git a/examples/aws/installation/dsf_single_account_deployment/main.tf b/examples/aws/installation/dsf_single_account_deployment/main.tf
@@ -1,6 +1,6 @@
 module "globals" {
   source  = "imperva/dsf-globals/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
 
   sonar_version = var.sonar_version
   dra_version   = var.dra_version
@@ -39,7 +39,7 @@ locals {
 module "key_pair_hub_main" {
   count                = var.hub_main_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-hub-main"
   private_key_filename = "ssh_keys/dsf_ssh_key-hub-main-${terraform.workspace}"
   tags                 = local.tags
@@ -51,7 +51,7 @@ module "key_pair_hub_main" {
 module "key_pair_hub_dr" {
   count                = var.hub_dr_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-hub-dr"
   private_key_filename = "ssh_keys/dsf_ssh_key-hub-dr-${terraform.workspace}"
   tags                 = local.tags
@@ -63,7 +63,7 @@ module "key_pair_hub_dr" {
 module "key_pair_agentless_gw_main" {
   count                = var.agentless_gw_main_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-gw-main"
   private_key_filename = "ssh_keys/dsf_ssh_key-agentless-gw-main-${terraform.workspace}"
   tags                 = local.tags
@@ -75,7 +75,7 @@ module "key_pair_agentless_gw_main" {
 module "key_pair_agentless_gw_dr" {
   count                = var.agentless_gw_dr_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-gw-dr"
   private_key_filename = "ssh_keys/dsf_ssh_key-agentless-gw-dr-${terraform.workspace}"
   tags                 = local.tags
@@ -87,7 +87,7 @@ module "key_pair_agentless_gw_dr" {
 module "key_pair_mx" {
   count                = var.mx_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-mx"
   private_key_filename = "ssh_keys/dsf_ssh_key-mx-${terraform.workspace}"
   tags                 = local.tags
@@ -99,7 +99,7 @@ module "key_pair_mx" {
 module "key_pair_agent_gw" {
   count                = var.agent_gw_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-agent-gw"
   private_key_filename = "ssh_keys/dsf_ssh_key-agent-gw-${terraform.workspace}"
   tags                 = local.tags
@@ -111,7 +111,7 @@ module "key_pair_agent_gw" {
 module "key_pair_dra_admin" {
   count                = var.dra_admin_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-dra-admin"
   private_key_filename = "ssh_keys/dsf_ssh_key-dra-admin-${terraform.workspace}"
   tags                 = local.tags
@@ -123,7 +123,7 @@ module "key_pair_dra_admin" {
 module "key_pair_dra_analytics" {
   count                = var.dra_analytics_key_pair == null ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-dra-analytics"
   private_key_filename = "ssh_keys/dsf_ssh_key-dra-analytics-${terraform.workspace}"
   tags                 = local.tags

diff --git a/examples/aws/installation/dsf_single_account_deployment/sonar.tf b/examples/aws/installation/dsf_single_account_deployment/sonar.tf
@@ -12,7 +12,7 @@ locals {
 
 module "hub_main" {
   source  = "imperva/dsf-hub/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = var.enable_sonar ? 1 : 0
 
   friendly_name        = join("-", [local.deployment_name_salted, "hub", "main"])
@@ -67,7 +67,7 @@ module "hub_main" {
 
 module "hub_dr" {
   source  = "imperva/dsf-hub/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = var.enable_sonar && var.hub_hadr ? 1 : 0
 
   friendly_name                = join("-", [local.deployment_name_salted, "hub", "DR"])
@@ -112,7 +112,7 @@ module "hub_dr" {
 
 module "hub_hadr" {
   source  = "imperva/dsf-hadr/null"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = length(module.hub_dr) > 0 ? 1 : 0
 
   sonar_version       = module.globals.tarball_location.version
@@ -137,7 +137,7 @@ module "hub_hadr" {
 
 module "agentless_gw_main" {
   source  = "imperva/dsf-agentless-gw/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = local.agentless_gw_count
 
   friendly_name        = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "main"])
@@ -177,7 +177,7 @@ module "agentless_gw_main" {
 
 module "agentless_gw_dr" {
   source  = "imperva/dsf-agentless-gw/aws"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = var.agentless_gw_hadr ? local.agentless_gw_count : 0
 
   friendly_name                = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "DR"])
@@ -220,7 +220,7 @@ module "agentless_gw_dr" {
 
 module "agentless_gw_hadr" {
   source  = "imperva/dsf-hadr/null"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   count   = length(module.agentless_gw_dr)
 
   sonar_version       = module.globals.tarball_location.version
@@ -266,7 +266,7 @@ locals {
 
 module "federation" {
   source   = "imperva/dsf-federation/null"
-  version  = "1.7.5" # latest release tag
+  version  = "1.7.8" # latest release tag
   for_each = local.hub_gw_combinations
 
   hub_info = {

diff --git a/examples/aws/installation/sonar_multi_account_deployment/main.tf b/examples/aws/installation/sonar_multi_account_deployment/main.tf
@@ -1,6 +1,6 @@
 module "globals" {
   source        = "imperva/dsf-globals/aws"
-  version       = "1.7.5" # latest release tag
+  version       = "1.7.8" # latest release tag
   sonar_version = var.sonar_version
 }
 
@@ -25,7 +25,7 @@ locals {
 module "key_pair_hub_main" {
   count                = local.should_create_hub_main_key_pair ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-hub-main"
   private_key_filename = "ssh_keys/dsf_ssh_key-hub-main-${terraform.workspace}"
   tags                 = local.tags
@@ -37,7 +37,7 @@ module "key_pair_hub_main" {
 module "key_pair_hub_dr" {
   count                = local.should_create_hub_dr_key_pair ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-hub-dr"
   private_key_filename = "ssh_keys/dsf_ssh_key-hub-dr-${terraform.workspace}"
   tags                 = local.tags
@@ -49,7 +49,7 @@ module "key_pair_hub_dr" {
 module "key_pair_gw_main" {
   count                = local.should_create_gw_main_key_pair ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-gw"
   private_key_filename = "ssh_keys/dsf_ssh_key-gw-main-${terraform.workspace}"
   tags                 = local.tags
@@ -61,7 +61,7 @@ module "key_pair_gw_main" {
 module "key_pair_gw_dr" {
   count                = local.should_create_gw_dr_key_pair ? 1 : 0
   source               = "imperva/dsf-globals/aws//modules/key_pair"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   key_name_prefix      = "imperva-dsf-gw-dr"
   private_key_filename = "ssh_keys/dsf_ssh_key-gw-dr-${terraform.workspace}"
   tags                 = local.tags
@@ -106,7 +106,7 @@ locals {
 ##############################
 module "hub_main" {
   source               = "imperva/dsf-hub/aws"
-  version              = "1.7.5" # latest release tag
+  version              = "1.7.8" # latest release tag
   friendly_name        = join("-", [local.deployment_name_salted, "hub", "main"])
   subnet_id            = var.subnet_hub_main
   security_group_ids   = var.security_group_ids_hub_main
@@ -144,7 +144,7 @@ module "hub_main" {
 
 module "hub_dr" {
   source                       = "imperva/dsf-hub/aws"
-  version                      = "1.7.5" # latest release tag
+  version                      = "1.7.8" # latest release tag
   friendly_name                = join("-", [local.deployment_name_salted, "hub", "DR"])
   subnet_id                    = var.subnet_hub_dr
   security_group_ids           = var.security_group_ids_hub_dr
@@ -186,7 +186,7 @@ module "hub_dr" {
 module "agentless_gw_main" {
   count                 = var.gw_count
   source                = "imperva/dsf-agentless-gw/aws"
-  version               = "1.7.5" # latest release tag
+  version               = "1.7.8" # latest release tag
   friendly_name         = join("-", [local.deployment_name_salted, "gw", count.index, "main"])
   subnet_id             = var.subnet_gw_main
   security_group_ids    = var.security_group_ids_gw_main
@@ -225,7 +225,7 @@ module "agentless_gw_main" {
 module "agentless_gw_dr" {
   count                        = var.gw_count
   source                       = "imperva/dsf-agentless-gw/aws"
-  version                      = "1.7.5" # latest release tag
+  version                      = "1.7.8" # latest release tag
   friendly_name                = join("-", [local.deployment_name_salted, "gw", count.index, "DR"])
   subnet_id                    = var.subnet_gw_dr
   security_group_ids           = var.security_group_ids_gw_dr
@@ -266,7 +266,7 @@ module "agentless_gw_dr" {
 
 module "hub_hadr" {
   source              = "imperva/dsf-hadr/null"
-  version             = "1.7.5" # latest release tag
+  version             = "1.7.8" # latest release tag
   sonar_version       = module.globals.tarball_location.version
   dsf_main_ip         = module.hub_main.private_ip
   dsf_main_private_ip = module.hub_main.private_ip
@@ -290,7 +290,7 @@ module "hub_hadr" {
 module "agentless_gw_hadr" {
   count               = var.gw_count
   source              = "imperva/dsf-hadr/null"
-  version             = "1.7.5" # latest release tag
+  version             = "1.7.8" # latest release tag
   sonar_version       = module.globals.tarball_location.version
   dsf_main_ip         = module.agentless_gw_main[count.index].private_ip
   dsf_main_private_ip = module.agentless_gw_main[count.index].private_ip
@@ -324,7 +324,7 @@ locals {
 module "federation" {
   count   = length(local.hub_gws_combinations)
   source  = "imperva/dsf-federation/null"
-  version = "1.7.5" # latest release tag
+  version = "1.7.8" # latest release tag
   gw_info = {
     gw_ip_address            = local.hub_gws_combinations[count.index][1].instance.private_ip
     gw_federation_ip_address = local.hub_gws_combinations[count.index][1].instance.private_ip

diff --git a/.../sonar_multi_account_deployment_1_7_5.zip → .../sonar_multi_account_deployment_1_7_8.zip b/.../sonar_multi_account_deployment_1_7_5.zip → .../sonar_multi_account_deployment_1_7_8.zip