Merge branch 'dev' into web-cidr-linda

examples/aws/installation/dsf_single_account_deployment/sonar.tf

@@ -37,7 +37,7 @@ module "hub_main" {
   allowed_hub_cidrs                 = [data.aws_subnet.hub_dr.cidr_block]
   allowed_agentless_gw_cidrs        = local.agentless_gw_cidr_list
   allowed_dra_admin_cidrs           = local.dra_admin_cidr_list
-  allowed_all_cidrs                 = var.proxy_private_address != null ? concat(local.workstation_cidr, ["${var.proxy_private_address}/32"]) : local.workstation_cidr
+  allowed_all_cidrs                 = var.proxy_private_address != null ? ["${var.proxy_private_address}/32"] : local.workstation_cidr
   skip_instance_health_verification = var.hub_skip_instance_health_verification
   terraform_script_path_folder      = var.sonar_terraform_script_path_folder
   sonarw_private_key_secret_name    = var.sonarw_hub_private_key_secret_name
@@ -95,7 +95,7 @@ module "hub_dr" {
   allowed_hub_cidrs                 = [data.aws_subnet.hub_main.cidr_block]
   allowed_agentless_gw_cidrs        = local.agentless_gw_cidr_list
   allowed_dra_admin_cidrs           = local.dra_admin_cidr_list
-  allowed_all_cidrs                 = var.proxy_private_address != null ? concat(local.workstation_cidr, ["${var.proxy_private_address}/32"]) : local.workstation_cidr
+  allowed_all_cidrs                 = var.proxy_private_address != null ? ["${var.proxy_private_address}/32"] : local.workstation_cidr
   skip_instance_health_verification = var.hub_skip_instance_health_verification
   terraform_script_path_folder      = var.sonar_terraform_script_path_folder
   sonarw_private_key_secret_name    = var.sonarw_hub_private_key_secret_name
@@ -161,7 +161,7 @@ module "agentless_gw_main" {
   } : null
   allowed_agentless_gw_cidrs        = [data.aws_subnet.agentless_gw_dr.cidr_block]
   allowed_hub_cidrs                 = [data.aws_subnet.hub_main.cidr_block, data.aws_subnet.hub_dr.cidr_block]
-  allowed_all_cidrs                 = var.proxy_private_address != null ? concat(local.workstation_cidr, ["${var.proxy_private_address}/32"]) : local.workstation_cidr
+  allowed_all_cidrs                 = var.proxy_private_address != null ? ["${var.proxy_private_address}/32"] : local.workstation_cidr
   skip_instance_health_verification = var.hub_skip_instance_health_verification
   terraform_script_path_folder      = var.sonar_terraform_script_path_folder
   sonarw_private_key_secret_name    = var.sonarw_gw_private_key_secret_name
@@ -204,7 +204,7 @@ module "agentless_gw_dr" {
   } : null
   allowed_agentless_gw_cidrs        = [data.aws_subnet.agentless_gw_main.cidr_block]
   allowed_hub_cidrs                 = [data.aws_subnet.hub_main.cidr_block, data.aws_subnet.hub_dr.cidr_block]
-  allowed_all_cidrs                 = var.proxy_private_address != null ? concat(local.workstation_cidr, ["${var.proxy_private_address}/32"]) : local.workstation_cidr
+  allowed_all_cidrs                 = var.proxy_private_address != null ? ["${var.proxy_private_address}/32"] : local.workstation_cidr
   skip_instance_health_verification = var.hub_skip_instance_health_verification
   terraform_script_path_folder      = var.sonar_terraform_script_path_folder
   sonarw_private_key_secret_name    = var.sonarw_gw_private_key_secret_name

examples/aws/installation/dsf_single_account_deployment/variables.tf

@@ -1,7 +1,7 @@
 variable "deployment_name" {
   type        = string
   default     = "imperva-dsf"
-  description = "Deployment name for some of the created resources. Please note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
+  description = "Deployment name for some of the created resources. Note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
 }
 
 variable "aws_profile" {
@@ -22,7 +22,7 @@ variable "aws_region_2" {
 variable "additional_tags" {
   type        = list(string)
   default     = []
-  description = "Additional tags to add to the DSFKit resources. Please put tags in the following format - Key: Name. For example - [\"Key1=Name1\", \"Key2=Name2\"]"
+  description = "Additional tags to add to the DSFKit resources. Put tags in the following format - Key: Name. For example - [\"Key1=Name1\", \"Key2=Name2\"]"
   validation {
     condition = alltrue([
       for tag_pair in var.additional_tags : can(regex("^([a-zA-Z0-9+\\-_.:/@]+)=([a-zA-Z0-9+\\-_.:/]+)$", tag_pair))
@@ -110,13 +110,13 @@ variable "proxy_ssh_user" {
 variable "web_console_cidr" {
   type        = list(string)
   default     = []
-  description = "DSF Hub and MX web console IPs range. Please specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
+  description = "DSF Hub, MX and DRA Admin web consoles IPs range. Specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
 }
 
 variable "workstation_cidr" {
   type        = list(string)
   default     = null
-  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
+  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the subnet (x.x.x.0/24) of the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
 }
 
 variable "subnet_ids" {

examples/aws/installation/sonar_multi_account_deployment/variables.tf

@@ -1,7 +1,7 @@
 variable "deployment_name" {
   type        = string
   default     = "imperva-dsf"
-  description = "Deployment name for some of the created resources. Please note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
+  description = "Deployment name for some of the created resources. Note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
 }
 
 variable "sonar_version" {
@@ -47,7 +47,7 @@ variable "aws_region_gw_dr" {
 variable "additional_tags" {
   type        = list(string)
   default     = []
-  description = "Additional tags to add to the DSFKit resources. Please put tags in the following format - Key: Name. For example - [\"Key1=Name1\", \"Key2=Name2\"]"
+  description = "Additional tags to add to the DSFKit resources. Put tags in the following format - Key: Name. For example - [\"Key1=Name1\", \"Key2=Name2\"]"
   validation {
     condition = alltrue([
       for tag_pair in var.additional_tags : can(regex("^([a-zA-Z0-9+\\-_.:/@]+)=([a-zA-Z0-9+\\-_.:/]+)$", tag_pair))
@@ -164,13 +164,13 @@ variable "password_secret_name" {
 variable "web_console_cidr" {
   type        = list(string)
   default     = []
-  description = "DSF Hub web console IPs range. Please specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
+  description = "DSF Hub web console IPs range. Specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
 }
 
 variable "workstation_cidr" {
   type        = list(string)
   default     = null
-  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
+  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the subnet (x.x.x.0/24) of the public IP of the computer where the Terraform is run is used Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
 }
 
 variable "hub_ebs_details" {

examples/aws/installation/sonar_single_account_deployment/variables.tf

@@ -1,7 +1,7 @@
 variable "deployment_name" {
   type        = string
   default     = "imperva-dsf"
-  description = "Deployment name for some of the created resources. Please note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
+  description = "Deployment name for some of the created resources. Note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
 }
 
 variable "aws_profile" {
@@ -27,7 +27,7 @@ variable "sonar_version" {
 variable "additional_tags" {
   type        = list(string)
   default     = []
-  description = "Additional tags to add to the DSFKit resources. Please put tags in the following format - Key: Name. For example - [\"Key1=Name1\", \"Key2=Name2\"]"
+  description = "Additional tags to add to the DSFKit resources. Put tags in the following format - Key: Name. For example - [\"Key1=Name1\", \"Key2=Name2\"]"
   validation {
     condition = alltrue([
       for tag_pair in var.additional_tags : can(regex("^([a-zA-Z0-9+\\-_.:/@]+)=([a-zA-Z0-9+\\-_.:/]+)$", tag_pair))
@@ -111,13 +111,13 @@ variable "password_secret_name" {
 variable "web_console_cidr" {
   type        = list(string)
   default     = []
-  description = "DSF Hub web console IPs range. Please specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
+  description = "DSF Hub web console IPs range. Specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
 }
 
 variable "workstation_cidr" {
   type        = list(string)
   default     = null
-  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
+  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the subnet (x.x.x.0/24) of the public IP of the computer where the Terraform is run is used Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
 }
 
 variable "hub_ebs_details" {

examples/aws/poc/dsf_deployment/variables.tf

@@ -7,7 +7,7 @@ variable "tags" {
 variable "deployment_name" {
   type        = string
   default     = "imperva-dsf"
-  description = "Deployment name for some of the created resources. Please note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
+  description = "Deployment name for some of the created resources. Note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
 }
 
 variable "enable_sonar" {
@@ -59,13 +59,13 @@ variable "password" {
 variable "web_console_cidr" {
   type        = list(string)
   default     = ["0.0.0.0/0"]
-  description = "DSF Hub and MX web console IPs range. Please specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
+  description = "DSF Hub, MX and DRA Admin web consoles IPs range. Specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
 }
 
 variable "workstation_cidr" {
   type        = list(string)
   default     = null
-  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
+  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the subnet (x.x.x.0/24) of the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
 }
 
 variable "vpc_ip_range" {

examples/aws/poc/sonar_basic_deployment/variables.tf

@@ -1,7 +1,7 @@
 variable "deployment_name" {
   type        = string
   default     = "imperva-dsf"
-  description = "Deployment name for some of the created resources. Please note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
+  description = "Deployment name for some of the created resources. Note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
 }
 
 variable "sonar_version" {
@@ -30,7 +30,7 @@ variable "password" {
 variable "web_console_cidr" {
   type        = list(string)
   default     = ["0.0.0.0/0"]
-  description = "DSF Hub web console IPs range. Please specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
+  description = "DSF Hub web console IPs range. Note that when running the deployment specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
 }
 
 variable "database_cidr" {
@@ -42,7 +42,7 @@ variable "database_cidr" {
 variable "workstation_cidr" {
   type        = list(string)
   default     = null
-  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
+  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the subnet (x.x.x.0/24) of the public IP of the computer where the Terraform is run is used Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
 }
 
 variable "additional_install_parameters" {

examples/aws/poc/sonar_hadr_deployment/variables.tf

@@ -1,7 +1,7 @@
 variable "deployment_name" {
   type        = string
   default     = "imperva-dsf"
-  description = "Deployment name for some of the created resources. Please note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
+  description = "Deployment name for some of the created resources. Note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
 }
 
 variable "sonar_version" {
@@ -56,7 +56,7 @@ variable "database_cidr" {
 variable "workstation_cidr" {
   type        = list(string)
   default     = null
-  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
+  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the subnet (x.x.x.0/24) of the public IP of the computer where the Terraform is run is used Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
 }
 
 variable "additional_install_parameters" {

examples/azure/poc/dsf_deployment/variables.tf

@@ -19,7 +19,7 @@ variable "resource_group_location" {
 variable "deployment_name" {
   type        = string
   default     = "imperva-dsf"
-  description = "Deployment name for some of the created resources. Please note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
+  description = "Deployment name for some of the created resources. Note that when running the deployment with a custom 'deployment_name' variable, you should ensure that the corresponding condition in the AWS permissions of the user who runs the deployment reflects the new custom variable."
 }
 
 variable "enable_sonar" {
@@ -47,13 +47,13 @@ variable "password" {
 variable "web_console_cidr" {
   type        = list(string)
   default     = ["0.0.0.0/0"]
-  description = "DSF Hub and MX web console IPs range. Please specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
+  description = "DSF Hub and MX web console IPs range. Specify IPs in the following format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]. The default configuration opens the DSF Hub web console as a public website. It is recommended to specify a more restricted IP and CIDR range."
 }
 
 variable "workstation_cidr" {
   type        = list(string)
   default     = null
-  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the public IP of the computer where the Terraform is run is used. Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
+  description = "IP ranges from which SSH/API access will be allowed to setup the deployment. If not set, the subnet (x.x.x.0/24) of the public IP of the computer where the Terraform is run is used Format - [\"x.x.x.x/x\", \"y.y.y.y/y\"]"
 }
 
 variable "vnet_ip_range" {

modules/aws/agent-gw/README.md

@@ -39,7 +39,7 @@ Refer to [variables.tf](variables.tf) for additional variables with default valu
 
 ## Outputs
 
-Please refer to [outputs](outputs.tf) or https://registry.terraform.io/modules/imperva/dsf-agent-gw/aws/latest?tab=outputs
+Refer to [outputs](outputs.tf) or https://registry.terraform.io/modules/imperva/dsf-agent-gw/aws/latest?tab=outputs
 
 
 ## Usage

modules/aws/agentless-gw/README.md

@@ -49,7 +49,7 @@ Refer to [inputs](https://registry.terraform.io/modules/imperva/dsf-agentless-gw
 
 ## Outputs
 
-Please refer to [outputs](https://registry.terraform.io/modules/imperva/dsf-agentless-gw/aws/latest?tab=outputs)
+Refer to [outputs](https://registry.terraform.io/modules/imperva/dsf-agentless-gw/aws/latest?tab=outputs)
 
 
 ## Usage

modules/aws/hub/README.md

@@ -48,7 +48,7 @@ Refer to [inputs](https://registry.terraform.io/modules/imperva/dsf-hub/aws/late
 
 ## Outputs
 
-Please refer to [outputs](https://registry.terraform.io/modules/imperva/dsf-hub/aws/latest?tab=outputs).
+Refer to [outputs](https://registry.terraform.io/modules/imperva/dsf-hub/aws/latest?tab=outputs).
 
 ## Usage
 

modules/aws/mx/README.md

@@ -40,7 +40,7 @@ Refer to [variables.tf](variables.tf) for additional variables with default valu
 
 ## Outputs
 
-Please refer to [outputs](outputs.tf) or https://registry.terraform.io/modules/imperva/dsf-mx/aws/latest?tab=outputs
+Refer to [outputs](outputs.tf) or https://registry.terraform.io/modules/imperva/dsf-mx/aws/latest?tab=outputs
 
 ## Usage
 

modules/azurerm/agentless-gw/README.md

@@ -42,7 +42,7 @@ Refer to [variables.tf](variables.tf) for additional variables with default valu
 
 ## Outputs
 
-Please refer to [outputs](outputs.tf) or https://registry.terraform.io/modules/imperva/dsf-agentless-gw/aws/latest?tab=outputs
+Refer to [outputs](outputs.tf) or https://registry.terraform.io/modules/imperva/dsf-agentless-gw/aws/latest?tab=outputs
 
 ## Usage