Skip to content

Commit

Permalink
Automatic commit before release [release=1.3.9] | [skip actions]
Browse files Browse the repository at this point in the history
  • Loading branch information
elsegev authored and github-actions[bot] committed Mar 16, 2023
1 parent 58a75c8 commit a5467d1
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 50 deletions.
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,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.3.8">DSFKit GitHub Repository</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9">DSFKit GitHub Repository</a>
</td>
<td>
</td>
Expand All @@ -133,7 +133,7 @@ Latest Supported Terraform Version: 1.4.0. 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.3.8#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
Required for <a href="https://github.com/imperva/dsfkit/tree/1.3.9#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -277,7 +277,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.3.8">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.3.8/examples">examples</a> directory.
These examples can be found in the <a href="https://github.com/imperva/dsfkit/tree/1.3.9">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.3.9/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 @@ -294,43 +294,43 @@ For more details about each example, click on the example name.
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.8/examples/poc/basic_deployment/README.md">Basic Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/poc/basic_deployment/README.md">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.3.8/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.8/examples/poc/hadr_deployment/README.md">HADR Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/poc/hadr_deployment/README.md">HADR Deployment</a>
</td>
<td>Lab/POC
</td>
<td>A DSF deployment with a DSF Hub HADR, an Agentless Gateway, federation, networking and onboarding of a MySQL DB.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.8/examples/poc/hadr_deployment/hadr_deployment.zip">hadr_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/poc/hadr_deployment/hadr_deployment.zip">hadr_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.8/examples/installation/single_account_deployment/README.md">Single Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/installation/single_account_deployment/README.md">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.3.8/examples/installation/single_account_deployment/single_account_deployment.zip">single_account_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/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.3.8/examples/installation/multi_account_deployment/README.md">Multi Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/installation/multi_account_deployment/README.md">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.3.8/examples/installation/multi_account_deployment/multi_account_deployment.zip">multi_account_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/installation/multi_account_deployment/multi_account_deployment.zip">multi_account_deployment.zip</a>
</td>
</tr>
</table>
Expand Down Expand Up @@ -376,7 +376,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.3.8">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.3.8/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.3.9">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.3.9/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 @@ -588,7 +588,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.3.8/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.3.9/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 @@ -607,7 +607,7 @@ 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.3.8">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.3.8/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.3.9">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.3.9/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>.
Run:
```bash
wget https://github.com/imperva/dsfkit/raw/1.3.7/examples/poc/basic_deployment/basic_deployment.zip
Expand Down Expand Up @@ -711,7 +711,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.3.8/examples/installation/single_account_deployment/README.md">Single Account Deployment</a>
For example: <a href="https://github.com/imperva/dsfkit/tree/1.3.9/examples/installation/single_account_deployment/README.md">Single Account Deployment</a>
These topics include:
- Storing Terraform state in S3 bucket
Expand Down
12 changes: 6 additions & 6 deletions examples/installation/multi_account_deployment/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ provider "aws" {

module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
sonar_version = var.sonar_version
}

Expand All @@ -42,14 +42,14 @@ locals {

module "key_pair_hub" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
key_name_prefix = "imperva-dsf-hub"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-hub-${terraform.workspace}"
}

module "key_pair_gw" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
key_name_prefix = "imperva-dsf-gw"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-gw-${terraform.workspace}"
providers = {
Expand All @@ -63,7 +63,7 @@ module "key_pair_gw" {

module "hub" {
source = "imperva/dsf-hub/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "primary"])
subnet_id = var.subnet_hub
security_group_id = var.security_group_id_hub
Expand All @@ -89,7 +89,7 @@ module "hub" {
module "agentless_gw_group" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "gw", count.index])
instance_type = var.gw_instance_type
ami = var.ami
Expand Down Expand Up @@ -123,7 +123,7 @@ module "agentless_gw_group" {
module "federation" {
for_each = { for idx, val in module.agentless_gw_group : idx => val }
source = "imperva/dsf-federation/null"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
gw_info = {
gw_ip_address = each.value.private_ip
gw_private_ssh_key_path = module.key_pair_gw.key_pair_private_pem.filename
Expand Down
Binary file not shown.
16 changes: 8 additions & 8 deletions examples/installation/single_account_deployment/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ provider "aws" {

module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
sonar_version = var.sonar_version
}

Expand All @@ -34,14 +34,14 @@ locals {
##############################
module "key_pair_hub" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
key_name_prefix = "imperva-dsf-hub"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-hub-${terraform.workspace}"
}

module "key_pair_gw" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
key_name_prefix = "imperva-dsf-gw"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-gw-${terraform.workspace}"
}
Expand All @@ -51,7 +51,7 @@ module "key_pair_gw" {
##############################
module "hub_primary" {
source = "imperva/dsf-hub/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "primary"])
subnet_id = var.subnet_hub
security_group_id = var.security_group_id_hub
Expand All @@ -76,7 +76,7 @@ module "hub_primary" {

module "hub_secondary" {
source = "imperva/dsf-hub/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "secondary"])
subnet_id = var.subnet_hub_secondary
security_group_id = var.security_group_id_hub
Expand Down Expand Up @@ -105,7 +105,7 @@ module "hub_secondary" {
module "agentless_gw_group" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "gw", count.index])
subnet_id = var.subnet_gw
security_group_id = var.security_group_id_gw
Expand Down Expand Up @@ -145,7 +145,7 @@ locals {
module "federation" {
count = length(local.hub_gw_combinations)
source = "imperva/dsf-federation/null"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
gw_info = {
gw_ip_address = local.hub_gw_combinations[count.index][1].private_ip
gw_private_ssh_key_path = module.key_pair_gw.key_pair_private_pem.filename
Expand All @@ -170,7 +170,7 @@ module "federation" {

module "hub_hadr" {
source = "imperva/dsf-hadr/null"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
dsf_primary_ip = module.hub_primary.private_ip
dsf_primary_private_ip = module.hub_primary.private_ip
dsf_secondary_ip = module.hub_secondary.private_ip
Expand Down
Binary file not shown.
Binary file modified examples/poc/basic_deployment/basic_deployment.zip
Binary file not shown.
16 changes: 8 additions & 8 deletions examples/poc/basic_deployment/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ provider "aws" {

module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
sonar_version = var.sonar_version
}

module "key_pair" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
key_name_prefix = "imperva-dsf-"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}"
}
Expand Down Expand Up @@ -64,7 +64,7 @@ module "vpc" {

module "hub" {
source = "imperva/dsf-hub/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub"])
subnet_id = module.vpc.public_subnets[0]
binaries_location = local.tarball_location
Expand All @@ -88,7 +88,7 @@ module "hub" {
module "agentless_gw_group" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "gw", count.index])
subnet_id = module.vpc.private_subnets[0]
ebs = var.gw_group_ebs_details
Expand Down Expand Up @@ -117,7 +117,7 @@ module "agentless_gw_group" {
module "federation" {
for_each = { for idx, val in module.agentless_gw_group : idx => val }
source = "imperva/dsf-federation/null"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
gw_info = {
gw_ip_address = each.value.private_ip
gw_private_ssh_key_path = module.key_pair.key_pair_private_pem.filename
Expand All @@ -142,7 +142,7 @@ module "federation" {
module "rds_mysql" {
count = contains(var.db_types_to_onboard, "RDS MySQL") ? 1 : 0
source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
rds_subnet_ids = module.vpc.public_subnets
security_group_ingress_cidrs = local.workstation_cidr
}
Expand All @@ -151,7 +151,7 @@ module "rds_mysql" {
module "rds_mssql" {
count = contains(var.db_types_to_onboard, "RDS MsSQL") ? 1 : 0
source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mssql-db"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
rds_subnet_ids = module.vpc.public_subnets
security_group_ingress_cidrs = local.workstation_cidr

Expand All @@ -164,7 +164,7 @@ module "rds_mssql" {
module "db_onboarding" {
for_each = { for idx, val in concat(module.rds_mysql, module.rds_mssql) : idx => val }
source = "imperva/dsf-poc-db-onboarder/aws"
version = "1.3.8" # latest release tag
version = "1.3.9" # latest release tag
sonar_version = module.globals.tarball_location.version
hub_info = {
hub_ip_address = module.hub.public_ip
Expand Down
Binary file modified examples/poc/hadr_deployment/hadr_deployment.zip
Binary file not shown.
Loading

0 comments on commit a5467d1

Please sign in to comment.