From 9d58c03f47a4c6701f74d43cf55b9a0c91ac6223 Mon Sep 17 00:00:00 2001 From: "assaf.cohen" Date: Sun, 15 Oct 2023 18:16:28 +0300 Subject: [PATCH] Set sonar_machine_base_directory variable to all installation examples --- .../installation/dsf_single_account_deployment/sonar.tf | 4 ++++ .../installation/dsf_single_account_deployment/variables.tf | 6 ++++++ .../installation/sonar_multi_account_deployment/main.tf | 4 ++++ .../sonar_multi_account_deployment/variables.tf | 6 ++++++ .../installation/sonar_single_account_deployment/main.tf | 3 +++ .../sonar_single_account_deployment/variables.tf | 6 ++++++ examples/poc/sonar_hadr_deployment/main.tf | 4 ---- examples/poc/sonar_hadr_deployment/variables.tf | 6 ------ 8 files changed, 29 insertions(+), 10 deletions(-) diff --git a/examples/installation/dsf_single_account_deployment/sonar.tf b/examples/installation/dsf_single_account_deployment/sonar.tf index ce58e72f7..68434811f 100644 --- a/examples/installation/dsf_single_account_deployment/sonar.tf +++ b/examples/installation/dsf_single_account_deployment/sonar.tf @@ -43,6 +43,7 @@ module "hub_main" { sonarw_private_key_secret_name = var.sonarw_hub_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_hub_public_key_file_path)), null) instance_profile_name = var.hub_instance_profile_name + base_directory = var.sonar_machine_base_directory mx_details = var.enable_dam ? [for mx in module.mx : { name = mx.display_name address = coalesce(mx.public_dns, mx.private_dns) @@ -92,6 +93,7 @@ module "hub_dr" { sonarw_private_key_secret_name = var.sonarw_hub_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_hub_public_key_file_path)), null) instance_profile_name = var.hub_instance_profile_name + base_directory = var.sonar_machine_base_directory generate_access_tokens = true tags = local.tags providers = { @@ -156,6 +158,7 @@ module "agentless_gw_main" { sonarw_private_key_secret_name = var.sonarw_gw_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_gw_public_key_file_path)), null) instance_profile_name = var.agentless_gw_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags providers = { aws = aws.provider-2 @@ -197,6 +200,7 @@ module "agentless_gw_dr" { sonarw_private_key_secret_name = var.sonarw_gw_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_gw_public_key_file_path)), null) instance_profile_name = var.agentless_gw_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags providers = { aws = aws.provider-2 diff --git a/examples/installation/dsf_single_account_deployment/variables.tf b/examples/installation/dsf_single_account_deployment/variables.tf index fb6225b96..262bbdd0a 100644 --- a/examples/installation/dsf_single_account_deployment/variables.tf +++ b/examples/installation/dsf_single_account_deployment/variables.tf @@ -448,6 +448,12 @@ variable "sonarw_gw_public_key_file_path" { description = "The Agentless Gateway sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc." } +variable "sonar_machine_base_directory" { + type = string + default = "/imperva" + description = "The base directory where all Sonar related directories will be installed" +} + ############################## #### DAM variables #### ############################## diff --git a/examples/installation/sonar_multi_account_deployment/main.tf b/examples/installation/sonar_multi_account_deployment/main.tf index b41cb4123..c2688557b 100644 --- a/examples/installation/sonar_multi_account_deployment/main.tf +++ b/examples/installation/sonar_multi_account_deployment/main.tf @@ -134,6 +134,7 @@ module "hub_main" { sonarw_private_key_secret_name = var.sonarw_hub_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_hub_public_key_file_path)), null) instance_profile_name = var.hub_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags providers = { aws = aws.hub-main @@ -173,6 +174,7 @@ module "hub_dr" { sonarw_private_key_secret_name = var.sonarw_hub_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_hub_public_key_file_path)), null) instance_profile_name = var.hub_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags providers = { aws = aws.hub-dr @@ -210,6 +212,7 @@ module "agentless_gw_main" { sonarw_private_key_secret_name = var.sonarw_gw_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_gw_public_key_file_path)), null) instance_profile_name = var.gw_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags providers = { aws = aws.gw-main @@ -250,6 +253,7 @@ module "agentless_gw_dr" { sonarw_private_key_secret_name = var.sonarw_gw_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_gw_public_key_file_path)), null) instance_profile_name = var.gw_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags providers = { aws = aws.gw-dr diff --git a/examples/installation/sonar_multi_account_deployment/variables.tf b/examples/installation/sonar_multi_account_deployment/variables.tf index 37694fd52..bbe92209e 100644 --- a/examples/installation/sonar_multi_account_deployment/variables.tf +++ b/examples/installation/sonar_multi_account_deployment/variables.tf @@ -340,3 +340,9 @@ variable "sonarw_gw_public_key_file_path" { default = null description = "The Agentless Gateway sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc." } + +variable "sonar_machine_base_directory" { + type = string + default = "/imperva" + description = "The base directory where all Sonar related directories will be installed" +} diff --git a/examples/installation/sonar_single_account_deployment/main.tf b/examples/installation/sonar_single_account_deployment/main.tf index da719ba98..e093b2237 100644 --- a/examples/installation/sonar_single_account_deployment/main.tf +++ b/examples/installation/sonar_single_account_deployment/main.tf @@ -98,6 +98,7 @@ module "hub_main" { sonarw_private_key_secret_name = var.sonarw_hub_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_hub_public_key_file_path)), null) instance_profile_name = var.hub_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags } @@ -130,6 +131,7 @@ module "hub_dr" { sonarw_private_key_secret_name = var.sonarw_hub_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_hub_public_key_file_path)), null) instance_profile_name = var.hub_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags } @@ -163,6 +165,7 @@ module "agentless_gw" { sonarw_private_key_secret_name = var.sonarw_gw_private_key_secret_name sonarw_public_key_content = try(trimspace(file(var.sonarw_gw_public_key_file_path)), null) instance_profile_name = var.gw_instance_profile_name + base_directory = var.sonar_machine_base_directory tags = local.tags } diff --git a/examples/installation/sonar_single_account_deployment/variables.tf b/examples/installation/sonar_single_account_deployment/variables.tf index 174ffaa22..b5b449563 100644 --- a/examples/installation/sonar_single_account_deployment/variables.tf +++ b/examples/installation/sonar_single_account_deployment/variables.tf @@ -259,3 +259,9 @@ variable "use_hub_as_proxy" { default = true description = "Whether to use the DSF Hub as a proxy for ssh into the Agentless Gateways" } + +variable "sonar_machine_base_directory" { + type = string + default = "/imperva" + description = "The base directory where all Sonar related directories will be installed" +} diff --git a/examples/poc/sonar_hadr_deployment/main.tf b/examples/poc/sonar_hadr_deployment/main.tf index 822261724..8337afe0c 100644 --- a/examples/poc/sonar_hadr_deployment/main.tf +++ b/examples/poc/sonar_hadr_deployment/main.tf @@ -106,7 +106,6 @@ module "hub_main" { allowed_hub_cidrs = [data.aws_subnet.dr_hub.cidr_block] allowed_agentless_gw_cidrs = [data.aws_subnet.main_gw.cidr_block, data.aws_subnet.dr_gw.cidr_block] allowed_all_cidrs = local.workstation_cidr - base_directory = var.sonar_machine_base_directory tags = local.tags depends_on = [ module.vpc @@ -136,7 +135,6 @@ module "hub_dr" { allowed_hub_cidrs = [data.aws_subnet.main_hub.cidr_block] allowed_agentless_gw_cidrs = [data.aws_subnet.main_gw.cidr_block, data.aws_subnet.dr_gw.cidr_block] allowed_all_cidrs = local.workstation_cidr - base_directory = var.sonar_machine_base_directory tags = local.tags depends_on = [ module.vpc @@ -167,7 +165,6 @@ module "agentless_gw_main" { proxy_private_ssh_key_path = module.key_pair.private_key_file_path proxy_ssh_user = module.hub_main.ssh_user } - base_directory = var.sonar_machine_base_directory tags = local.tags depends_on = [ module.vpc @@ -201,7 +198,6 @@ module "agentless_gw_dr" { proxy_private_ssh_key_path = module.key_pair.private_key_file_path proxy_ssh_user = module.hub_main.ssh_user } - base_directory = var.sonar_machine_base_directory tags = local.tags depends_on = [ module.vpc diff --git a/examples/poc/sonar_hadr_deployment/variables.tf b/examples/poc/sonar_hadr_deployment/variables.tf index e83c92fee..498259c2b 100644 --- a/examples/poc/sonar_hadr_deployment/variables.tf +++ b/examples/poc/sonar_hadr_deployment/variables.tf @@ -153,9 +153,3 @@ variable "db_types_to_onboard" { error_message = "Valid values should contain at least one of the following: 'RDS MySQL', 'RDS MsSQL'." } } - -variable "sonar_machine_base_directory" { - type = string - default = "/imperva" - description = "The base directory where all Sonar related directories will be installed" -}