diff --git a/README.md b/README.md index b46aa76b8..a5e0b8eef 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ This guide references the following information and links, some of which are ava - eDSF Kit GitHub Repository + eDSF Kit GitHub Repository @@ -428,7 +428,7 @@ e.g., with or without DRA, the number of Agentless Gateways, with or without HAD We provide several of out-of-the-box Terraform recipes we call "examples" which are already configured to deploy common DSF environments. You can use the example as is, or customize it to accommodate your deployment requirements. -These examples can be found in the eDSF Kit GitHub Repository under the examples directory. +These examples can be found in the eDSF Kit GitHub Repository under the examples directory. Some examples are intended for Lab or POC and others for actual DSF deployments by Professional Services and customers. For more details about each example, click on the example name. @@ -447,73 +447,73 @@ For more details about each example, click on the example name. - Sonar Basic Deployment + Sonar Basic Deployment Lab/POC A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB. - sonar_basic_deployment_1_7_0.zip + sonar_basic_deployment_1_7_1.zip - Sonar HADR Deployment + Sonar HADR Deployment Lab/POC A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB. - sonar_hadr_deployment_1_7_0.zip + sonar_hadr_deployment_1_7_1.zip - Sonar Single Account Deployment + Sonar Single Account Deployment PS/Customer A DSF deployment with a DSF Hub HADR, an Agentless Gateway and federation. The DSF nodes (Hubs and Agentless Gateway) are in the same AWS account and the same region. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_single_account_deployment_1_7_0.zip + sonar_single_account_deployment_1_7_1.zip - Sonar Multi Account Deployment + Sonar Multi Account Deployment PS/Customer A DSF deployment with a DSF Hub, an Agentless Gateway and federation. The DSF nodes (Hub and Agentless Gateway) are in different AWS accounts. It is mandatory to provide as input to this example the subnets to deploy the DSF nodes on. - sonar_multi_account_deployment_1_7_0.zip + sonar_multi_account_deployment_1_7_1.zip - DSF Deployment + DSF Deployment Lab/POC A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources. - dsf_deployment_1_7_0.zip + dsf_deployment_1_7_1.zip - DSF Single Account Deployment + DSF Single Account Deployment PS/Customer A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics). - dsf_single_account_deployment_1_7_0.zip + dsf_single_account_deployment_1_7_1.zip - Sonar Upgrade (Alpha) + Sonar Upgrade (Alpha) All Upgrade of DSF Hub and Agentless Gateway (formerly Sonar). - sonar_upgrade_1_7_0.zip + sonar_upgrade_1_7_1.zip @@ -532,13 +532,13 @@ For more details about each example, click on the example name. - DSF Deployment + DSF Deployment Lab/POC A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation and networking. - dsf_deployment_1_7_0.zip + dsf_deployment_1_7_1.zip @@ -613,7 +613,7 @@ After you have [chosen the deployment mode](#choosing-the-deployment-mode), foll This mode offers a straightforward deployment option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac. This mode makes use of the Terraform Command Line Interface (CLI) to deploy and manage environments. -1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. +1. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: @@ -711,7 +711,7 @@ This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cann 5. In the Network settings panel - make your configurations while keeping in mind that the installer machine should have access to the DSF environment that you want to deploy, and that your computer should have access to the installer machine. -6. In the “Advanced details” panel, copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.7.0/installer_machine/installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox. +6. In the “Advanced details” panel, copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.7.1/installer_machine/installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox. 7. Click on **Launch Instance**. At this stage, the installer machine is initializing and downloading the necessary dependencies. @@ -730,30 +730,30 @@ This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cann For example: `chmode 400 a_key_pair.pem` -9. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. +9. Download the zip file of the example you've chosen (See the [Choosing the Example/Recipe that Fits Your Use Case](#choosing-the-examplerecipe-that-fits-your-use-case) section) from the eDSF Kit GitHub Repository, e.g., if you choose the "sonar_basic_deployment" example, you should download sonar_basic_deployment.zip. Run: ```bash - wget https://github.com/imperva/dsfkit/raw/1.7.0/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_0.zip + wget https://github.com/imperva/dsfkit/raw/1.7.1/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_1.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.0/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_0.zip + wget https://github.com/imperva/dsfkit/raw/1.7.1/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_1.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.0/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_0.zip + wget https://github.com/imperva/dsfkit/raw/1.7.1/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_1.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.0/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_0.zip + wget https://github.com/imperva/dsfkit/raw/1.7.1/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_1.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.0/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_0.zip + wget https://github.com/imperva/dsfkit/raw/1.7.1/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_1.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.0/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_0.zip + wget https://github.com/imperva/dsfkit/raw/1.7.1/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_1.zip ``` 10. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2. @@ -1049,7 +1049,7 @@ After you have [chosen the upgrade mode](#choosing-the-upgrade-mode), follow the This mode offers a straightforward deployment option that relies on running a Terraform script on the user's computer which must be a Linux/Unix machine, e.g, Mac. This mode makes use of the Terraform Command Line Interface (CLI) to deploy and manage environments. -1. Download the zip file of the Sonar upgrade example: sonar_upgrade_1_7_0.zip. +1. Download the zip file of the Sonar upgrade example: sonar_upgrade_1_7_1.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: @@ -1115,7 +1115,7 @@ This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cann 5. In the Network settings panel - make your configurations while keeping in mind that the installer machine should have access to the DSF environment that you want to deploy, and that your computer should have access to the installer machine. -6. In the “Advanced details” panel, copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.7.0/installer_machine/upgrade_installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox. +6. In the “Advanced details” panel, copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.7.1/installer_machine/upgrade_installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox. 9. Click on **Launch Instance**. At this stage, the installer machine is initializing and downloading the necessary dependencies. @@ -1144,13 +1144,13 @@ This mode can be used if a Linux/Unix machine is not available, or eDSF Kit cann If you do not wish to use Terraform to run the upgrade, it is possible to bypass it and run the Python utility directly. -Use the Python Upgrader utility. +Use the Python Upgrader utility. # More Information Information about additional topics can be found in specific examples' READMEs, when relevant. -For example: Sonar Single Account Deployment +For example: Sonar Single Account Deployment These topics include: - Storing Terraform state in S3 bucket diff --git a/examples/aws/installation/dsf_single_account_deployment/dam.tf b/examples/aws/installation/dsf_single_account_deployment/dam.tf index 9aee4f2e9..9fc3591e0 100644 --- 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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 index d55e4aa62..ba5777278 100644 --- 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.0" # latest release tag + version = "1.7.1" # latest release tag count = var.enable_dra ? 1 : 0 friendly_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.0" # latest release tag + version = "1.7.1" # latest release tag count = local.dra_analytics_count friendly_name = join("-", [local.deployment_name_salted, "dra", "analytics", count.index]) diff --git a/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_0.zip b/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_0.zip deleted file mode 100644 index e756cc52d..000000000 Binary files a/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_0.zip and /dev/null differ diff --git a/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_1.zip b/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_1.zip new file mode 100644 index 000000000..755ddae4c Binary files /dev/null and b/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_1.zip differ diff --git a/examples/aws/installation/dsf_single_account_deployment/main.tf b/examples/aws/installation/dsf_single_account_deployment/main.tf index cd9f9cabc..d6459e573 100644 --- 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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 index c6a176f6c..08578f004 100644 --- 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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 index d45ea1d14..2b5e4ac02 100644 --- 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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.0" # latest release tag + version = "1.7.1" # 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/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_0.zip b/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_0.zip deleted file mode 100644 index c5e50c820..000000000 Binary files a/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_0.zip and /dev/null differ diff --git a/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_1.zip b/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_1.zip new file mode 100644 index 000000000..bd295fc86 Binary files /dev/null and b/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_1.zip differ diff --git a/examples/aws/installation/sonar_single_account_deployment/main.tf b/examples/aws/installation/sonar_single_account_deployment/main.tf index 6a2e78dbc..ec9813d12 100644 --- a/examples/aws/installation/sonar_single_account_deployment/main.tf +++ b/examples/aws/installation/sonar_single_account_deployment/main.tf @@ -5,7 +5,7 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag sonar_version = var.sonar_version } @@ -33,7 +33,7 @@ locals { module "key_pair_hub" { count = local.should_create_hub_key_pair ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag key_name_prefix = "imperva-dsf-hub" private_key_filename = "ssh_keys/dsf_ssh_key-hub-${terraform.workspace}" tags = local.tags @@ -42,7 +42,7 @@ module "key_pair_hub" { module "key_pair_gw" { count = local.should_create_gw_key_pair ? 1 : 0 source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag key_name_prefix = "imperva-dsf-gw" private_key_filename = "ssh_keys/dsf_ssh_key-gw-${terraform.workspace}" tags = local.tags @@ -72,7 +72,7 @@ data "aws_subnet" "subnet_gw" { ############################## module "hub_main" { source = "imperva/dsf-hub/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # 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 @@ -103,7 +103,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # 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 @@ -138,7 +138,7 @@ module "hub_dr" { module "agentless_gw" { count = var.gw_count source = "imperva/dsf-agentless-gw/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "gw", count.index]) subnet_id = var.subnet_gw security_group_ids = var.security_group_ids_gw @@ -172,7 +172,7 @@ module "agentless_gw" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # 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 @@ -199,7 +199,7 @@ locals { module "federation" { count = length(local.hub_gw_combinations) source = "imperva/dsf-federation/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag hub_info = { hub_ip_address = local.hub_gw_combinations[count.index][0].private_ip diff --git a/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_0.zip b/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_0.zip deleted file mode 100644 index 1ac387316..000000000 Binary files a/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_0.zip and /dev/null differ diff --git a/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_1.zip b/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_1.zip new file mode 100644 index 000000000..8aa52db00 Binary files /dev/null and b/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_1.zip differ diff --git a/examples/aws/poc/dsf_deployment/agent_sources.tf b/examples/aws/poc/dsf_deployment/agent_sources.tf index aca266bd0..fcafd00bb 100644 --- a/examples/aws/poc/dsf_deployment/agent_sources.tf +++ b/examples/aws/poc/dsf_deployment/agent_sources.tf @@ -4,7 +4,7 @@ locals { module "db_with_agent" { source = "imperva/dsf-db-with-agent/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = length(local.db_types_for_agent) friendly_name = join("-", [local.deployment_name_salted, "db", "with", "agent", count.index]) diff --git a/examples/aws/poc/dsf_deployment/agentless_sources.tf b/examples/aws/poc/dsf_deployment/agentless_sources.tf index 122faad58..7ffeff87c 100644 --- a/examples/aws/poc/dsf_deployment/agentless_sources.tf +++ b/examples/aws/poc/dsf_deployment/agentless_sources.tf @@ -4,7 +4,7 @@ locals { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = contains(local.db_types_for_agentless, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -14,7 +14,7 @@ module "rds_mysql" { module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = contains(local.db_types_for_agentless, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -29,7 +29,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } sonar_version = module.globals.tarball_location.version diff --git a/examples/aws/poc/dsf_deployment/dam.tf b/examples/aws/poc/dsf_deployment/dam.tf index 88ac821a2..e92db1b3b 100644 --- a/examples/aws/poc/dsf_deployment/dam.tf +++ b/examples/aws/poc/dsf_deployment/dam.tf @@ -8,7 +8,7 @@ locals { module "mx" { source = "imperva/dsf-mx/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.enable_dam ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "mx"]) @@ -41,7 +41,7 @@ module "mx" { module "agent_gw" { source = "imperva/dsf-agent-gw/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = local.agent_gw_count friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index]) @@ -67,7 +67,7 @@ module "agent_gw" { module "agent_gw_cluster_setup" { source = "imperva/dsf-agent-gw-cluster-setup/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = local.create_agent_gw_cluster cluster_name = join("-", [local.deployment_name_salted, "agent", "gw", "cluster"]) diff --git a/examples/aws/poc/dsf_deployment/dra.tf b/examples/aws/poc/dsf_deployment/dra.tf index 8ad77d3a9..76bc85398 100644 --- a/examples/aws/poc/dsf_deployment/dra.tf +++ b/examples/aws/poc/dsf_deployment/dra.tf @@ -6,7 +6,7 @@ locals { module "dra_admin" { source = "imperva/dsf-dra-admin/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.enable_dra ? 1 : 0 friendly_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.0" # latest release tag + version = "1.7.1" # latest release tag count = local.dra_analytics_count friendly_name = join("-", [local.deployment_name_salted, "dra", "analytics", count.index]) diff --git a/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_0.zip b/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_0.zip deleted file mode 100644 index c08da09a9..000000000 Binary files a/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_0.zip and /dev/null differ diff --git a/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_1.zip b/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_1.zip new file mode 100644 index 000000000..2cb463078 Binary files /dev/null and b/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_1.zip differ diff --git a/examples/aws/poc/dsf_deployment/main.tf b/examples/aws/poc/dsf_deployment/main.tf index 8d70a3fc8..82416f966 100644 --- a/examples/aws/poc/dsf_deployment/main.tf +++ b/examples/aws/poc/dsf_deployment/main.tf @@ -8,7 +8,7 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag sonar_version = var.sonar_version dra_version = var.dra_version @@ -16,7 +16,7 @@ module "globals" { module "key_pair" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag key_name_prefix = "imperva-dsf-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" diff --git a/examples/aws/poc/dsf_deployment/sonar.tf b/examples/aws/poc/dsf_deployment/sonar.tf index eb6ea332d..ad0005193 100644 --- a/examples/aws/poc/dsf_deployment/sonar.tf +++ b/examples/aws/poc/dsf_deployment/sonar.tf @@ -11,7 +11,7 @@ locals { module "hub_main" { source = "imperva/dsf-hub/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.enable_sonar ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "main"]) @@ -53,7 +53,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.enable_sonar && var.hub_hadr ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) @@ -85,7 +85,7 @@ module "hub_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = length(module.hub_dr) > 0 ? 1 : 0 sonar_version = module.globals.tarball_location.version @@ -103,7 +103,7 @@ module "hub_hadr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = local.agentless_gw_count friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "main"]) @@ -133,7 +133,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # 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"]) @@ -166,7 +166,7 @@ module "agentless_gw_dr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = length(module.agentless_gw_dr) sonar_version = module.globals.tarball_location.version @@ -210,7 +210,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag for_each = local.hub_gw_combinations hub_info = { diff --git a/examples/aws/poc/sonar_basic_deployment/main.tf b/examples/aws/poc/sonar_basic_deployment/main.tf index 98d6f202e..4dfcaa85b 100644 --- a/examples/aws/poc/sonar_basic_deployment/main.tf +++ b/examples/aws/poc/sonar_basic_deployment/main.tf @@ -8,14 +8,14 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag sonar_version = var.sonar_version } module "key_pair" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag key_name_prefix = "imperva-dsf-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" @@ -80,7 +80,7 @@ data "aws_subnet" "gw" { module "hub" { source = "imperva/dsf-hub/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub"]) instance_type = var.hub_instance_type @@ -106,7 +106,7 @@ module "hub" { module "agentless_gw" { source = "imperva/dsf-agentless-gw/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index]) @@ -135,7 +135,7 @@ module "agentless_gw" { module "federation" { source = "imperva/dsf-federation/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag for_each = { for idx, val in module.agentless_gw : idx => val } hub_info = { @@ -163,7 +163,7 @@ module "federation" { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -173,7 +173,7 @@ module "rds_mysql" { module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -188,7 +188,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } sonar_version = module.globals.tarball_location.version diff --git a/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_0.zip b/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_1.zip similarity index 56% rename from examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_0.zip rename to examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_1.zip index 44a7a2a83..51ae7bd76 100644 Binary files a/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_0.zip and b/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_1.zip differ diff --git a/examples/aws/poc/sonar_hadr_deployment/main.tf b/examples/aws/poc/sonar_hadr_deployment/main.tf index 3374fe522..df5094fb0 100644 --- a/examples/aws/poc/sonar_hadr_deployment/main.tf +++ b/examples/aws/poc/sonar_hadr_deployment/main.tf @@ -8,13 +8,13 @@ provider "aws" { module "globals" { source = "imperva/dsf-globals/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag sonar_version = var.sonar_version } module "key_pair" { source = "imperva/dsf-globals/aws//modules/key_pair" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag key_name_prefix = "imperva-dsf-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" tags = local.tags @@ -87,7 +87,7 @@ module "vpc" { ############################## module "hub_main" { source = "imperva/dsf-hub/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "main"]) instance_type = var.hub_instance_type @@ -114,7 +114,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) instance_type = var.hub_instance_type @@ -143,7 +143,7 @@ module "hub_dr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "main"]) @@ -173,7 +173,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "DR"]) @@ -206,7 +206,7 @@ module "agentless_gw_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag sonar_version = module.globals.tarball_location.version dsf_main_ip = module.hub_main.public_ip @@ -223,7 +223,7 @@ module "hub_hadr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.gw_count sonar_version = module.globals.tarball_location.version @@ -256,7 +256,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = length(local.hub_gw_combinations) hub_info = { @@ -284,7 +284,7 @@ module "federation" { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -295,7 +295,7 @@ module "rds_mysql" { # create a RDS SQL Server DB module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -310,7 +310,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } sonar_version = module.globals.tarball_location.version diff --git a/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_0.zip b/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_0.zip deleted file mode 100644 index 14fac9ca8..000000000 Binary files a/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_0.zip and /dev/null differ diff --git a/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_1.zip b/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_1.zip new file mode 100644 index 000000000..268c89071 Binary files /dev/null and b/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_1.zip differ diff --git a/examples/aws/sonar_upgrade/main.tf b/examples/aws/sonar_upgrade/main.tf index 12b8ccc82..7dd61374b 100644 --- a/examples/aws/sonar_upgrade/main.tf +++ b/examples/aws/sonar_upgrade/main.tf @@ -1,6 +1,6 @@ module "sonar_upgrader" { source = "imperva/dsf-sonar-upgrader/aws" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag # Fill the details of the Agentless Gateways and DSF Hubs that you want to upgrade agentless_gws = [ diff --git a/examples/aws/sonar_upgrade/sonar_upgrade_1_7_0.zip b/examples/aws/sonar_upgrade/sonar_upgrade_1_7_0.zip deleted file mode 100644 index 99fb7b2c9..000000000 Binary files a/examples/aws/sonar_upgrade/sonar_upgrade_1_7_0.zip and /dev/null differ diff --git a/examples/aws/sonar_upgrade/sonar_upgrade_1_7_1.zip b/examples/aws/sonar_upgrade/sonar_upgrade_1_7_1.zip new file mode 100644 index 000000000..09e7a6a97 Binary files /dev/null and b/examples/aws/sonar_upgrade/sonar_upgrade_1_7_1.zip differ diff --git a/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_0.zip b/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_0.zip deleted file mode 100644 index 6e0f7cad0..000000000 Binary files a/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_0.zip and /dev/null differ diff --git a/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_1.zip b/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_1.zip new file mode 100644 index 000000000..0e8291b0c Binary files /dev/null and b/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_1.zip differ diff --git a/examples/azure/poc/dsf_deployment/main.tf b/examples/azure/poc/dsf_deployment/main.tf index 25adcbc2e..e2db01d80 100644 --- a/examples/azure/poc/dsf_deployment/main.tf +++ b/examples/azure/poc/dsf_deployment/main.tf @@ -1,6 +1,6 @@ module "globals" { source = "imperva/dsf-globals/azurerm" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag } resource "azurerm_resource_group" "rg" { diff --git a/examples/azure/poc/dsf_deployment/sonar.tf b/examples/azure/poc/dsf_deployment/sonar.tf index 2183f7869..b5fe6027e 100644 --- a/examples/azure/poc/dsf_deployment/sonar.tf +++ b/examples/azure/poc/dsf_deployment/sonar.tf @@ -4,7 +4,7 @@ locals { module "hub_main" { source = "imperva/dsf-hub/azurerm" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.enable_sonar ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub"]) @@ -34,7 +34,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/azurerm" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = var.enable_sonar && var.hub_hadr ? 1 : 0 friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"]) @@ -66,7 +66,7 @@ module "hub_dr" { module "hub_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = length(module.hub_dr) > 0 ? 1 : 0 sonar_version = var.sonar_version @@ -84,7 +84,7 @@ module "hub_hadr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/azurerm" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = local.agentless_gw_count friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index]) @@ -115,7 +115,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/azurerm" - version = "1.7.0" # latest release tag + version = "1.7.1" # 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"]) @@ -149,7 +149,7 @@ module "agentless_gw_dr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag count = length(module.agentless_gw_dr) sonar_version = var.sonar_version @@ -193,7 +193,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.7.0" # latest release tag + version = "1.7.1" # latest release tag for_each = local.hub_gw_combinations hub_info = { diff --git a/modules/aws/agent-gw/README.md b/modules/aws/agent-gw/README.md index b40365c4f..b05403267 100644 --- a/modules/aws/agent-gw/README.md +++ b/modules/aws/agent-gw/README.md @@ -83,4 +83,4 @@ API access to the DSF Management server is required to provision this module. Pl For more information about the DSF Agent Gateway and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v14.11-database-activity-monitoring-user-guide/page/378.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/aws/agentless-gw/README.md b/modules/aws/agentless-gw/README.md index 8a96a3a6d..b04f64d04 100644 --- a/modules/aws/agentless-gw/README.md +++ b/modules/aws/agentless-gw/README.md @@ -194,4 +194,4 @@ module "dsf_agentless_gw" { For more information about the Agentless Gateway and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v4.13-sonar-user-guide/page/80401.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). diff --git a/modules/aws/agentless-gw/outputs.tf b/modules/aws/agentless-gw/outputs.tf index 4dbc2afff..1abe699c2 100644 --- a/modules/aws/agentless-gw/outputs.tf +++ b/modules/aws/agentless-gw/outputs.tf @@ -35,7 +35,7 @@ output "ssh_user" { output "instance_id" { description = "AWS EC2 instance ID" - value = module.gw_instance.instance_id + value = module.gw_instance.instance_id } output "sonarw_public_key" { diff --git a/modules/aws/db-with-agent/README.md b/modules/aws/db-with-agent/README.md index c825ab461..7e4936632 100644 --- a/modules/aws/db-with-agent/README.md +++ b/modules/aws/db-with-agent/README.md @@ -69,4 +69,4 @@ module "db_with_agent" { ## Additional Information For more information about the DSF Agent Gateway and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v14.11-database-activity-monitoring-user-guide/page/378.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/aws/dra-admin/README.md b/modules/aws/dra-admin/README.md index f31c2db78..264eabb7f 100644 --- a/modules/aws/dra-admin/README.md +++ b/modules/aws/dra-admin/README.md @@ -72,4 +72,4 @@ module "dsf_dra_admin" { For more information about the DSF DRA Admin and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/z-kb-articles-km/page/4e487f3c.html). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/aws/dra-analytics/README.md b/modules/aws/dra-analytics/README.md index 62c9b5796..553c2ffcc 100644 --- a/modules/aws/dra-analytics/README.md +++ b/modules/aws/dra-analytics/README.md @@ -78,4 +78,4 @@ module "dsf_dra_admin" { For more information about the DSF DRA Analytics and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/z-kb-articles-km/page/4e487f3c.html). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/aws/hub/README.md b/modules/aws/hub/README.md index 056fa242b..19fadbd12 100644 --- a/modules/aws/hub/README.md +++ b/modules/aws/hub/README.md @@ -147,4 +147,4 @@ module "dsf_hub" { For more information about the DSF Hub and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v4.13-sonar-user-guide/page/80401.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). diff --git a/modules/aws/hub/outputs.tf b/modules/aws/hub/outputs.tf index 27e3fddfc..7119c1323 100644 --- a/modules/aws/hub/outputs.tf +++ b/modules/aws/hub/outputs.tf @@ -35,7 +35,7 @@ output "ssh_user" { output "instance_id" { description = "AWS EC2 instance ID" - value = module.hub_instance.instance_id + value = module.hub_instance.instance_id } output "sonarw_public_key" { @@ -55,8 +55,8 @@ output "jsonar_uid" { output "access_tokens" { description = "Access tokens required for initiating an API requests to the DSF Hub" - value = module.hub_instance.access_tokens - sensitive = true + value = module.hub_instance.access_tokens + sensitive = true } output "web_console_user" { diff --git a/modules/aws/mx/README.md b/modules/aws/mx/README.md index fdb32fdcf..0a7035af8 100644 --- a/modules/aws/mx/README.md +++ b/modules/aws/mx/README.md @@ -83,4 +83,4 @@ API access is required to provision this module. Please make sure to pass the re For more information about the DSF MX and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v14.11-dam-management-server-manager-user-guide/page/10068.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/aws/mx/configuration.tf b/modules/aws/mx/configuration.tf index 60bc3bcb4..85cf275d8 100644 --- a/modules/aws/mx/configuration.tf +++ b/modules/aws/mx/configuration.tf @@ -8,12 +8,12 @@ locals { ) commands = <<-EOF ${templatefile("${path.module}/configure.tftpl", - { mx_address = local.mx_address_for_api - https_auth_header = local.https_auth_header - configuration_elements = local.configuration_elements - timeout = local.conf_timeout - }) - } + { mx_address = local.mx_address_for_api + https_auth_header = local.https_auth_header + configuration_elements = local.configuration_elements + timeout = local.conf_timeout +}) +} EOF } diff --git a/modules/aws/mx/hub.tf b/modules/aws/mx/hub.tf index 3f6ef8768..50569b4d5 100644 --- a/modules/aws/mx/hub.tf +++ b/modules/aws/mx/hub.tf @@ -1,16 +1,16 @@ locals { - default_audit_policy = "Default Rule - All Events" - _hub_action_set = "Send to DSF Hub" - _hub_action_set_action = local._hub_action_set + default_audit_policy = "Default Rule - All Events" + _hub_action_set = "Send to DSF Hub" + _hub_action_set_action = local._hub_action_set _hub_action_set147 = "Default Archive Action Set" _hub_action_set_action147 = local._hub_action_set147 - hub_action_set = local.dam_version != "14.7" ? local._hub_action_set : local._hub_action_set147 - hub_action_set_action = local.dam_version != "14.7" ? local._hub_action_set_action : local._hub_action_set_action147 + hub_action_set = local.dam_version != "14.7" ? local._hub_action_set : local._hub_action_set147 + hub_action_set_action = local.dam_version != "14.7" ? local._hub_action_set_action : local._hub_action_set_action147 # Archiving action set is created differently on 14.7 dam_version_major = split(".", var.dam_version)[0] dam_version_minor = split(".", var.dam_version)[1] - dam_version = "${local.dam_version_major}.${local.dam_version_minor}" + dam_version = "${local.dam_version_major}.${local.dam_version_minor}" action_set_item = var.hub_details == null ? [] : local.dam_version != "14.7" ? [{ name = "send_to_hub_action_set" # https://docs.imperva.com/bundle/v14.11-database-activity-monitoring-user-guide/page/78508.htm @@ -25,7 +25,7 @@ locals { "strictCertificateChecking" : false } ) - }] : [{ + }] : [{ name = "default_archive_action_set" # https://docs.imperva.com/bundle/v14.7-database-activity-monitoring-user-guide/page/78508.htm method = "POST" url_path = "SecureSphere/api/v1/conf/actionSets/${local.hub_action_set}/${local.hub_action_set_action}" @@ -35,10 +35,10 @@ locals { "port" : try(var.hub_details.port, null), "apiToken" : try(var.hub_details.access_token, null) "strictCertificateChecking" : false - "actionInterface": "Send to Sonar" + "actionInterface" : "Send to Sonar" } ) - }] + }] hub_configuration = var.hub_details == null ? [] : concat(local.action_set_item, var.large_scale_mode == true ? [] : [{ diff --git a/modules/aws/rds-mssql-db/README.md b/modules/aws/rds-mssql-db/README.md index bcf0f8d52..ba8d68446 100644 --- a/modules/aws/rds-mssql-db/README.md +++ b/modules/aws/rds-mssql-db/README.md @@ -80,4 +80,4 @@ module "dsf_rds_mssql" { ## Additional Information -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/azurerm/agentless-gw/README.md b/modules/azurerm/agentless-gw/README.md index d22f1124e..52c3285cf 100644 --- a/modules/azurerm/agentless-gw/README.md +++ b/modules/azurerm/agentless-gw/README.md @@ -100,4 +100,4 @@ SSH access is required to provision this module. To SSH into the Agentless Gatew For more information about the Agentless Gateway and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v4.12-sonar-user-guide/page/80401.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/azurerm/hub/README.md b/modules/azurerm/hub/README.md index ece4a62d1..38aa70df1 100644 --- a/modules/azurerm/hub/README.md +++ b/modules/azurerm/hub/README.md @@ -98,4 +98,4 @@ SSH access is required to provision this module. To SSH into the DSF Hub instanc For more information about the DSF Hub and its features, refer to the official documentation [here](https://docs.imperva.com/bundle/v4.12-sonar-user-guide/page/80401.htm). -For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.0). \ No newline at end of file +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.1). \ No newline at end of file diff --git a/modules/null/statistics/main.tf b/modules/null/statistics/main.tf index 4704c02b8..9709044bd 100644 --- a/modules/null/statistics/main.tf +++ b/modules/null/statistics/main.tf @@ -1,7 +1,7 @@ locals { - host = "https://stats.dsfkitimperva.com" - resource = "dsfkit_usage_stats" - url = join("/", [local.host, local.resource]) + host = "https://stats.dsfkitimperva.com" + resource = "dsfkit_usage_stats" + url = join("/", [local.host, local.resource]) id = var.id == null ? random_uuid.stats_id.result : var.id diff --git a/modules/sonar_python_upgrader_1_7_0.zip b/modules/sonar_python_upgrader_1_7_0.zip deleted file mode 100644 index 699706acc..000000000 Binary files a/modules/sonar_python_upgrader_1_7_0.zip and /dev/null differ diff --git a/modules/sonar_python_upgrader_1_7_1.zip b/modules/sonar_python_upgrader_1_7_1.zip new file mode 100644 index 000000000..5a611e1b2 Binary files /dev/null and b/modules/sonar_python_upgrader_1_7_1.zip differ