Skip to content

Commit

Permalink
Automatic commit before release [release=1.3.7] | [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 Feb 28, 2023
1 parent e7c569a commit 38e8797
Show file tree
Hide file tree
Showing 26 changed files with 143 additions and 143 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.6">DSFKit GitHub Repository</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.7">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.6#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
Required for <a href="https://github.com/imperva/dsfkit/tree/1.3.7#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -309,7 +309,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.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>.
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.7">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.7/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 @@ -522,7 +522,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.6) 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.7) 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 @@ -578,7 +578,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.6/installer_machine/installer_machine.zip).
1. Download the Terraform recipe zip [here](https://github.com/imperva/dsfkit/tree/1.3.7/installer_machine/installer_machine.zip).
2. Unzip the zip file in CLI or using your operating system's UI.
Expand Down Expand Up @@ -645,7 +645,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.6">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.3.6/examples">examples</a> directory.
These examples can be found in the <a href="https://github.com/imperva/dsfkit/tree/1.3.7">DSFKit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.3.7/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 @@ -662,33 +662,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.6/examples/poc/basic_deployment/README.md">Basic Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.7/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.6/examples/poc/basic_deployment/basic_deployment.zip">basic_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.7/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.6/examples/poc/hadr_deployment/README.md">HADR Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.7/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.6/examples/poc/hadr_deployment/hadr_deployment.zip">hadr_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.7/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.6/examples/installation/multi_account_deployment/README.md">Multi Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.3.7/examples/installation/multi_account_deployment/README.md">Multi Account Deployment</a>
</td>
<td>PS/Customer
</td>
<td>A DSF deployment with a DSF Hub and an Agentless Gateway in different AWS accounts and federation.
</td>
<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><a href="https://github.com/imperva/dsfkit/tree/1.3.7/examples/installation/multi_account_deployment/multi_account_deployment.zip">multi_account_deployment.zip</a>
</td>
</tr>
</table>
Expand Down Expand Up @@ -743,7 +743,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.6#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.7#manual-installer-machine-deployment-mode">)
```
2. ```bash
Expand Down
20 changes: 10 additions & 10 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.6" # latest release tag
version = "1.3.7" # 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.6" # latest release tag
version = "1.3.7" # 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.6" # latest release tag
version = "1.3.7" # 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.6" # latest release tag
version = "1.3.7" # 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 @@ -72,7 +72,7 @@ module "hub" {
ebs = var.hub_ebs_details
create_and_attach_public_elastic_ip = false
instance_type = var.hub_instance_type
ami = var.ami
ami = var.ami
ssh_key_pair = {
ssh_private_key_file_path = module.key_pair_hub.key_pair_private_pem.filename
ssh_public_key_name = module.key_pair_hub.key_pair.key_pair_name
Expand All @@ -83,16 +83,16 @@ module "hub" {
use_public_ip = false
}
skip_instance_health_verification = var.hub_skip_instance_health_verification
terraform_script_path_folder = var.terraform_script_path_folder
terraform_script_path_folder = var.terraform_script_path_folder
}

module "agentless_gw_group" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.3.6" # latest release tag
version = "1.3.7" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "gw", count.index])
instance_type = var.gw_instance_type
ami = var.ami
ami = var.ami
subnet_id = var.subnet_gw
security_group_id = var.security_group_id_gw
ebs = var.gw_group_ebs_details
Expand All @@ -114,7 +114,7 @@ module "agentless_gw_group" {
proxy_ssh_user = module.hub.ssh_user
}
skip_instance_health_verification = var.gw_skip_instance_health_verification
terraform_script_path_folder = var.terraform_script_path_folder
terraform_script_path_folder = var.terraform_script_path_folder
depends_on = [
module.hub
]
Expand All @@ -126,7 +126,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.6" # latest release tag
version = "1.3.7" # 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 modified examples/installation/multi_account_deployment/multi_account_deployment.zip
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions examples/installation/multi_account_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ variable "gw_skip_instance_health_verification" {
}

variable "terraform_script_path_folder" {
type = string
type = string
description = "Terraform script path folder to create terraform temporary script files on the DSF hub and DSF agentless GW instances. Use '.' to represent the instance home directory"
default = null
default = null
validation {
condition = var.terraform_script_path_folder != ""
condition = var.terraform_script_path_folder != ""
error_message = "Terraform script path folder can not be an empty string"
}
}
66 changes: 33 additions & 33 deletions examples/installation/single_account_deployment/main.tf
View file
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.6" # latest release tag
version = "1.3.7" # 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.6" # latest release tag
version = "1.3.7" # 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.6" # latest release tag
version = "1.3.7" # 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" {
source = "imperva/dsf-hub/aws"
version = "1.3.6" # latest release tag
version = "1.3.7" # 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 @@ -71,24 +71,24 @@ module "hub" {
use_public_ip = false
}
skip_instance_health_verification = var.hub_skip_instance_health_verification
terraform_script_path_folder = var.terraform_script_path_folder
terraform_script_path_folder = var.terraform_script_path_folder
}

module "hub_secondary" {
source = "imperva/dsf-hub/aws"
version = "1.3.6" # 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
binaries_location = local.tarball_location
web_console_admin_password = local.web_console_admin_password
instance_type = var.hub_instance_type
ebs = var.hub_ebs_details
create_and_attach_public_elastic_ip = false
ami = var.ami
hadr_secondary_node = true
sonarw_public_key = module.hub.sonarw_public_key
sonarw_private_key = module.hub.sonarw_private_key
source = "imperva/dsf-hub/aws"
version = "1.3.7" # 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
binaries_location = local.tarball_location
web_console_admin_password = local.web_console_admin_password
instance_type = var.hub_instance_type
ebs = var.hub_ebs_details
create_and_attach_public_elastic_ip = false
ami = var.ami
hadr_secondary_node = true
sonarw_public_key = module.hub.sonarw_public_key
sonarw_private_key = module.hub.sonarw_private_key
ssh_key_pair = {
ssh_private_key_file_path = module.key_pair_hub.key_pair_private_pem.filename
ssh_public_key_name = module.key_pair_hub.key_pair.key_pair_name
Expand All @@ -99,13 +99,13 @@ module "hub_secondary" {
use_public_ip = false
}
skip_instance_health_verification = var.hub_skip_instance_health_verification
terraform_script_path_folder = var.terraform_script_path_folder
terraform_script_path_folder = var.terraform_script_path_folder
}

module "agentless_gw_group" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.3.6" # latest release tag
version = "1.3.7" # 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 All @@ -115,7 +115,7 @@ module "agentless_gw_group" {
web_console_admin_password = local.web_console_admin_password
hub_sonarw_public_key = module.hub.sonarw_public_key
create_and_attach_public_elastic_ip = false
ami = var.ami
ami = var.ami
ssh_key_pair = {
ssh_private_key_file_path = module.key_pair_gw.key_pair_private_pem.filename
ssh_public_key_name = module.key_pair_gw.key_pair.key_pair_name
Expand All @@ -130,7 +130,7 @@ module "agentless_gw_group" {
proxy_ssh_user = module.hub.ssh_user
}
skip_instance_health_verification = var.gw_skip_instance_health_verification
terraform_script_path_folder = var.terraform_script_path_folder
terraform_script_path_folder = var.terraform_script_path_folder
depends_on = [
module.hub
]
Expand All @@ -147,8 +147,8 @@ locals {

module "federation" {
count = length(local.hub_gw_combinations)
source = "imperva/dsf-federation/null"
version = "1.3.6" # latest release tag
source = "imperva/dsf-federation/null"
version = "1.3.7" # 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 @@ -172,14 +172,14 @@ module "federation" {
}

module "hub_hadr" {
source = "imperva/dsf-hadr/null"
version = "1.3.6" # latest release tag
dsf_primary_ip = module.hub.private_ip
dsf_primary_private_ip = module.hub.private_ip
dsf_secondary_ip = module.hub_secondary.private_ip
dsf_secondary_private_ip = module.hub_secondary.private_ip
ssh_key_path = module.key_pair_hub.key_pair_private_pem.filename
ssh_user = module.hub.ssh_user
source = "imperva/dsf-hadr/null"
version = "1.3.7" # latest release tag
dsf_primary_ip = module.hub.private_ip
dsf_primary_private_ip = module.hub.private_ip
dsf_secondary_ip = module.hub_secondary.private_ip
dsf_secondary_private_ip = module.hub_secondary.private_ip
ssh_key_path = module.key_pair_hub.key_pair_private_pem.filename
ssh_user = module.hub.ssh_user
terraform_script_path_folder = var.terraform_script_path_folder
depends_on = [
module.federation
Expand Down
Loading

0 comments on commit 38e8797

Please sign in to comment.