diff --git a/.github/workflows/deploy_module.yml b/.github/workflows/deploy_module.yml index 2863605cd..b838fa208 100644 --- 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 index 61d251155..9f31f9378 100644 --- 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 index a8d361bb9..d130d689b 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 @@ -417,6 +417,17 @@ The following table lists the _latest_ eDSF Kit releases, their release date and
3. Improvements and bug fixes. + + 24 Jan 2024 + + 1.7.8 + + + 1. Added support for DRA in Azure. +
2. Added a new agentless source for Azure - MSSQL. +
3. Improvements and bug fixes. + + # Getting Ready to Deploy @@ -470,7 +481,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. @@ -489,73 +500,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_5.zip + sonar_basic_deployment_1_7_8.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_5.zip + sonar_hadr_deployment_1_7_8.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_5.zip + sonar_single_account_deployment_1_7_8.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_5.zip + sonar_multi_account_deployment_1_7_8.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_5.zip + dsf_deployment_1_7_8.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_5.zip + dsf_single_account_deployment_1_7_8.zip - Sonar Upgrade (Alpha) + Sonar Upgrade (Alpha) All Upgrade of DSF Hub and Agentless Gateway (formerly Sonar). - sonar_upgrade_1_7_5.zip + sonar_upgrade_1_7_8.zip @@ -574,13 +585,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, DAM (MX and Agent Gateways), and Agent audit sources. - dsf_deployment_1_7_5.zip + dsf_deployment_1_7_8.zip @@ -655,7 +666,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: @@ -753,7 +764,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.5/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.8/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. @@ -772,30 +783,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.5/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_5.zip + wget https://github.com/imperva/dsfkit/raw/1.7.8/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_8.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.5/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_5.zip + wget https://github.com/imperva/dsfkit/raw/1.7.8/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_8.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.5/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_5.zip + wget https://github.com/imperva/dsfkit/raw/1.7.8/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_8.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.5/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_5.zip + wget https://github.com/imperva/dsfkit/raw/1.7.8/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_8.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.5/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_5.zip + wget https://github.com/imperva/dsfkit/raw/1.7.8/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_8.zip or - wget https://github.com/imperva/dsfkit/raw/1.7.5/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_5.zip + wget https://github.com/imperva/dsfkit/raw/1.7.8/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_8.zip ``` 10. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2. @@ -1094,7 +1105,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_5.zip. +1. Download the zip file of the Sonar upgrade example: sonar_upgrade_1_7_8.zip. 2. Unzip the zip file in CLI or using your operating system's UI. For example, in CLI: @@ -1160,7 +1171,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.5/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.8/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. @@ -1189,13 +1200,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, 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 a4937408f..371adf71d 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.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 index db9dfa8d9..188b2e782 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.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/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_5.zip b/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_5.zip deleted file mode 100644 index dbd6b740d..000000000 Binary files a/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_5.zip and /dev/null differ diff --git a/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_8.zip b/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_8.zip new file mode 100644 index 000000000..762172e2f Binary files /dev/null and b/examples/aws/installation/dsf_single_account_deployment/dsf_single_account_deployment_1_7_8.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 70af6df35..4fa38fed3 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.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 index 2126bf4ab..e5aa80c2a 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.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 index a68a14886..ba23b69a5 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.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/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_5.zip b/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_8.zip similarity index 81% rename from examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_5.zip rename to examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_8.zip index 62beaa1b0..20fd96801 100644 Binary files a/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_5.zip and b/examples/aws/installation/sonar_multi_account_deployment/sonar_multi_account_deployment_1_7_8.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 28727f8bc..4274dd9cd 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.5" # latest release tag + version = "1.7.8" # 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.5" # latest release tag + version = "1.7.8" # 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.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-${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.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 @@ -103,7 +103,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 @@ -138,7 +138,7 @@ module "hub_dr" { module "agentless_gw" { 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]) 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.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 @@ -199,7 +199,7 @@ locals { module "federation" { count = length(local.hub_gw_combinations) source = "imperva/dsf-federation/null" - version = "1.7.5" # latest release tag + version = "1.7.8" # 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_5.zip b/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_8.zip similarity index 81% rename from examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_5.zip rename to examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_8.zip index 2a61792ab..06de73617 100644 Binary files a/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_5.zip and b/examples/aws/installation/sonar_single_account_deployment/sonar_single_account_deployment_1_7_8.zip differ diff --git a/examples/aws/poc/dsf_deployment/agent_sources.tf b/examples/aws/poc/dsf_deployment/agent_sources.tf index 553c6f552..7c2134641 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.5" # latest release tag + version = "1.7.8" # 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 20b8ea107..d0fbff445 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.5" # latest release tag + version = "1.7.8" # 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_postgres" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-postgres-db" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = contains(local.db_types_for_agentless, "RDS PostgreSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -24,7 +24,7 @@ module "rds_postgres" { module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = contains(local.db_types_for_agentless, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -38,8 +38,8 @@ module "rds_mssql" { } module "db_onboarding" { -source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.7.5" # latest release tag + source = "imperva/dsf-poc-db-onboarder/aws" + version = "1.7.8" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } usc_access_token = module.hub_main[0].access_tokens.usc.token diff --git a/examples/aws/poc/dsf_deployment/dam.tf b/examples/aws/poc/dsf_deployment/dam.tf index acf405f2c..d63fb27c3 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.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"]) @@ -41,7 +41,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]) @@ -67,7 +67,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 = 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 d0bdb9272..632ce1509 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.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"]) @@ -22,7 +22,7 @@ module "dra_admin" { allowed_ssh_cidrs = concat(local.workstation_cidr, var.allowed_ssh_cidrs) attach_persistent_public_ip = true - tags = local.tags + tags = local.tags depends_on = [ module.vpc ] @@ -30,7 +30,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/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_5.zip b/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_5.zip deleted file mode 100644 index 89205b88d..000000000 Binary files a/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_5.zip and /dev/null differ diff --git a/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_8.zip b/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_8.zip new file mode 100644 index 000000000..fb1eb1a78 Binary files /dev/null and b/examples/aws/poc/dsf_deployment/dsf_deployment_1_7_8.zip differ diff --git a/examples/aws/poc/dsf_deployment/main.tf b/examples/aws/poc/dsf_deployment/main.tf index dbb4cab71..35df6bf31 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.5" # latest release tag + version = "1.7.8" # 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.5" # latest release tag + version = "1.7.8" # 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 ee5bbe87e..e481cda38 100644 --- a/examples/aws/poc/dsf_deployment/sonar.tf +++ b/examples/aws/poc/dsf_deployment/sonar.tf @@ -10,7 +10,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"]) @@ -53,7 +53,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"]) @@ -86,7 +86,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 @@ -104,7 +104,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"]) @@ -135,7 +135,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"]) @@ -169,7 +169,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 @@ -213,7 +213,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/poc/sonar_basic_deployment/main.tf b/examples/aws/poc/sonar_basic_deployment/main.tf index 939846d0b..5c06e97f3 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.5" # latest release tag + version = "1.7.8" # latest release tag sonar_version = var.sonar_version } module "key_pair" { 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-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" @@ -79,7 +79,7 @@ data "aws_subnet" "gw" { module "hub" { 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"]) instance_type = var.hub_instance_type @@ -106,7 +106,7 @@ module "hub" { module "agentless_gw" { source = "imperva/dsf-agentless-gw/aws" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index]) @@ -136,7 +136,7 @@ module "agentless_gw" { module "federation" { source = "imperva/dsf-federation/null" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag for_each = { for idx, val in module.agentless_gw : idx => val } hub_info = { @@ -164,7 +164,7 @@ module "federation" { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -174,7 +174,7 @@ module "rds_mysql" { module "rds_mssql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -189,7 +189,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } usc_access_token = module.hub.access_tokens.usc.token diff --git a/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_5.zip b/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_5.zip deleted file mode 100644 index 30f34b9b7..000000000 Binary files a/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_5.zip and /dev/null differ diff --git a/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_8.zip b/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_8.zip new file mode 100644 index 000000000..cc5ad004e Binary files /dev/null and b/examples/aws/poc/sonar_basic_deployment/sonar_basic_deployment_1_7_8.zip differ diff --git a/examples/aws/poc/sonar_hadr_deployment/main.tf b/examples/aws/poc/sonar_hadr_deployment/main.tf index 4bd1eac21..e36280cf6 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.5" # latest release tag + version = "1.7.8" # latest release tag sonar_version = var.sonar_version } module "key_pair" { 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-" private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}" tags = local.tags @@ -86,7 +86,7 @@ module "vpc" { ############################## 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"]) instance_type = var.hub_instance_type @@ -114,7 +114,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"]) instance_type = var.hub_instance_type @@ -144,7 +144,7 @@ module "hub_dr" { 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 = var.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "main"]) @@ -175,7 +175,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.gw_count friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "DR"]) @@ -209,7 +209,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.public_ip @@ -226,7 +226,7 @@ module "hub_hadr" { module "agentless_gw_hadr" { source = "imperva/dsf-hadr/null" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = var.gw_count sonar_version = module.globals.tarball_location.version @@ -259,7 +259,7 @@ locals { module "federation" { source = "imperva/dsf-federation/null" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = length(local.hub_gw_combinations) hub_info = { @@ -287,7 +287,7 @@ module "federation" { module "rds_mysql" { source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -298,7 +298,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.5" # latest release tag + version = "1.7.8" # latest release tag count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0 rds_subnet_ids = local.db_subnet_ids @@ -313,7 +313,7 @@ module "rds_mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/aws" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val } usc_access_token = module.hub_main.access_tokens.usc.token diff --git a/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_5.zip b/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_5.zip deleted file mode 100644 index 83b631ae0..000000000 Binary files a/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_5.zip and /dev/null differ diff --git a/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_8.zip b/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_8.zip new file mode 100644 index 000000000..9371f1070 Binary files /dev/null and b/examples/aws/poc/sonar_hadr_deployment/sonar_hadr_deployment_1_7_8.zip differ diff --git a/examples/aws/sonar_upgrade/main.tf b/examples/aws/sonar_upgrade/main.tf index 9e4f09ba5..26fba1829 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.5" # latest release tag + version = "1.7.8" # 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_5.zip b/examples/aws/sonar_upgrade/sonar_upgrade_1_7_5.zip deleted file mode 100644 index e3a16e3a5..000000000 Binary files a/examples/aws/sonar_upgrade/sonar_upgrade_1_7_5.zip and /dev/null differ diff --git a/examples/aws/sonar_upgrade/sonar_upgrade_1_7_8.zip b/examples/aws/sonar_upgrade/sonar_upgrade_1_7_8.zip new file mode 100644 index 000000000..2a8fea3aa Binary files /dev/null and b/examples/aws/sonar_upgrade/sonar_upgrade_1_7_8.zip differ diff --git a/examples/azure/poc/dsf_deployment/agent_sources.tf b/examples/azure/poc/dsf_deployment/agent_sources.tf index a0bfef673..64bc31c92 100644 --- a/examples/azure/poc/dsf_deployment/agent_sources.tf +++ b/examples/azure/poc/dsf_deployment/agent_sources.tf @@ -4,7 +4,7 @@ locals { module "db_with_agent" { source = "imperva/dsf-db-with-agent/azurerm" - version = "1.7.5" # latest release tag + version = "1.7.8" # 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/azure/poc/dsf_deployment/agentless_sources.tf b/examples/azure/poc/dsf_deployment/agentless_sources.tf index 807dca3d0..0803d0c08 100644 --- a/examples/azure/poc/dsf_deployment/agentless_sources.tf +++ b/examples/azure/poc/dsf_deployment/agentless_sources.tf @@ -4,10 +4,10 @@ locals { module "mssql" { source = "imperva/dsf-poc-db-onboarder/azurerm//modules/mssql-db" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag count = contains(local.db_types_for_agentless, "MsSQL") ? 1 : 0 - resource_group = local.resource_group + resource_group = local.resource_group security_group_ingress_cidrs = local.workstation_cidr tags = local.tags @@ -15,10 +15,10 @@ module "mssql" { module "db_onboarding" { source = "imperva/dsf-poc-db-onboarder/azurerm" - version = "1.7.5" # latest release tag + version = "1.7.8" # latest release tag for_each = { for idx, val in concat(module.mssql) : idx => val } - resource_group = local.resource_group + resource_group = local.resource_group usc_access_token = module.hub_main[0].access_tokens.usc.token hub_info = { hub_ip_address = module.hub_main[0].public_ip diff --git a/examples/azure/poc/dsf_deployment/dam.tf b/examples/azure/poc/dsf_deployment/dam.tf index 2129fe241..f323aeb10 100644 --- a/examples/azure/poc/dsf_deployment/dam.tf +++ b/examples/azure/poc/dsf_deployment/dam.tf @@ -6,7 +6,7 @@ locals { module "mx" { source = "imperva/dsf-mx/azurerm" - 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"]) @@ -41,7 +41,7 @@ module "mx" { module "agent_gw" { source = "imperva/dsf-agent-gw/azurerm" - 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]) diff --git a/examples/azure/poc/dsf_deployment/dra.tf b/examples/azure/poc/dsf_deployment/dra.tf index cd063b813..9d95e56ad 100644 --- a/examples/azure/poc/dsf_deployment/dra.tf +++ b/examples/azure/poc/dsf_deployment/dra.tf @@ -4,28 +4,29 @@ locals { dra_admin_public_ip = var.enable_dra ? [format("%s/32", module.dra_admin[0].public_ip)] : [] dra_admin_cidr_list = concat(module.network[0].vnet_address_space, local.dra_admin_public_ip) - dra_admin_image_exits = var.dra_admin_image_details != null ? true : false - dra_admin_vhd_exits = var.dra_admin_vhd_details != null ? true : false + dra_admin_image_exits = var.dra_admin_image_details != null ? true : false + dra_admin_vhd_exits = var.dra_admin_vhd_details != null ? true : false dra_analytics_image_exits = var.dra_analytics_image_details != null ? true : false - dra_analytics_vhd_exits = var.dra_analytics_vhd_details != null ? true : false + dra_analytics_vhd_exits = var.dra_analytics_vhd_details != null ? true : false } module "dra_admin" { - source = "../../../../modules/azurerm/dra-admin" - count = var.enable_dra ? 1 : 0 + source = "imperva/dsf-dra-admin/azurerm" + version = "1.7.8" # latest release tag + count = var.enable_dra ? 1 : 0 - name = join("-", [local.deployment_name_salted, "dra", "admin"]) - subnet_id = module.network[0].vnet_subnets[0] - resource_group = local.resource_group - storage_details = var.dra_admin_storage_details - ssh_public_key = tls_private_key.ssh_key.public_key_openssh + name = join("-", [local.deployment_name_salted, "dra", "admin"]) + subnet_id = module.network[0].vnet_subnets[0] + resource_group = local.resource_group + storage_details = var.dra_admin_storage_details + ssh_public_key = tls_private_key.ssh_key.public_key_openssh admin_registration_password = local.password - admin_ssh_password = local.password + admin_ssh_password = local.password allowed_web_console_cidrs = var.web_console_cidr - allowed_analytics_cidrs = module.network[0].vnet_address_space - allowed_hub_cidrs = local.hub_cidr_list - allowed_ssh_cidrs = concat(local.workstation_cidr, var.allowed_ssh_cidrs) + allowed_analytics_cidrs = module.network[0].vnet_address_space + allowed_hub_cidrs = local.hub_cidr_list + allowed_ssh_cidrs = concat(local.workstation_cidr, var.allowed_ssh_cidrs) image_vhd_details = { image = local.dra_admin_image_exits ? { @@ -40,7 +41,7 @@ module "dra_admin" { } attach_persistent_public_ip = true - tags = local.tags + tags = local.tags depends_on = [ module.network @@ -48,24 +49,25 @@ module "dra_admin" { } module "dra_analytics" { - source = "../../../../modules/azurerm/dra-analytics" - count = local.dra_analytics_count + source = "imperva/dsf-dra-analytics/azurerm" + version = "1.7.8" # latest release tag + count = local.dra_analytics_count - name = join("-", [local.deployment_name_salted, "dra", "analytics", count.index]) - subnet_id = module.network[0].vnet_subnets[1] - resource_group = local.resource_group - storage_details = var.dra_analytics_storage_details - ssh_public_key = tls_private_key.ssh_key.public_key_openssh + name = join("-", [local.deployment_name_salted, "dra", "analytics", count.index]) + subnet_id = module.network[0].vnet_subnets[1] + resource_group = local.resource_group + storage_details = var.dra_analytics_storage_details + ssh_public_key = tls_private_key.ssh_key.public_key_openssh admin_registration_password = local.password - analytics_ssh_password = local.password - archiver_password = local.password + analytics_ssh_password = local.password + archiver_password = local.password allowed_admin_cidrs = module.network[0].vnet_address_space - allowed_ssh_cidrs = concat(local.workstation_cidr, local.hub_cidr_list) + allowed_ssh_cidrs = concat(local.workstation_cidr, local.hub_cidr_list) #allowed_ssh_cidrs = concat(var.allowed_ssh_cidrs, local.hub_cidr_list, local.workstation_cidr) admin_server_private_ip = module.dra_admin[0].private_ip - admin_server_public_ip = module.dra_admin[0].public_ip + admin_server_public_ip = module.dra_admin[0].public_ip image_vhd_details = { image = local.dra_analytics_image_exits ? { diff --git a/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_5.zip b/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_5.zip deleted file mode 100644 index 645772f12..000000000 Binary files a/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_5.zip and /dev/null differ diff --git a/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_8.zip b/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_8.zip new file mode 100644 index 000000000..533f61c7f Binary files /dev/null and b/examples/azure/poc/dsf_deployment/dsf_deployment_1_7_8.zip differ diff --git a/examples/azure/poc/dsf_deployment/main.tf b/examples/azure/poc/dsf_deployment/main.tf index 5e2acd163..652cd3dfc 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.5" # latest release tag + version = "1.7.8" # latest release tag } resource "azurerm_resource_group" "rg" { diff --git a/examples/azure/poc/dsf_deployment/networking.tf b/examples/azure/poc/dsf_deployment/networking.tf index 894454841..c91e60573 100644 --- a/examples/azure/poc/dsf_deployment/networking.tf +++ b/examples/azure/poc/dsf_deployment/networking.tf @@ -18,7 +18,7 @@ locals { module "network" { count = 1 source = "Azure/network/azurerm" - version = "5.3.0" + version = "5.3.0" vnet_name = "${local.deployment_name_salted}-${module.globals.current_user_name}" resource_group_name = local.resource_group.name address_spaces = [var.vnet_ip_range] diff --git a/examples/azure/poc/dsf_deployment/outputs.tf b/examples/azure/poc/dsf_deployment/outputs.tf index d760e409d..e99d7a42e 100644 --- a/examples/azure/poc/dsf_deployment/outputs.tf +++ b/examples/azure/poc/dsf_deployment/outputs.tf @@ -13,8 +13,8 @@ output "dsf_private_ssh_key_file_path" { output "generated_network" { value = try({ - vnet = module.network[0].vnet_id - subnets = module.network[0].vnet_subnets + vnet = module.network[0].vnet_id + subnets = module.network[0].vnet_subnets address_space = module.network[0].vnet_address_space }, null) } diff --git a/examples/azure/poc/dsf_deployment/sonar.tf b/examples/azure/poc/dsf_deployment/sonar.tf index f59132493..23a9200f9 100644 --- a/examples/azure/poc/dsf_deployment/sonar.tf +++ b/examples/azure/poc/dsf_deployment/sonar.tf @@ -1,15 +1,15 @@ locals { agentless_gw_count = var.enable_sonar ? var.agentless_gw_count : 0 - hub_public_ip = var.enable_sonar ? (length(module.hub_main[0].public_ip) > 0 ? format("%s/32", module.hub_main[0].public_ip) : null) : null + hub_public_ip = var.enable_sonar ? (length(module.hub_main[0].public_ip) > 0 ? format("%s/32", module.hub_main[0].public_ip) : null) : null hub_dr_public_ip = var.enable_sonar && var.hub_hadr ? (length(module.hub_dr[0].public_ip) > 0 ? format("%s/32", module.hub_dr[0].public_ip) : null) : null -# WA since the following doesn't work: hub_cidr_list = concat(module.network[0].vnet_address_space, compact([local.hub_public_ip, local.hub_dr_public_ip])) + # WA since the following doesn't work: hub_cidr_list = concat(module.network[0].vnet_address_space, compact([local.hub_public_ip, local.hub_dr_public_ip])) hub_cidr_list = var.enable_sonar ? (var.hub_hadr ? concat(module.network[0].vnet_address_space, [local.hub_public_ip, local.hub_dr_public_ip]) : concat(module.network[0].vnet_address_space, [local.hub_public_ip])) : module.network[0].vnet_address_space } module "hub_main" { source = "imperva/dsf-hub/azurerm" - 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"]) @@ -46,7 +46,7 @@ module "hub_main" { archiver_username = module.dra_analytics[0].archiver_user archiver_password = module.dra_analytics[0].archiver_password } : null - tags = local.tags + tags = local.tags depends_on = [ module.network @@ -55,7 +55,7 @@ module "hub_main" { module "hub_dr" { source = "imperva/dsf-hub/azurerm" - 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"]) @@ -90,7 +90,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 = var.sonar_version @@ -108,7 +108,7 @@ module "hub_hadr" { module "agentless_gw_main" { source = "imperva/dsf-agentless-gw/azurerm" - 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]) @@ -141,7 +141,7 @@ module "agentless_gw_main" { module "agentless_gw_dr" { source = "imperva/dsf-agentless-gw/azurerm" - 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"]) @@ -177,7 +177,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 = var.sonar_version @@ -221,7 +221,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/azure/poc/dsf_deployment/variables.tf b/examples/azure/poc/dsf_deployment/variables.tf index f6c7472e5..40d3abe1d 100644 --- a/examples/azure/poc/dsf_deployment/variables.tf +++ b/examples/azure/poc/dsf_deployment/variables.tf @@ -155,7 +155,7 @@ variable "dam_agent_installation_location" { az_blob = string }) description = "Storage account and container location of the DSF DAM agent installation software. az_blob is the full path to the installation file within the storage account container" - default = null + default = null } variable "simulation_db_types_for_agent" { @@ -260,7 +260,7 @@ variable "sonar_machine_base_directory" { variable "simulation_db_types_for_agentless" { type = list(string) - default = ["MsSQL"] + default = [] description = "Types of databases to provision and onboard to an Agentless Gateway for simulation purposes. Available types are: 'MsSQL'." validation { condition = alltrue([ @@ -288,8 +288,8 @@ variable "dra_admin_storage_details" { }) description = "DRA Admin compute instance volume attributes. More info in sizing doc - https://docs.imperva.com/bundle/v4.11-data-risk-analytics-installation-guide/page/69846.htm" default = { - disk_size = 260 - volume_caching = "ReadWrite" + disk_size = 260 + volume_caching = "ReadWrite" storage_account_type = "Standard_LRS" } } @@ -299,7 +299,7 @@ variable "dra_admin_image_details" { resource_group_name = string image_id = string }) - default = null + default = null description = "Image attributes for the Admin Server" validation { condition = var.dra_admin_image_details == null || try(var.dra_admin_image_details.resource_group_name != null && var.dra_admin_image_details.image_id != null, false) @@ -335,8 +335,8 @@ variable "dra_analytics_storage_details" { }) description = "DRA Analytics compute instance volume attributes. More info in sizing doc - https://docs.imperva.com/bundle/v4.11-data-risk-analytics-installation-guide/page/69846.htm" default = { - disk_size = 1010 - volume_caching = "ReadWrite" + disk_size = 1010 + volume_caching = "ReadWrite" storage_account_type = "Standard_LRS" } } @@ -346,7 +346,7 @@ variable "dra_analytics_image_details" { resource_group_name = string image_id = string }) - default = null + default = null description = "Image attributes for the Analytics Server" validation { condition = var.dra_analytics_image_details == null || try(var.dra_analytics_image_details.resource_group_name != null && var.dra_analytics_image_details.image_id != null, false) diff --git a/modules/aws/agent-gw/README.md b/modules/aws/agent-gw/README.md index dda1a5e82..67e430eb6 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/aws/agentless-gw/README.md b/modules/aws/agentless-gw/README.md index 6708505a6..2b6861fc7 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.5). +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.8). diff --git a/modules/aws/db-with-agent/README.md b/modules/aws/db-with-agent/README.md index 6176acc74..449fec0d4 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/aws/dra-admin/README.md b/modules/aws/dra-admin/README.md index bd5759af2..8bf3a889d 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/aws/dra-admin/main.tf b/modules/aws/dra-admin/main.tf index a8ac27f58..3c1e4d4a0 100644 --- a/modules/aws/dra-admin/main.tf +++ b/modules/aws/dra-admin/main.tf @@ -13,9 +13,9 @@ locals { admin_ssh_password_secret_arn = aws_secretsmanager_secret.admin_ssh_password.arn }) - readiness_script = templatefile("${path.module}/../dra-analytics/waiter.tftpl", { - admin_server_public_ip = try(local.public_ip, local.private_ip) - }) + # readiness_script = templatefile("${path.module}/../dra-analytics/waiter.tftpl", { + # admin_server_public_ip = try(local.public_ip, local.private_ip) + # }) } resource "aws_eip" "dsf_instance_eip" { @@ -71,22 +71,22 @@ module "statistics" { artifact = "ami://${sha256(data.aws_ami.selected-ami.image_id)}@${var.dra_version}" } -resource "null_resource" "readiness" { - provisioner "local-exec" { - command = local.readiness_script - interpreter = ["/bin/bash", "-c"] - } - depends_on = [ - aws_instance.dsf_base_instance, - module.statistics - ] -} - -module "statistics_success" { - source = "../../../modules/aws/statistics" - count = var.send_usage_statistics ? 1 : 0 - - id = module.statistics[0].id - status = "success" - depends_on = [null_resource.readiness] -} \ No newline at end of file +#resource "null_resource" "readiness" { +# provisioner "local-exec" { +# command = local.readiness_script +# interpreter = ["/bin/bash", "-c"] +# } +# depends_on = [ +# aws_instance.dsf_base_instance, +# module.statistics +# ] +#} +# +#module "statistics_success" { +# source = "../../../modules/aws/statistics" +# count = var.send_usage_statistics ? 1 : 0 +# +# id = module.statistics[0].id +# status = "success" +# depends_on = [null_resource.readiness] +#} \ No newline at end of file diff --git a/modules/aws/dra-analytics/README.md b/modules/aws/dra-analytics/README.md index 26a6b9b1c..4993b14bc 100644 --- a/modules/aws/dra-analytics/README.md +++ b/modules/aws/dra-analytics/README.md @@ -78,4 +78,4 @@ module "dsf_dra_analytics" { 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/aws/hub/README.md b/modules/aws/hub/README.md index 953451a70..9ba4e49a9 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.5). +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.8). diff --git a/modules/aws/mx/README.md b/modules/aws/mx/README.md index 2f9b81dd9..2c1deb952 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/aws/rds-mssql-db/README.md b/modules/aws/rds-mssql-db/README.md index 5a88bf032..a55beed32 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/agent-gw/README.md b/modules/azurerm/agent-gw/README.md index e97205d9e..482ac3671 100644 --- a/modules/azurerm/agent-gw/README.md +++ b/modules/azurerm/agent-gw/README.md @@ -84,4 +84,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.5). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/agentless-gw/README.md b/modules/azurerm/agentless-gw/README.md index e6caaef33..40db3a070 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/db-with-agent/README.md b/modules/azurerm/db-with-agent/README.md index 6a7eb8d35..ad56803a8 100644 --- a/modules/azurerm/db-with-agent/README.md +++ b/modules/azurerm/db-with-agent/README.md @@ -81,4 +81,4 @@ module "db_with_agent" { ## Additional Information For more information about the DAM Agent 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.5). +For additional information about DSF deployment using terraform, refer to the main repo README [here](https://github.com/imperva/dsfkit/tree/1.7.8). diff --git a/modules/azurerm/dra-admin/README.md b/modules/azurerm/dra-admin/README.md index de6983c10..b1b1e9248 100644 --- a/modules/azurerm/dra-admin/README.md +++ b/modules/azurerm/dra-admin/README.md @@ -83,4 +83,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.3). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/dra-admin/image.tf b/modules/azurerm/dra-admin/image.tf index 9b77b4c87..8d7357849 100644 --- a/modules/azurerm/dra-admin/image.tf +++ b/modules/azurerm/dra-admin/image.tf @@ -4,23 +4,23 @@ locals { vm_user = var.vm_user != null ? var.vm_user : local.vm_default_user create_image_from_vhd = var.image_vhd_details.vhd != null ? true : false - use_existing_image = var.image_vhd_details.image != null ? true : false + use_existing_image = var.image_vhd_details.image != null ? true : false image_id = (local.use_existing_image ? "${data.azurerm_subscription.subscription.id}/resourceGroups/${var.image_vhd_details.image.resource_group_name}/providers/Microsoft.Compute/images/${var.image_vhd_details.image.image_id}" : - "${azurerm_image.created_image[0].id}") + "${azurerm_image.created_image[0].id}") } resource "azurerm_image" "created_image" { - count = local.create_image_from_vhd ? 1 : 0 + count = local.create_image_from_vhd ? 1 : 0 name = join("-", [var.name, "image"]) location = var.resource_group.location resource_group_name = var.resource_group.name os_disk { - os_type = "Linux" - caching = "ReadWrite" + os_type = "Linux" + caching = "ReadWrite" os_state = "Generalized" blob_uri = "https://${var.image_vhd_details.vhd.storage_account_name}.blob.core.windows.net/${var.image_vhd_details.vhd.container_name}/${var.image_vhd_details.vhd.path_to_vhd}" } diff --git a/modules/azurerm/dra-admin/main.tf b/modules/azurerm/dra-admin/main.tf index 15e10ec2b..a397f7f7a 100644 --- a/modules/azurerm/dra-admin/main.tf +++ b/modules/azurerm/dra-admin/main.tf @@ -10,9 +10,9 @@ locals { admin_ssh_password_secret_name = azurerm_key_vault_secret.ssh_password.name }) -# readiness_script = templatefile("${path.module}/../dra-analytics/waiter.tftpl", { -# admin_server_public_ip = try(local.public_ip, local.private_ip) -# }) + # readiness_script = templatefile("${path.module}/../dra-analytics/waiter.tftpl", { + # admin_server_public_ip = try(local.public_ip, local.private_ip) + # }) } resource "azurerm_network_interface" "nic" { @@ -45,11 +45,11 @@ resource "azurerm_public_ip" "vm_public_ip" { } resource "azurerm_linux_virtual_machine" "vm" { - name = var.name - resource_group_name = var.resource_group.name - location = var.resource_group.location - size = var.instance_size - admin_username = local.vm_user + name = var.name + resource_group_name = var.resource_group.name + location = var.resource_group.location + size = var.instance_size + admin_username = local.vm_user network_interface_ids = [ azurerm_network_interface.nic.id diff --git a/modules/azurerm/dra-admin/sg.tf b/modules/azurerm/dra-admin/sg.tf index 0c9ec374d..88667cf1f 100644 --- a/modules/azurerm/dra-admin/sg.tf +++ b/modules/azurerm/dra-admin/sg.tf @@ -58,16 +58,16 @@ resource "azurerm_network_security_group" "dsf_base_sg" { cidr = v, min_ip_int = (tonumber(split(".", cidrhost(v, 0))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, 0))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, 0))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, 0))[3]) max_ip_int = (tonumber(split(".", cidrhost(v, -1))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, -1))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, -1))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, -1))[3]) - } } : v.cidr if !anytrue([for i in { for v in security_rule.value.cidrs : v => { - cidr = v, - min_ip_int = (tonumber(split(".", cidrhost(v, 0))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, 0))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, 0))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, 0))[3]) - max_ip_int = (tonumber(split(".", cidrhost(v, -1))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, -1))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, -1))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, -1))[3]) + } } : v.cidr if !anytrue([for i in { for v in security_rule.value.cidrs : v => { + cidr = v, + min_ip_int = (tonumber(split(".", cidrhost(v, 0))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, 0))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, 0))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, 0))[3]) + max_ip_int = (tonumber(split(".", cidrhost(v, -1))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, -1))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, -1))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, -1))[3]) } } : v.max_ip_int <= i.max_ip_int && v.min_ip_int >= i.min_ip_int if v.cidr != i.cidr])] destination_address_prefix = "*" # The below setup is a workaround for "Provider produced inconsistent final plan" error - description = "" + description = "" destination_port_range = "" - source_address_prefix = "" + source_address_prefix = "" } } tags = var.tags diff --git a/modules/azurerm/dra-admin/variables.tf b/modules/azurerm/dra-admin/variables.tf index 0d13bcb69..62b30fc26 100644 --- a/modules/azurerm/dra-admin/variables.tf +++ b/modules/azurerm/dra-admin/variables.tf @@ -34,9 +34,9 @@ variable "instance_size" { } variable "ssh_public_key" { - type = string + type = string description = "SSH public key to access machine" - nullable = false + nullable = false } variable "image_vhd_details" { @@ -52,7 +52,7 @@ variable "image_vhd_details" { })) }) description = "Image or VHD details for the Admin Server" - default = null + default = null validation { condition = try((var.image_vhd_details.image != null && var.image_vhd_details.vhd == null || (var.image_vhd_details.image == null && var.image_vhd_details.vhd != null)), false) @@ -62,10 +62,10 @@ variable "image_vhd_details" { condition = var.image_vhd_details.image == null || try(var.image_vhd_details.image.resource_group_name != null && var.image_vhd_details.image.image_id != null, false) error_message = "Image value must either be null or specified for all" } - validation { - condition = var.image_vhd_details.vhd == null || try(var.image_vhd_details.vhd.path_to_vhd != null && var.image_vhd_details.vhd.storage_account_name != null && var.image_vhd_details.vhd.container_name != null, false) - error_message = "VHD value must either be null or specified for all" - } + validation { + condition = var.image_vhd_details.vhd == null || try(var.image_vhd_details.vhd.path_to_vhd != null && var.image_vhd_details.vhd.storage_account_name != null && var.image_vhd_details.vhd.container_name != null, false) + error_message = "VHD value must either be null or specified for all" + } } variable "vm_user" { @@ -222,8 +222,8 @@ variable "storage_details" { }) description = "Compute instance volume attributes for the Admin Server" default = { - disk_size = 260 - volume_caching = "ReadWrite" + disk_size = 260 + volume_caching = "ReadWrite" storage_account_type = "Standard_LRS" } } diff --git a/modules/azurerm/dra-analytics/README.md b/modules/azurerm/dra-analytics/README.md index 546461145..83b53c835 100644 --- a/modules/azurerm/dra-analytics/README.md +++ b/modules/azurerm/dra-analytics/README.md @@ -91,4 +91,4 @@ module "dsf_dra_analytics" { 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.3). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/dra-analytics/image.tf b/modules/azurerm/dra-analytics/image.tf index 9b77b4c87..8d7357849 100644 --- a/modules/azurerm/dra-analytics/image.tf +++ b/modules/azurerm/dra-analytics/image.tf @@ -4,23 +4,23 @@ locals { vm_user = var.vm_user != null ? var.vm_user : local.vm_default_user create_image_from_vhd = var.image_vhd_details.vhd != null ? true : false - use_existing_image = var.image_vhd_details.image != null ? true : false + use_existing_image = var.image_vhd_details.image != null ? true : false image_id = (local.use_existing_image ? "${data.azurerm_subscription.subscription.id}/resourceGroups/${var.image_vhd_details.image.resource_group_name}/providers/Microsoft.Compute/images/${var.image_vhd_details.image.image_id}" : - "${azurerm_image.created_image[0].id}") + "${azurerm_image.created_image[0].id}") } resource "azurerm_image" "created_image" { - count = local.create_image_from_vhd ? 1 : 0 + count = local.create_image_from_vhd ? 1 : 0 name = join("-", [var.name, "image"]) location = var.resource_group.location resource_group_name = var.resource_group.name os_disk { - os_type = "Linux" - caching = "ReadWrite" + os_type = "Linux" + caching = "ReadWrite" os_state = "Generalized" blob_uri = "https://${var.image_vhd_details.vhd.storage_account_name}.blob.core.windows.net/${var.image_vhd_details.vhd.container_name}/${var.image_vhd_details.vhd.path_to_vhd}" } diff --git a/modules/azurerm/dra-analytics/main.tf b/modules/azurerm/dra-analytics/main.tf index 8cedaf8df..5a74a8241 100644 --- a/modules/azurerm/dra-analytics/main.tf +++ b/modules/azurerm/dra-analytics/main.tf @@ -40,11 +40,11 @@ resource "azurerm_network_interface_security_group_association" "nic_sg_associat } resource "azurerm_linux_virtual_machine" "vm" { - name = var.name - resource_group_name = var.resource_group.name - location = var.resource_group.location - size = var.instance_size - admin_username = local.vm_user + name = var.name + resource_group_name = var.resource_group.name + location = var.resource_group.location + size = var.instance_size + admin_username = local.vm_user network_interface_ids = [ azurerm_network_interface.nic.id diff --git a/modules/azurerm/dra-analytics/sg.tf b/modules/azurerm/dra-analytics/sg.tf index 6635f8547..d8b228b10 100644 --- a/modules/azurerm/dra-analytics/sg.tf +++ b/modules/azurerm/dra-analytics/sg.tf @@ -58,16 +58,16 @@ resource "azurerm_network_security_group" "dsf_base_sg" { cidr = v, min_ip_int = (tonumber(split(".", cidrhost(v, 0))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, 0))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, 0))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, 0))[3]) max_ip_int = (tonumber(split(".", cidrhost(v, -1))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, -1))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, -1))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, -1))[3]) - } } : v.cidr if !anytrue([for i in { for v in security_rule.value.cidrs : v => { - cidr = v, - min_ip_int = (tonumber(split(".", cidrhost(v, 0))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, 0))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, 0))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, 0))[3]) - max_ip_int = (tonumber(split(".", cidrhost(v, -1))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, -1))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, -1))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, -1))[3]) + } } : v.cidr if !anytrue([for i in { for v in security_rule.value.cidrs : v => { + cidr = v, + min_ip_int = (tonumber(split(".", cidrhost(v, 0))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, 0))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, 0))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, 0))[3]) + max_ip_int = (tonumber(split(".", cidrhost(v, -1))[0]) * pow(256, 3)) + (tonumber(split(".", cidrhost(v, -1))[1]) * pow(256, 2)) + (tonumber(split(".", cidrhost(v, -1))[2]) * pow(256, 1)) + tonumber(split(".", cidrhost(v, -1))[3]) } } : v.max_ip_int <= i.max_ip_int && v.min_ip_int >= i.min_ip_int if v.cidr != i.cidr])] destination_address_prefix = "*" # The below setup is a workaround for "Provider produced inconsistent final plan" error - description = "" + description = "" destination_port_range = "" - source_address_prefix = "" + source_address_prefix = "" } } tags = var.tags diff --git a/modules/azurerm/dra-analytics/variables.tf b/modules/azurerm/dra-analytics/variables.tf index 99c3556e6..b69f4f5bf 100644 --- a/modules/azurerm/dra-analytics/variables.tf +++ b/modules/azurerm/dra-analytics/variables.tf @@ -49,16 +49,16 @@ variable "storage_details" { }) description = "Compute instance volume attributes for the Analytics Server" default = { - disk_size = 1010 - volume_caching = "ReadWrite" + disk_size = 1010 + volume_caching = "ReadWrite" storage_account_type = "Standard_LRS" } } variable "ssh_public_key" { - type = string + type = string description = "SSH public key to access machine" - nullable = false + nullable = false } variable "image_vhd_details" { @@ -74,7 +74,7 @@ variable "image_vhd_details" { })) }) description = "Image or VHD details for the Admin Server" - default = null + default = null validation { condition = try((var.image_vhd_details.image != null && var.image_vhd_details.vhd == null || (var.image_vhd_details.image == null && var.image_vhd_details.vhd != null)), false) diff --git a/modules/azurerm/hub/README.md b/modules/azurerm/hub/README.md index e87327f99..b90bb05c7 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.5). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/mssql-db/README.md b/modules/azurerm/mssql-db/README.md index cf7b1b709..57526784f 100644 --- a/modules/azurerm/mssql-db/README.md +++ b/modules/azurerm/mssql-db/README.md @@ -54,4 +54,4 @@ module "dsf_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.5). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/mssql-db/main.tf b/modules/azurerm/mssql-db/main.tf index 775ac1e07..a3a48c1e7 100644 --- a/modules/azurerm/mssql-db/main.tf +++ b/modules/azurerm/mssql-db/main.tf @@ -6,10 +6,10 @@ resource "random_password" "db_password" { resource "random_pet" "db_id" {} locals { - db_username = var.username - db_password = length(var.password) > 0 ? var.password : random_password.db_password.result - db_identifier = length(var.identifier) > 0 ? var.identifier : "edsf-db-demo-${random_pet.db_id.id}" - db_address = "${local.db_identifier}.database.windows.net" + db_username = var.username + db_password = length(var.password) > 0 ? var.password : random_password.db_password.result + db_identifier = length(var.identifier) > 0 ? var.identifier : "edsf-db-demo-${random_pet.db_id.id}" + db_address = "${local.db_identifier}.database.windows.net" server_name = local.db_identifier database_name = local.db_identifier eventhub_ns_name = local.db_identifier @@ -31,10 +31,10 @@ resource "azurerm_mssql_server" "server" { resource "azurerm_mssql_firewall_rule" "allow_inbound" { count = length(var.security_group_ingress_cidrs) - name = join("-", [local.server_name, count.index]) - server_id = azurerm_mssql_server.server.id - start_ip_address = cidrhost(var.security_group_ingress_cidrs[count.index], 0) - end_ip_address = cidrhost(var.security_group_ingress_cidrs[count.index], -1) + name = join("-", [local.server_name, count.index]) + server_id = azurerm_mssql_server.server.id + start_ip_address = cidrhost(var.security_group_ingress_cidrs[count.index], 0) + end_ip_address = cidrhost(var.security_group_ingress_cidrs[count.index], -1) } resource "azurerm_mssql_database" "db" { @@ -53,7 +53,7 @@ resource "azurerm_mssql_server_extended_auditing_policy" "policy" { storage_account_access_key_is_secondary = false retention_in_days = 0 - enabled = true + enabled = true log_monitoring_enabled = true storage_account_subscription_id = data.azurerm_subscription.current.subscription_id @@ -83,8 +83,8 @@ data "azurerm_eventhub_namespace_authorization_rule" "auth_rule" { } resource "azurerm_monitor_diagnostic_setting" "settings" { - name = "sonar_diagnostic_settings" - target_resource_id = "${azurerm_mssql_database.db.server_id}/databases/master" # creates an expilicit dependency on the database + name = "sonar_diagnostic_settings" + target_resource_id = "${azurerm_mssql_database.db.server_id}/databases/master" # creates an expilicit dependency on the database eventhub_authorization_rule_id = data.azurerm_eventhub_namespace_authorization_rule.auth_rule.id eventhub_name = azurerm_eventhub.eventhub.name @@ -95,9 +95,9 @@ resource "azurerm_monitor_diagnostic_setting" "settings" { } resource "azurerm_storage_account" "sa" { - name = "sonar${replace(random_pet.db_id.id, "-", "")}" - resource_group_name = var.resource_group.name - location = var.resource_group.location + name = "sonar${replace(random_pet.db_id.id, "-", "")}" + resource_group_name = var.resource_group.name + location = var.resource_group.location account_tier = "Standard" account_replication_type = "LRS" diff --git a/modules/azurerm/mx/README.md b/modules/azurerm/mx/README.md index f228a2ec2..dca01fa1d 100644 --- a/modules/azurerm/mx/README.md +++ b/modules/azurerm/mx/README.md @@ -84,4 +84,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.5). \ 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.8). \ No newline at end of file diff --git a/modules/azurerm/mx/dra.tf b/modules/azurerm/mx/dra.tf index e5ab7459a..1ef21d652 100644 --- a/modules/azurerm/mx/dra.tf +++ b/modules/azurerm/mx/dra.tf @@ -1,5 +1,5 @@ locals { - dra_action_set = "Send to DRA Behavior Analytics" + dra_action_set = "Send to DRA Behavior Analytics" # todo - currently it is not working because there is a bug in the mx dra_all_events_audit_policy = "CounterBreach for Database - All Events" dra_all_logins_audit_policy = "CounterBreach for Database - Logins Logouts" @@ -25,7 +25,7 @@ locals { "useAuthenticationKey" : false, "authenticationKeyPath" : " ", "authenticationKeyPassphrase" : " " - } + } ) }, { @@ -47,7 +47,7 @@ locals { "at-time" : "03:00:00" } } - } + } ) }, { @@ -69,7 +69,7 @@ locals { "at-time" : "02:30:00" } } - } + } ) } ] diff --git a/modules/azurerm/poc-db-onboarder/main.tf b/modules/azurerm/poc-db-onboarder/main.tf index 7b6a3691f..69fbb9637 100644 --- a/modules/azurerm/poc-db-onboarder/main.tf +++ b/modules/azurerm/poc-db-onboarder/main.tf @@ -21,36 +21,36 @@ module "onboard_db_to_dsf" { source = "../../../modules/null/poc-db-onboarder" assignee_gw = var.assignee_gw - + usc_access_token = var.usc_access_token - enable_audit = var.enable_audit - + enable_audit = var.enable_audit + database_data = { - id = var.database_details.db_server_id - name = var.database_details.db_identifier - location = var.resource_group.location - hostname = var.database_details.db_address - port = var.database_details.db_port + id = var.database_details.db_server_id + name = var.database_details.db_identifier + location = var.resource_group.location + hostname = var.database_details.db_address + port = var.database_details.db_port server_type = local.server_type_by_engine_map[var.database_details.db_engine] } cloud_account_data = { - id = data.azurerm_subscription.current.id + id = data.azurerm_subscription.current.id name = data.azurerm_subscription.current.display_name type = "AZURE" connections_data = [ - { - reason = "default" - connectionData = { - auth_mechanism = "managed_identity" - subscription_id = data.azurerm_subscription.current.subscription_id, + { + reason = "default" + connectionData = { + auth_mechanism = "managed_identity" + subscription_id = data.azurerm_subscription.current.subscription_id, + } } - } - ] + ] } - hub_info = var.hub_info - hub_proxy_info = var.hub_proxy_info + hub_info = var.hub_info + hub_proxy_info = var.hub_proxy_info terraform_script_path_folder = var.terraform_script_path_folder - depends_on = [ azurerm_role_assignment.dsf_base_owner_role_assignment ] + depends_on = [azurerm_role_assignment.dsf_base_owner_role_assignment] } diff --git a/modules/azurerm/sonar-base-instance/secret.tf b/modules/azurerm/sonar-base-instance/secret.tf index fdbdd226f..9677630e9 100644 --- a/modules/azurerm/sonar-base-instance/secret.tf +++ b/modules/azurerm/sonar-base-instance/secret.tf @@ -99,7 +99,7 @@ resource "azurerm_key_vault_secret" "password_key_secret" { } resource "azurerm_key_vault_secret" "access_tokens" { - count = length(local.access_tokens) + count = length(local.access_tokens) # dots are somewhat common in server names, but aren't allowed in vault secrets name = join("-", [replace(var.name, ".", "-"), local.access_tokens[count.index].name, "access", "token"]) value = random_uuid.access_tokens[count.index].result diff --git a/modules/null/poc-db-onboarder/main.tf b/modules/null/poc-db-onboarder/main.tf index d6de1fa7a..a092bac9c 100644 --- a/modules/null/poc-db-onboarder/main.tf +++ b/modules/null/poc-db-onboarder/main.tf @@ -7,7 +7,7 @@ locals { locals { applianceType = "DSF_HUB" - admin_email = "admin@email.com" + admin_email = "admin@email.com" cloud_account_data = { data = { diff --git a/modules/sonar_python_upgrader_1_7_5.zip b/modules/sonar_python_upgrader_1_7_8.zip similarity index 75% rename from modules/sonar_python_upgrader_1_7_5.zip rename to modules/sonar_python_upgrader_1_7_8.zip index 50dbfb968..ec768ba26 100644 Binary files a/modules/sonar_python_upgrader_1_7_5.zip and b/modules/sonar_python_upgrader_1_7_8.zip differ diff --git a/sed.expr b/sed.expr index 7819c3988..ffa1f1e08 100644 --- a/sed.expr +++ b/sed.expr @@ -23,4 +23,6 @@ s;imperva/dsf-sonar-upgrader/aws;../../../modules/aws/sonar-upgrader; s;imperva/dsf-mx/azurerm;../../../../modules/azurerm/mx; s;imperva/dsf-agent-gw/azurerm;../../../../modules/azurerm/agent-gw; s;imperva/dsf-db-with-agent/azurerm;../../../../modules/azurerm/db-with-agent; +s;imperva/dsf-dra-admin/azurerm;../../../../modules/azurerm/dra-admin; +s;imperva/dsf-dra-analytics/azurerm;../../../../modules/azurerm/dra-analytics; /latest release tag/c\ \ No newline at end of file