Skip to content

Commit

Permalink
Automatic commit before release [release=1.3.6] | [skip actions]
Browse files Browse the repository at this point in the history
  • Loading branch information
@eytannnaim @github-actions
eytannnaim authored and github-actions[bot] committed Feb 5, 2023
1 parent e9970d2 commit e4f3059
Show file tree
Hide file tree
Showing 21 changed files with 99 additions and 99 deletions.
26 changes: 13 additions & 13 deletions README.md
View file
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.5">DSFKit GitHub Repository</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.6">DSFKit GitHub Repository</a>
</td>
<td>
</td>
Expand All @@ -132,7 +132,7 @@ This guide references the following information and links, some of which are ava
<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.5#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
Required for <a href="https://github.com/imperva/dsfkit/tree/1.3.6#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -289,7 +289,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.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.3.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.3.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.3.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 @@ -499,7 +499,7 @@ Complete these steps to manually create an installer machine:
6. Replace the following placeholders with their value in the bash code you pasted: (You can also do the replacements in a text editor and copy the result to the AWS console)
1. ${example_name}: E.g., basic_deployment
2. ${example_type}: poc or installation, according to where your example is located in the [DSFKit GitHub repository](https://github.com/imperva/dsfkit/tree/1.3.5) under the 'examples' directory.
2. ${example_type}: poc or installation, according to where your example is located in the [DSFKit GitHub repository](https://github.com/imperva/dsfkit/tree/1.3.6) under the 'examples' directory.
3. ${access_key}: AWS access key which provides access to the AWS account where you want to deploy DSF.
4. ${secret_key}: AWS secret key which provides access to the AWS account where you want to deploy DSF.
5. ${region}: AWS region where you want to deploy DSF.
Expand Down Expand Up @@ -555,7 +555,7 @@ In case you don’t want to manually create the installer machine, you can autom
Complete the following instructions to automate the creation of an installer machine which in turn automatically installs DSF.
1. Download the Terraform recipe zip [here](https://github.com/imperva/dsfkit/tree/1.3.5/installer_machine/installer_machine.zip).
1. Download the Terraform recipe zip [here](https://github.com/imperva/dsfkit/tree/1.3.6/installer_machine/installer_machine.zip).
2. Unzip the zip file in CLI or using your operating system's UI.
Expand Down Expand Up @@ -622,7 +622,7 @@ Complete the following instructions to automate the creation of an installer mac
DSFKit provides a number of out-of-the-box examples which are already configured to deploy common DSF environments.
These examples can be found in the <a href="https://github.com/imperva/dsfkit/tree/1.3.5">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.3.5/examples">examples</a> directory.
These examples can be found in the <a href="https://github.com/imperva/dsfkit/tree/1.3.6">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.3.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 @@ -639,33 +639,33 @@ 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.5/examples/poc/basic_deployment/README.md">Basic Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.6/examples/poc/basic_deployment/README.md">Basic Deployment</a>
</td>
<td>Lab/POC
</td>
<td>A DSF deployment with a Hub, a GW, federation, networking and onboarding of a MySQL DB.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.5/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.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.3.5/examples/poc/hadr_deployment/README.md">HADR Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.6/examples/poc/hadr_deployment/README.md">HADR Deployment</a>
</td>
<td>Lab/POC
</td>
<td>A DSF deployment with a Hub HADR, a GW, federation, networking and onboarding of a MySQL DB.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.5/examples/poc/hadr_deployment/hadr_deployment.zip">hadr_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.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.3.5/examples/installation/multi_account_deployment/README.md">Multi Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.6/examples/installation/multi_account_deployment/README.md">Multi Account Deployment</a>
</td>
<td>PS/Customer
</td>
<td>A DSF deployment with a Hub and a GW in different AWS accounts and federation.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.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.3.6/examples/installation/multi_account_deployment/multi_account_deployment.zip">multi_account_deployment.zip</a>
</td>
</tr>
</table>
Expand Down Expand Up @@ -720,7 +720,7 @@ In case of failure, the Terraform may have deployed some resources before failin
```bash
ssh -i ${key_pair_file} ec2-user@${installer_machine_public_ip}
>>>> Fill the values of the key_pair_file and installer_machine_public_ip placeholders (See <a href="https://github.com/imperva/dsfkit/tree/1.3.5#manual-installer-machine-deployment-mode">)
>>>> Fill the values of the key_pair_file and installer_machine_public_ip placeholders (See <a href="https://github.com/imperva/dsfkit/tree/1.3.6#manual-installer-machine-deployment-mode">)
```
2. ```bash
Expand Down
2 changes: 1 addition & 1 deletion examples/installation/multi_account_deployment/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ This example is intended for PS/customers who want to bring their own networking
It is possible to provide as input to this example, in which subnets to deploy the Hub and the Gateway.
They can be in the same or in different subnets, the same or different AWS accounts, etc.

For a full list of this example's customization options which don't require code changes, refer to the [variables.tf](https://github.com/imperva/dsfkit/tree/1.3.5/examples/installation/multi_account_deployment/variables.tf) file.
For a full list of this example's customization options which don't require code changes, refer to the [variables.tf](https://github.com/imperva/dsfkit/tree/1.3.6/examples/installation/multi_account_deployment/variables.tf) file.
16 changes: 8 additions & 8 deletions examples/installation/multi_account_deployment/main.tf
View file
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.5" # latest release tag
version = "1.3.6" # 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.5" # latest release tag
version = "1.3.6" # 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.5" # latest release tag
version = "1.3.6" # 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.5" # latest release tag
version = "1.3.6" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "primary"])
subnet_id = var.subnet_hub
binaries_location = local.tarball_location
Expand All @@ -87,7 +87,7 @@ module "hub" {
module "agentless_gw_group" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.3.5" # latest release tag
version = "1.3.6" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "gw", count.index])
instance_type = var.gw_instance_type
ami_name_tag = var.gw_ami_name
Expand Down Expand Up @@ -119,7 +119,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.5" # latest release tag
version = "1.3.6" # 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 All @@ -131,9 +131,9 @@ module "federation" {
hub_ssh_user = module.hub.ssh_user
}
gw_proxy_info = {
proxy_address = module.hub.private_ip
proxy_address = module.hub.private_ip
proxy_private_ssh_key_path = module.key_pair_hub.key_pair_private_pem.filename
proxy_ssh_user = module.hub.ssh_user
proxy_ssh_user = module.hub.ssh_user
}
depends_on = [
module.hub,
Expand Down
Binary file modified examples/installation/multi_account_deployment/multi_account_deployment.zip
View file
Binary file not shown.
Binary file modified examples/poc/basic_deployment/basic_deployment.zip
View file
Binary file not shown.
22 changes: 11 additions & 11 deletions examples/poc/basic_deployment/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ provider "aws" {

provider "aws" {
region = "us-east-1"
alias = "poc_scripts_s3_region"
alias = "poc_scripts_s3_region"
}

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

module "key_pair" {
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.3.5" # latest release tag
version = "1.3.6" # 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.5" # latest release tag
version = "1.3.6" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "primary"])
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.5" # latest release tag
version = "1.3.6" # 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.5" # latest release tag
version = "1.3.6" # 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,15 +142,15 @@ 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.5" # latest release tag
version = "1.3.6" # latest release tag
rds_subnet_ids = module.vpc.public_subnets
security_group_ingress_cidrs = local.workstation_cidr
}

module "db_onboarding_mysql" {
for_each = { for idx, val in module.rds_mysql : idx => val }
source = "imperva/dsf-poc-db-onboarder/aws"
version = "1.3.5" # latest release tag
version = "1.3.6" # latest release tag
sonar_version = module.globals.tarball_location.version
hub_info = {
hub_ip_address = module.hub.public_ip
Expand Down Expand Up @@ -178,7 +178,7 @@ module "db_onboarding_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.5" # latest release tag
version = "1.3.6" # latest release tag
rds_subnet_ids = module.vpc.public_subnets
security_group_ingress_cidrs = local.workstation_cidr

Expand All @@ -191,7 +191,7 @@ module "rds_mssql" {
module "db_onboarding_mssql" {
for_each = { for idx, val in module.rds_mssql : idx => val }
source = "imperva/dsf-poc-db-onboarder/aws"
version = "1.3.5" # latest release tag
version = "1.3.6" # latest release tag
sonar_version = module.globals.tarball_location.version
hub_info = {
hub_ip_address = module.hub.public_ip
Expand Down Expand Up @@ -219,6 +219,6 @@ module "db_onboarding_mssql" {

module "statistics" {
source = "imperva/dsf-statistics/aws"
version = "1.3.5" # latest release tag
version = "1.3.6" # latest release tag
}

Binary file modified examples/poc/hadr_deployment/hadr_deployment.zip
View file
Binary file not shown.
Loading

0 comments on commit e4f3059

Please sign in to comment.