Skip to content

Commit

Permalink
Set sonar_machine_base_directory variable to all installation examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@assaf13
assaf13 committed Oct 15, 2023
1 parent c91c59d commit 9d58c03
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 10 deletions.
4 changes: 4 additions & 0 deletions examples/installation/dsf_single_account_deployment/sonar.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions examples/installation/dsf_single_account_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ####
##############################
Expand Down
4 changes: 4 additions & 0 deletions examples/installation/sonar_multi_account_deployment/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions examples/installation/sonar_multi_account_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
3 changes: 3 additions & 0 deletions examples/installation/sonar_single_account_deployment/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}

Expand Down
6 changes: 6 additions & 0 deletions examples/installation/sonar_single_account_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 0 additions & 4 deletions examples/poc/sonar_hadr_deployment/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions examples/poc/sonar_hadr_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

0 comments on commit 9d58c03

Please sign in to comment.