Skip to content

Commit

Permalink
Automatic commit before release [release=1.6.0] | [skip actions]
Browse files Browse the repository at this point in the history
  • Loading branch information
lindanasredin authored and github-actions[bot] committed Nov 6, 2023
1 parent 8f1a34f commit dd5120c
Show file tree
Hide file tree
Showing 46 changed files with 183 additions and 183 deletions.
58 changes: 29 additions & 29 deletions README.md

Large diffs are not rendered by default.

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.7" # latest release tag
version = "1.6.0" # latest release tag
count = var.enable_dam ? 1 : 0

friendly_name = join("-", [local.deployment_name_salted, "mx"])
Expand Down Expand Up @@ -38,7 +38,7 @@ module "mx" {

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

friendly_name = join("-", [local.deployment_name_salted, "agent", "gw", count.index])
Expand Down Expand Up @@ -68,7 +68,7 @@ module "agent_gw" {

module "agent_gw_cluster_setup" {
source = "imperva/dsf-agent-gw-cluster-setup/null"
version = "1.5.7" # latest release tag
version = "1.6.0" # 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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ locals {

module "dra_admin" {
source = "imperva/dsf-dra-admin/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = var.enable_dra ? 1 : 0

friendly_name = join("-", [local.deployment_name_salted, "dra", "admin"])
Expand All @@ -28,7 +28,7 @@ module "dra_admin" {

module "dra_analytics" {
source = "imperva/dsf-dra-analytics/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = local.dra_analytics_count

friendly_name = join("-", [local.deployment_name_salted, "dra", "analytics", count.index])
Expand Down
Binary file not shown.
Binary file not shown.
18 changes: 9 additions & 9 deletions examples/aws/installation/dsf_single_account_deployment/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag

sonar_version = var.sonar_version
dra_version = var.dra_version
Expand Down Expand Up @@ -39,7 +39,7 @@ locals {
module "key_pair_hub_main" {
count = var.hub_main_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-hub-main"
private_key_filename = "ssh_keys/dsf_ssh_key-hub-main-${terraform.workspace}"
tags = local.tags
Expand All @@ -51,7 +51,7 @@ module "key_pair_hub_main" {
module "key_pair_hub_dr" {
count = var.hub_dr_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-hub-dr"
private_key_filename = "ssh_keys/dsf_ssh_key-hub-dr-${terraform.workspace}"
tags = local.tags
Expand All @@ -63,7 +63,7 @@ module "key_pair_hub_dr" {
module "key_pair_agentless_gw_main" {
count = var.agentless_gw_main_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-gw-main"
private_key_filename = "ssh_keys/dsf_ssh_key-agentless-gw-main-${terraform.workspace}"
tags = local.tags
Expand All @@ -75,7 +75,7 @@ module "key_pair_agentless_gw_main" {
module "key_pair_agentless_gw_dr" {
count = var.agentless_gw_dr_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-gw-dr"
private_key_filename = "ssh_keys/dsf_ssh_key-agentless-gw-dr-${terraform.workspace}"
tags = local.tags
Expand All @@ -87,7 +87,7 @@ module "key_pair_agentless_gw_dr" {
module "key_pair_mx" {
count = var.mx_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-mx"
private_key_filename = "ssh_keys/dsf_ssh_key-mx-${terraform.workspace}"
tags = local.tags
Expand All @@ -99,7 +99,7 @@ module "key_pair_mx" {
module "key_pair_agent_gw" {
count = var.agent_gw_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-agent-gw"
private_key_filename = "ssh_keys/dsf_ssh_key-agent-gw-${terraform.workspace}"
tags = local.tags
Expand All @@ -111,7 +111,7 @@ module "key_pair_agent_gw" {
module "key_pair_dra_admin" {
count = var.dra_admin_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-dra-admin"
private_key_filename = "ssh_keys/dsf_ssh_key-dra-admin-${terraform.workspace}"
tags = local.tags
Expand All @@ -123,7 +123,7 @@ module "key_pair_dra_admin" {
module "key_pair_dra_analytics" {
count = var.dra_analytics_key_pair == null ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-dra-analytics"
private_key_filename = "ssh_keys/dsf_ssh_key-dra-analytics-${terraform.workspace}"
tags = local.tags
Expand Down
28 changes: 14 additions & 14 deletions examples/aws/installation/dsf_single_account_deployment/sonar.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ locals {

module "hub_main" {
source = "imperva/dsf-hub/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = var.enable_sonar ? 1 : 0

friendly_name = join("-", [local.deployment_name_salted, "hub", "main"])
Expand Down Expand Up @@ -50,7 +50,7 @@ module "hub_main" {
username = mx.web_console_user
password = local.password
}] : []
dra_details = var.enable_dra? {
dra_details = var.enable_dra ? {
name = module.dra_admin[0].display_name
address = module.dra_admin[0].public_ip
username = module.dra_admin[0].ssh_user
Expand All @@ -67,7 +67,7 @@ module "hub_main" {

module "hub_dr" {
source = "imperva/dsf-hub/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = var.enable_sonar && var.hub_hadr ? 1 : 0

friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"])
Expand Down Expand Up @@ -112,7 +112,7 @@ module "hub_dr" {

module "hub_hadr" {
source = "imperva/dsf-hadr/null"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = length(module.hub_dr) > 0 ? 1 : 0

sonar_version = module.globals.tarball_location.version
Expand All @@ -137,7 +137,7 @@ module "hub_hadr" {

module "agentless_gw_main" {
source = "imperva/dsf-agentless-gw/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = local.agentless_gw_count

friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "main"])
Expand Down Expand Up @@ -177,7 +177,7 @@ module "agentless_gw_main" {

module "agentless_gw_dr" {
source = "imperva/dsf-agentless-gw/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = var.agentless_gw_hadr ? local.agentless_gw_count : 0

friendly_name = join("-", [local.deployment_name_salted, "agentless", "gw", count.index, "DR"])
Expand Down Expand Up @@ -220,7 +220,7 @@ module "agentless_gw_dr" {

module "agentless_gw_hadr" {
source = "imperva/dsf-hadr/null"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
count = length(module.agentless_gw_dr)

sonar_version = module.globals.tarball_location.version
Expand Down Expand Up @@ -266,20 +266,20 @@ locals {

module "federation" {
source = "imperva/dsf-federation/null"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
for_each = local.hub_gw_combinations

hub_info = {
hub_ip_address = each.value[0].ip
hub_ip_address = each.value[0].ip
hub_federation_ip_address = each.value[0].ip
hub_private_ssh_key_path = each.value[0].private_key_file_path
hub_ssh_user = each.value[0].instance.ssh_user
hub_private_ssh_key_path = each.value[0].private_key_file_path
hub_ssh_user = each.value[0].instance.ssh_user
}
gw_info = {
gw_ip_address = each.value[1].instance.private_ip
gw_ip_address = each.value[1].instance.private_ip
gw_federation_ip_address = each.value[1].instance.private_ip
gw_private_ssh_key_path = each.value[1].private_key_file_path
gw_ssh_user = each.value[1].instance.ssh_user
gw_private_ssh_key_path = each.value[1].private_key_file_path
gw_ssh_user = each.value[1].instance.ssh_user
}
hub_proxy_info = var.proxy_address != null ? {
proxy_address = var.proxy_address
Expand Down
36 changes: 18 additions & 18 deletions examples/aws/installation/sonar_multi_account_deployment/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "globals" {
source = "imperva/dsf-globals/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
sonar_version = var.sonar_version
}

Expand All @@ -25,7 +25,7 @@ locals {
module "key_pair_hub_main" {
count = local.should_create_hub_main_key_pair ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-hub-main"
private_key_filename = "ssh_keys/dsf_ssh_key-hub-main-${terraform.workspace}"
tags = local.tags
Expand All @@ -37,7 +37,7 @@ module "key_pair_hub_main" {
module "key_pair_hub_dr" {
count = local.should_create_hub_dr_key_pair ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-hub-dr"
private_key_filename = "ssh_keys/dsf_ssh_key-hub-dr-${terraform.workspace}"
tags = local.tags
Expand All @@ -49,7 +49,7 @@ module "key_pair_hub_dr" {
module "key_pair_gw_main" {
count = local.should_create_gw_main_key_pair ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-gw"
private_key_filename = "ssh_keys/dsf_ssh_key-gw-main-${terraform.workspace}"
tags = local.tags
Expand All @@ -61,7 +61,7 @@ module "key_pair_gw_main" {
module "key_pair_gw_dr" {
count = local.should_create_gw_dr_key_pair ? 1 : 0
source = "imperva/dsf-globals/aws//modules/key_pair"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
key_name_prefix = "imperva-dsf-gw-dr"
private_key_filename = "ssh_keys/dsf_ssh_key-gw-dr-${terraform.workspace}"
tags = local.tags
Expand Down Expand Up @@ -106,7 +106,7 @@ locals {
##############################
module "hub_main" {
source = "imperva/dsf-hub/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "main"])
subnet_id = var.subnet_hub_main
security_group_ids = var.security_group_ids_hub_main
Expand Down Expand Up @@ -144,7 +144,7 @@ module "hub_main" {

module "hub_dr" {
source = "imperva/dsf-hub/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "hub", "DR"])
subnet_id = var.subnet_hub_dr
security_group_ids = var.security_group_ids_hub_dr
Expand Down Expand Up @@ -186,7 +186,7 @@ module "hub_dr" {
module "agentless_gw_main" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "main"])
subnet_id = var.subnet_gw_main
security_group_ids = var.security_group_ids_gw_main
Expand Down Expand Up @@ -225,7 +225,7 @@ module "agentless_gw_main" {
module "agentless_gw_dr" {
count = var.gw_count
source = "imperva/dsf-agentless-gw/aws"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
friendly_name = join("-", [local.deployment_name_salted, "gw", count.index, "DR"])
subnet_id = var.subnet_gw_dr
security_group_ids = var.security_group_ids_gw_dr
Expand Down Expand Up @@ -266,7 +266,7 @@ module "agentless_gw_dr" {

module "hub_hadr" {
source = "imperva/dsf-hadr/null"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
sonar_version = module.globals.tarball_location.version
dsf_main_ip = module.hub_main.private_ip
dsf_main_private_ip = module.hub_main.private_ip
Expand All @@ -290,7 +290,7 @@ module "hub_hadr" {
module "agentless_gw_hadr" {
count = var.gw_count
source = "imperva/dsf-hadr/null"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
sonar_version = module.globals.tarball_location.version
dsf_main_ip = module.agentless_gw_main[count.index].private_ip
dsf_main_private_ip = module.agentless_gw_main[count.index].private_ip
Expand Down Expand Up @@ -324,18 +324,18 @@ locals {
module "federation" {
count = length(local.hub_gws_combinations)
source = "imperva/dsf-federation/null"
version = "1.5.7" # latest release tag
version = "1.6.0" # latest release tag
gw_info = {
gw_ip_address = local.hub_gws_combinations[count.index][1].instance.private_ip
gw_ip_address = local.hub_gws_combinations[count.index][1].instance.private_ip
gw_federation_ip_address = local.hub_gws_combinations[count.index][1].instance.private_ip
gw_private_ssh_key_path = local.hub_gws_combinations[count.index][1].private_key_file_path
gw_ssh_user = local.hub_gws_combinations[count.index][1].instance.ssh_user
gw_private_ssh_key_path = local.hub_gws_combinations[count.index][1].private_key_file_path
gw_ssh_user = local.hub_gws_combinations[count.index][1].instance.ssh_user
}
hub_info = {
hub_ip_address = local.hub_gws_combinations[count.index][0].instance.private_ip
hub_ip_address = local.hub_gws_combinations[count.index][0].instance.private_ip
hub_federation_ip_address = local.hub_gws_combinations[count.index][0].instance.private_ip
hub_private_ssh_key_path = local.hub_gws_combinations[count.index][0].private_key_file_path
hub_ssh_user = local.hub_gws_combinations[count.index][0].instance.ssh_user
hub_private_ssh_key_path = local.hub_gws_combinations[count.index][0].private_key_file_path
hub_ssh_user = local.hub_gws_combinations[count.index][0].instance.ssh_user
}
hub_proxy_info = var.proxy_address != null ? {
proxy_address = var.proxy_address
Expand Down
Binary file not shown.
Loading

0 comments on commit dd5120c

Please sign in to comment.