Skip to content

Commit

Permalink
Automatic commit before release [release=1.4.6] | [skip actions]
Browse files Browse the repository at this point in the history
  • Loading branch information
@lindanasredin @github-actions
lindanasredin authored and github-actions[bot] committed May 28, 2023
1 parent c86f60f commit 9091f6f
Show file tree
Hide file tree
Showing 56 changed files with 370 additions and 370 deletions.
44 changes: 22 additions & 22 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ This guide references the following information and links, some of which are ava
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5">DSFKit GitHub Repository</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6">DSFKit GitHub Repository</a>
</td>
<td>
</td>
Expand All @@ -134,7 +134,7 @@ Latest Supported Terraform Version: 1.4.x. Using a higher version may result in
<td><a href="https://docs.google.com/forms/d/e/1FAIpQLSfgJh4kXYRD08xDsFyYgaYsS3ebhVrBTWvntcMCutSf0kNV2w/viewform">Open Terraform Cloud Account - Request Form</a>
</td>
<td>Grants access for a specific e-mail address to Imperva's Terraform Cloud account.
Required for <a href="https://github.com/imperva/dsfkit/tree/1.4.5#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
Required for <a href="https://github.com/imperva/dsfkit/tree/1.4.6#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -360,7 +360,7 @@ e.g., the number of Agentless Gateways, with or without HADR, the number of VPCs
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 <a href="https://github.com/imperva/dsfkit/tree/1.4.5">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples">examples</a> directory.
These examples can be found in the <a href="https://github.com/imperva/dsfkit/tree/1.4.6">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples">examples</a> 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.
Expand All @@ -377,53 +377,53 @@ For more details about each example, click on the example name.
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/poc/basic_deployment/README.md">Sonar Basic Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/poc/basic_deployment/README.md">Sonar Basic Deployment</a>
</td>
<td>Lab/POC
</td>
<td>A DSF deployment with a DSF Hub, an Agentless Gateway, federation, networking and onboarding of a MySQL DB.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/poc/hadr_deployment/README.md">Sonar HADR Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/poc/hadr_deployment/README.md">Sonar HADR Deployment</a>
</td>
<td>Lab/POC
</td>
<td>A DSF deployment with a DSF Hub, an Agentless Gateway, DSF Hub and Agentless Gateway HADR, federation, networking and onboarding of a MySQL DB.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/poc/hadr_deployment/hadr_deployment.zip">hadr_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/poc/hadr_deployment/hadr_deployment.zip">hadr_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/installation/single_account_deployment/README.md">Sonar Single Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/installation/single_account_deployment/README.md">Sonar Single Account Deployment</a>
</td>
<td>PS/Customer
</td>
<td>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.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/installation/single_account_deployment/single_account_deployment.zip">single_account_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/installation/single_account_deployment/single_account_deployment.zip">single_account_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/installation/multi_account_deployment/README.md">Sonar Multi Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/installation/multi_account_deployment/README.md">Sonar Multi Account Deployment</a>
</td>
<td>PS/Customer
</td>
<td>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.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/installation/multi_account_deployment/multi_account_deployment.zip">multi_account_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/installation/multi_account_deployment/multi_account_deployment.zip">multi_account_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/alpha/dam_basic_deployment/README.md">DAM Basic Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/alpha/dam_basic_deployment/README.md">DAM Basic Deployment</a>
</td>
<td>Lab/POC
</td>
<td>A DSF deployment with an MX, an Agent Gateway, networking and onboarding of an Agent with a randomly selected DB type: PostgreSql, MySql or MariaDB.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip">dam_basic_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip">dam_basic_deployment.zip</a>
</td>
</tr>
</table>
Expand Down Expand Up @@ -486,7 +486,7 @@ The first thing to do in this deployment mode is to [download Terraform ](https:
**NOTE:** Update the values for the required parameters to complete the installation: example_name, aws_access_key_id, aws_secret_access_key and region
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 <a href="https://github.com/imperva/dsfkit/tree/1.4.5">DSFKit GitHub Repository</a>, e.g., if you choose the "basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>.
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 <a href="https://github.com/imperva/dsfkit/tree/1.4.6">DSFKit GitHub Repository</a>, e.g., if you choose the "basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>.
2. Unzip the zip file in CLI or using your operating system's UI.
For example, in CLI:
Expand Down Expand Up @@ -698,7 +698,7 @@ This mode is similar to the CLI mode except that the Terraform is run on an EC2
7. Expand the “Advanced details” panel:<br>![Advanced details](https://user-images.githubusercontent.com/87799317/203825918-31879c4b-ca61-48e3-a522-c325335c4419.png)
8. Copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.4.5/installer_machine/installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox.<br>![User data](https://user-images.githubusercontent.com/87799317/203826003-661c829f-d704-43c4-adb7-854b8008577c.png)
8. Copy and paste the contents of this [bash script](https://github.com/imperva/dsfkit/blob/1.4.6/installer_machine/installer_machine_user_data.sh) into the [User data](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) textbox.<br>![User data](https://user-images.githubusercontent.com/87799317/203826003-661c829f-d704-43c4-adb7-854b8008577c.png)
9. Click on **Launch Instance**. At this stage, the installer machine is initializing and downloading the necessary dependencies.
Expand All @@ -717,26 +717,26 @@ This mode is similar to the CLI mode except that the Terraform is run on an EC2
For example: `chmode 400 a_key_pair.pem`
11. 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 <a href="https://github.com/imperva/dsfkit/tree/1.4.5">DSFKit GitHub Repository</a>, e.g., if you choose the "basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>.
11. 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 <a href="https://github.com/imperva/dsfkit/tree/1.4.6">DSFKit GitHub Repository</a>, e.g., if you choose the "basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>.
Run:
```bash
wget https://github.com/imperva/dsfkit/raw/1.4.5/examples/poc/basic_deployment/basic_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.4.6/examples/poc/basic_deployment/basic_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.4.5/examples/poc/hadr_deployment/hadr_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.4.6/examples/poc/hadr_deployment/hadr_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.4.5/examples/installation/single_account_deployment/single_account_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.4.6/examples/installation/single_account_deployment/single_account_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.4.5/examples/installation/multi_account_deployment/multi_account_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.4.6/examples/installation/multi_account_deployment/multi_account_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.4.5/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.4.6/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip
```
12. Unzip the zip file:
Expand Down Expand Up @@ -826,7 +826,7 @@ In case of failure, the Terraform may have deployed some resources before failin
Information about additional topics can be found in specific examples' READMEs, when relevant.
For example: <a href="https://github.com/imperva/dsfkit/tree/1.4.5/examples/installation/single_account_deployment/README.md">Single Account Deployment</a>
For example: <a href="https://github.com/imperva/dsfkit/tree/1.4.6/examples/installation/single_account_deployment/README.md">Single Account Deployment</a>
These topics include:
- Storing Terraform state in S3 bucket
Expand Down
Binary file modified examples/alpha/dam_basic_deployment/dam_basic_deployment.zip
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions examples/alpha/dam_basic_deployment/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ provider "aws" {
}

module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.4.5" # latest release tag
source = "imperva/dsf-globals/aws"
version = "1.4.6" # latest release tag

tags = local.tags
}

module "key_pair" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.4.5" # latest release tag
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.4.6" # latest release tag

key_name_prefix = "imperva-dsf-"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}"
tags = local.tags
tags = local.tags
}

locals {
Expand Down Expand Up @@ -59,15 +59,15 @@ module "vpc" {
public_subnets = var.public_subnets_cidr_list

map_public_ip_on_launch = true
tags = local.tags
tags = local.tags
}

##############################
# Generating deployment
##############################
module "mx" {
source = "imperva/dsf-mx/aws"
version = "1.4.5" # latest release tag
source = "imperva/dsf-mx/aws"
version = "1.4.6" # latest release tag

friendly_name = join("-", [local.deployment_name_salted, "mx"])
dam_version = var.dam_version
Expand All @@ -84,17 +84,17 @@ module "mx" {
large_scale_mode = var.large_scale_mode

create_service_group = var.agent_count > 0 ? true : false
tags = local.tags
tags = local.tags
depends_on = [
module.vpc
]
}

module "agent_gw" {
source = "imperva/dsf-agent-gw/aws"
version = "1.4.5" # latest release tag
version = "1.4.6" # latest release tag

count = var.gw_count
count = var.gw_count

friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index])
dam_version = var.dam_version
Expand All @@ -110,16 +110,16 @@ module "agent_gw" {
management_server_host_for_api_access = module.mx.public_ip
large_scale_mode = var.large_scale_mode
gateway_group_name = local.gateway_group_name
tags = local.tags
tags = local.tags
depends_on = [
module.vpc
]
}

module "agent_gw_cluster_setup" {
source = "../../../modules/null/agent-gw-cluster-setup"
cluster_name = local.cluster_name
gateway_group_name = local.gateway_group_name
source = "../../../modules/null/agent-gw-cluster-setup"
cluster_name = local.cluster_name
gateway_group_name = local.gateway_group_name
mx_details = {
address = module.mx.public_ip
port = 8083
Expand All @@ -134,8 +134,8 @@ module "agent_gw_cluster_setup" {

module "agent_monitored_db" {
source = "imperva/dsf-db-with-agent/aws"
version = "1.4.5" # latest release tag
count = var.agent_count
version = "1.4.6" # latest release tag
count = var.agent_count

friendly_name = join("-", [local.deployment_name_salted, "agent", "monitored", "db", count.index])

Expand Down
2 changes: 1 addition & 1 deletion examples/alpha/dam_basic_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variable "gw_count" {
default = 2
description = "Number of DSF Agent Gateways"
validation {
condition = var.gw_count >= 2
condition = var.gw_count >= 2
error_message = "Must be greater or equal to 2"
}
}
Expand Down
Binary file added examples/alpha/dra_basic_deployment/dra_basic_deployment.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/alpha/dra_basic_deployment/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ provider "aws" {}

module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.4.5" # latest release tag
version = "1.4.6" # latest release tag
tags = local.tags
}

module "key_pair" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.4.5" # latest release tag
version = "1.4.6" # latest release tag
key_name_prefix = "imperva-dsf-"
private_key_pem_filename = "ssh_keys/dsf_dra_ssh_key-${terraform.workspace}"
tags = local.tags
Expand Down
4 changes: 2 additions & 2 deletions examples/alpha/dsf_deployment/agent_sources.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ locals {

module "agent_monitored_db" {
source = "imperva/dsf-db-with-agent/aws"
version = "1.4.5" # latest release tag
count = local.agent_count
version = "1.4.6" # latest release tag
count = local.agent_count

friendly_name = join("-", [local.deployment_name_salted, "agent", "monitored", "db", count.index])

Expand Down
10 changes: 5 additions & 5 deletions examples/alpha/dsf_deployment/agentless_sources.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ locals {

module "rds_mysql" {
source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db"
version = "1.4.5" # latest release tag
count = contains(local.db_types_to_onboard, "RDS MySQL") ? 1 : 0
version = "1.4.6" # latest release tag
count = contains(local.db_types_to_onboard, "RDS MySQL") ? 1 : 0

rds_subnet_ids = local.db_subnet_ids
security_group_ingress_cidrs = local.workstation_cidr
Expand All @@ -14,8 +14,8 @@ module "rds_mysql" {

module "rds_mssql" {
source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db"
version = "1.4.5" # latest release tag
count = contains(local.db_types_to_onboard, "RDS MsSQL") ? 1 : 0
version = "1.4.6" # latest release tag
count = contains(local.db_types_to_onboard, "RDS MsSQL") ? 1 : 0

rds_subnet_ids = local.db_subnet_ids
security_group_ingress_cidrs = local.workstation_cidr
Expand All @@ -29,7 +29,7 @@ module "rds_mssql" {

module "db_onboarding" {
source = "imperva/dsf-poc-db-onboarder/aws"
version = "1.4.5" # latest release tag
version = "1.4.6" # latest release tag
for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val }

sonar_version = module.globals.tarball_location.version
Expand Down
8 changes: 4 additions & 4 deletions examples/alpha/dsf_deployment/dam.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ locals {

module "mx" {
source = "imperva/dsf-mx/aws"
version = "1.4.5" # latest release tag
count = var.enable_dsf_dam ? 1 : 0
version = "1.4.6" # latest release tag
count = var.enable_dsf_dam ? 1 : 0

friendly_name = join("-", [local.deployment_name_salted, "mx"])
dam_version = var.dam_version
Expand Down Expand Up @@ -37,8 +37,8 @@ module "mx" {

module "agent_gw" {
source = "imperva/dsf-agent-gw/aws"
version = "1.4.5" # latest release tag
count = local.agent_gw_count
version = "1.4.6" # latest release tag
count = local.agent_gw_count

friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index])
dam_version = var.dam_version
Expand Down
Binary file added examples/alpha/dsf_deployment/dsf_deployment.zip
View file
Binary file not shown.
Loading

0 comments on commit 9091f6f

Please sign in to comment.