Skip to content

Commit

Permalink
Automatic commit before release [release=1.3.4] | [skip actions]
Browse files Browse the repository at this point in the history
  • Loading branch information
eytannnaim authored and github-actions[bot] committed Jan 22, 2023
1 parent e33a8cf commit 3563fa9
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion examples/installation/multi_account_deployment/README.md
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.4/examples/installation/multi_account_deployment/variables.tf) file.
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.5" # latest release tag
version = "1.3.4" # 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.4" # 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.4" # 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.4" # 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.4" # 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.4" # latest release tag
gws_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.
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 @@ -6,13 +6,13 @@ provider "aws" {

module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.3.5" # latest release tag
version = "1.3.4" # 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.4" # latest release tag
key_name_prefix = "imperva-dsf-"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}"
}
Expand Down Expand Up @@ -59,7 +59,7 @@ module "vpc" {

module "hub" {
source = "imperva/dsf-hub/aws"
version = "1.3.5" # latest release tag
version = "1.3.4" # 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 @@ -83,7 +83,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.4" # 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 @@ -112,7 +112,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.4" # latest release tag
gws_info = {
gw_ip_address = each.value.private_ip
gw_private_ssh_key_path = module.key_pair.key_pair_private_pem.filename
Expand All @@ -132,15 +132,15 @@ module "federation" {
module "rds_mysql" {
count = 1
source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db"
version = "1.3.5" # latest release tag
version = "1.3.4" # latest release tag
rds_subnet_ids = module.vpc.public_subnets
security_group_ingress_cidrs = local.workstation_cidr
}

module "db_onboarding" {
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.4" # latest release tag
sonar_version = module.globals.tarball_location.version
hub_info = {
hub_ip_address = module.hub.public_ip
Expand All @@ -166,7 +166,7 @@ module "db_onboarding" {

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

output "db_details" {
Expand Down
Binary file modified examples/poc/hadr_deployment/hadr_deployment.zip
Binary file not shown.
20 changes: 10 additions & 10 deletions examples/poc/hadr_deployment/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ provider "aws" {

module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.3.5" # latest release tag
version = "1.3.4" # 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.4" # latest release tag
key_name_prefix = "imperva-dsf-"
private_key_pem_filename = "ssh_keys/dsf_ssh_key-${terraform.workspace}"
}
Expand Down Expand Up @@ -58,7 +58,7 @@ module "vpc" {
##############################
module "hub" {
source = "imperva/dsf-hub/aws"
version = "1.3.5" # latest release tag
version = "1.3.4" # 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 @@ -81,7 +81,7 @@ module "hub" {

module "hub_secondary" {
source = "imperva/dsf-hub/aws"
version = "1.3.5" # latest release tag
version = "1.3.4" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "secondary"])
subnet_id = module.vpc.public_subnets[1]
binaries_location = local.tarball_location
Expand All @@ -108,7 +108,7 @@ module "hub_secondary" {
module "agentless_gw_group" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.3.5" # latest release tag
version = "1.3.4" # 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 @@ -146,7 +146,7 @@ locals {
module "federation" {
count = length(local.hub_gw_combinations)
source = "imperva/dsf-federation/null"
version = "1.3.5" # latest release tag
version = "1.3.4" # latest release tag
gws_info = {
gw_ip_address = local.hub_gw_combinations[count.index][1].private_ip
gw_private_ssh_key_path = module.key_pair.key_pair_private_pem.filename
Expand All @@ -166,7 +166,7 @@ module "federation" {

module "hadr" {
source = "imperva/dsf-hadr/null"
version = "1.3.5" # latest release tag
version = "1.3.4" # latest release tag
dsf_hub_primary_public_ip = module.hub.public_ip
dsf_hub_primary_private_ip = module.hub.private_ip
dsf_hub_secondary_public_ip = module.hub_secondary.public_ip
Expand All @@ -183,15 +183,15 @@ module "hadr" {
module "rds_mysql" {
count = 1
source = "imperva/dsf-poc-db-onboarder/aws//modules/rds-mysql-db"
version = "1.3.5" # latest release tag
version = "1.3.4" # latest release tag
rds_subnet_ids = module.vpc.public_subnets
security_group_ingress_cidrs = local.workstation_cidr
}

module "db_onboarding" {
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.4" # latest release tag
sonar_version = module.globals.tarball_location.version
hub_info = {
hub_ip_address = module.hub.public_ip
Expand All @@ -218,7 +218,7 @@ module "db_onboarding" {

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

output "db_details" {
Expand Down

0 comments on commit 3563fa9

Please sign in to comment.