Skip to content

Commit

Permalink
Automatic commit before release [release=1.5.1] | [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 Jul 18, 2023
1 parent e7b4244 commit 509b4d9
Show file tree
Hide file tree
Showing 49 changed files with 319 additions and 319 deletions.
56 changes: 28 additions & 28 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,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.5.0">eDSF Kit GitHub Repository</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1">eDSF Kit GitHub Repository</a>
</td>
<td>
</td>
Expand All @@ -136,7 +136,7 @@ Latest Supported Terraform Version: 1.5.x. Using a higher version may result in
<td><a href="https://docs.google.com/forms/d/e/1FAIpQLSfgJh4kXYRD08xDsFyYgaYsS3ebhVrBTWvntcMCutSf0kNV2w/viewform">Requst access to Terraform Cloud account - Request Form</a>
</td>
<td>Grants access for a specific e-mail address to eDSF Kit's Terraform Cloud account.
Required for <a href="https://github.com/imperva/dsfkit/tree/1.5.0#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>.
Required for <a href="https://github.com/imperva/dsfkit/tree/1.5.1#terraform-cloud-deployment-mode">Terraform Cloud Deployment Mode</a>.
</td>
</tr>
<tr>
Expand Down Expand Up @@ -404,7 +404,7 @@ e.g., with or without DRA, the number of Agentless Gateways, with or without HAD
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.5.0">eDSF Kit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples">examples</a> directory.
These examples can be found in the <a href="https://github.com/imperva/dsfkit/tree/1.5.1">eDSF Kit GitHub Repository</a> under the <a href="https://github.com/imperva/dsfkit/tree/1.5.1/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 @@ -421,73 +421,73 @@ For more details about each example, click on the example name.
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/poc/sonar_basic_deployment/README.md">Sonar Basic Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/sonar_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.5.0/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_basic_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_basic_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/poc/sonar_hadr_deployment/README.md">Sonar HADR Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/sonar_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.5.0/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip">sonar_hadr_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip">sonar_hadr_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/installation/sonar_single_account_deployment/README.md">Sonar Single Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/installation/sonar_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.5.0/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip">sonar_single_account_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip">sonar_single_account_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/installation/sonar_multi_account_deployment/README.md">Sonar Multi Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/installation/sonar_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.5.0/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip">sonar_multi_account_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip">sonar_multi_account_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/alpha/dam_basic_deployment/README.md">DAM Basic Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/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.5.0/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip">dam_basic_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip">dam_basic_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/poc/dsf_deployment/README.md">DSF Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/dsf_deployment/README.md">DSF Deployment</a>
</td>
<td>Lab/POC
</td>
<td>A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways), DRA (Admin and DRA Analytics), and Agent and Agentless audit sources.
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/poc/dsf_deployment/dsf_deployment.zip">dsf_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/dsf_deployment/dsf_deployment.zip">dsf_deployment.zip</a>
</td>
</tr>
<tr>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/installation/dsf_single_account_deployment/README.md">DSF Single Account Deployment</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/installation/dsf_single_account_deployment/README.md">DSF Single Account Deployment</a>
</td>
<td>PS/Customer
</td>
<td>A full DSF deployment with DSF Hub and Agentless Gateways (formerly Sonar), DAM (MX and Agent Gateways) and DRA (Admin and DRA Analytics).
</td>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip">dsf_single_account_deployment.zip</a>
<td><a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip">dsf_single_account_deployment.zip</a>
</td>
</tr>
</table>
Expand Down Expand Up @@ -565,7 +565,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.5.0">eDSF Kit GitHub Repository</a>, e.g., if you choose the "sonar_basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_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.5.1">eDSF Kit GitHub Repository</a>, e.g., if you choose the "sonar_basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_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 @@ -653,7 +653,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.5.0/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.5.1/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 @@ -672,34 +672,34 @@ 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.5.0">eDSF Kit GitHub Repository</a>, e.g., if you choose the "sonar_basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.5.0/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_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.5.1">eDSF Kit GitHub Repository</a>, e.g., if you choose the "sonar_basic_deployment" example, you should download <a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip">sonar_basic_deployment.zip</a>.
Run:
```bash
wget https://github.com/imperva/dsfkit/raw/1.5.0/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.5.1/examples/poc/sonar_basic_deployment/sonar_basic_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.5.0/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.5.1/examples/poc/sonar_hadr_deployment/sonar_hadr_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.5.0/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.5.1/examples/installation/sonar_single_account_deployment/sonar_single_account_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.5.0/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.5.1/examples/installation/sonar_multi_account_deployment/sonar_multi_account_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.5.0/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.5.1/examples/alpha/dam_basic_deployment/dam_basic_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.5.0/examples/poc/dsf_deployment/dsf_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.5.1/examples/poc/dsf_deployment/dsf_deployment.zip
or
wget https://github.com/imperva/dsfkit/raw/1.5.0/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip
wget https://github.com/imperva/dsfkit/raw/1.5.1/examples/installation/dsf_single_account_deployment/dsf_single_account_deployment.zip
```
12. Continue by following the [CLI Deployment Mode](#cli-deployment-mode) beginning at step 2.
Expand Down Expand Up @@ -917,7 +917,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.5.0/examples/installation/sonar_single_account_deployment/README.md">Sonar Single Account Deployment</a>
For example: <a href="https://github.com/imperva/dsfkit/tree/1.5.1/examples/installation/sonar_single_account_deployment/README.md">Sonar 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.
14 changes: 7 additions & 7 deletions examples/alpha/dam_basic_deployment/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ provider "aws" {

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

tags = local.tags
}

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

key_name_prefix = "imperva-dsf-"
private_key_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}"
Expand Down Expand Up @@ -67,7 +67,7 @@ module "vpc" {
##############################
module "mx" {
source = "imperva/dsf-mx/aws"
version = "1.5.0" # latest release tag
version = "1.5.1" # latest release tag

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

module "agent_gw" {
source = "imperva/dsf-agent-gw/aws"
version = "1.5.0" # latest release tag
count = var.gw_count
version = "1.5.1" # latest release tag
count = var.gw_count

friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index])
dam_version = var.dam_version
Expand All @@ -117,7 +117,7 @@ module "agent_gw" {

module "agent_gw_cluster_setup" {
source = "imperva/dsf-agent-gw-cluster-setup/null"
version = "1.5.0" # latest release tag
version = "1.5.1" # latest release tag

cluster_name = local.cluster_name
gateway_group_name = local.gateway_group_name
Expand All @@ -135,7 +135,7 @@ module "agent_gw_cluster_setup" {

module "db_with_agent" {
source = "imperva/dsf-db-with-agent/aws"
version = "1.5.0" # latest release tag
version = "1.5.1" # latest release tag
count = var.agent_count

friendly_name = join("-", [local.deployment_name_salted, "db", "with", "agent", 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 @@ -83,7 +83,7 @@ variable "license" {
EOF
type = string
validation {
condition = fileexists(var.license) || can(regex("^[[:alnum:]]{8}-([[:alnum:]]{4}-){3}[[:alnum:]]{12}$", var.license))
condition = fileexists(var.license) || can(regex("^[[:alnum:]]{8}-([[:alnum:]]{4}-){3}[[:alnum:]]{12}$", var.license))
error_message = "Invalid license details. Can either be an activation code in the format of xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx or a path to a license file on disk"
}
}
Expand Down
36 changes: 18 additions & 18 deletions examples/installation/dsf_single_account_deployment/dam.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ locals {

module "mx" {
source = "imperva/dsf-mx/aws"
version = "1.5.0" # latest release tag
version = "1.5.1" # latest release tag
count = var.enable_dam ? 1 : 0

friendly_name = join("-", [local.deployment_name_salted, "mx"])
Expand All @@ -31,28 +31,28 @@ module "mx" {
access_token = module.hub_primary[0].access_tokens["dam-to-hub"].token
port = 8443
} : null
large_scale_mode = var.large_scale_mode.mx
tags = local.tags
large_scale_mode = var.large_scale_mode.mx
tags = local.tags
}

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

friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index])
dam_version = var.dam_version
ebs = var.agent_gw_ebs_details
subnet_id = var.subnet_ids.agent_gw_subnet_id
security_group_ids = var.security_group_ids_agent_gw
key_pair = local.agent_gw_public_key_name
secure_password = local.password
mx_password = local.password
allowed_agent_cidrs = [data.aws_subnet.agent_gw.cidr_block]
allowed_mx_cidrs = [data.aws_subnet.mx.cidr_block]
allowed_ssh_cidrs = [data.aws_subnet.mx.cidr_block]
allowed_gw_clusters_cidrs = [data.aws_subnet.agent_gw.cidr_block]
instance_profile_name = var.agent_gw_instance_profile_name
friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index])
dam_version = var.dam_version
ebs = var.agent_gw_ebs_details
subnet_id = var.subnet_ids.agent_gw_subnet_id
security_group_ids = var.security_group_ids_agent_gw
key_pair = local.agent_gw_public_key_name
secure_password = local.password
mx_password = local.password
allowed_agent_cidrs = [data.aws_subnet.agent_gw.cidr_block]
allowed_mx_cidrs = [data.aws_subnet.mx.cidr_block]
allowed_ssh_cidrs = [data.aws_subnet.mx.cidr_block]
allowed_gw_clusters_cidrs = [data.aws_subnet.agent_gw.cidr_block]
instance_profile_name = var.agent_gw_instance_profile_name

management_server_host_for_registration = module.mx[0].private_ip
management_server_host_for_api_access = module.mx[0].public_ip
Expand All @@ -66,7 +66,7 @@ module "agent_gw" {

module "agent_gw_cluster_setup" {
source = "imperva/dsf-agent-gw-cluster-setup/null"
version = "1.5.0" # latest release tag
version = "1.5.1" # latest release tag
count = local.create_agent_gw_cluster

cluster_name = var.cluster_name != null ? var.cluster_name : join("-", [local.deployment_name_salted, "agent", "gw", "cluster"])
Expand Down
Loading

0 comments on commit 509b4d9

Please sign in to comment.