Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:imperva/dsfkit into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@eytannnaim
eytannnaim committed Nov 16, 2023
2 parents 8616a54 + 9113b3f commit ec43867
Show file tree
Hide file tree
Showing 11 changed files with 254 additions and 237 deletions.
8 changes: 4 additions & 4 deletions examples/aws/installation/dsf_single_account_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,25 +427,25 @@ variable "sonar_terraform_script_path_folder" {
variable "sonarw_hub_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_hub_public_key_file_path" {
type = string
default = null
description = "The DSF Hub sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc."
description = "The DSF Hub sonarw user SSH public key file path - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_gw_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_gw_public_key_file_path" {
type = string
default = null
description = "The Agentless Gateway sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc."
description = "The Agentless Gateway sonarw user SSH public key file path - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonar_machine_base_directory" {
Expand Down
8 changes: 4 additions & 4 deletions examples/aws/installation/sonar_multi_account_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,25 +320,25 @@ variable "terraform_script_path_folder" {
variable "sonarw_hub_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_hub_public_key_file_path" {
type = string
default = null
description = "The DSF Hub sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc."
description = "The DSF Hub sonarw user SSH public key file path - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_gw_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_gw_public_key_file_path" {
type = string
default = null
description = "The Agentless Gateway sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc."
description = "The Agentless Gateway sonarw user SSH public key file path - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonar_machine_base_directory" {
Expand Down
8 changes: 4 additions & 4 deletions examples/aws/installation/sonar_single_account_deployment/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,25 +233,25 @@ variable "terraform_script_path_folder" {
variable "sonarw_hub_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_hub_public_key_file_path" {
type = string
default = null
description = "The DSF Hub sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc."
description = "The DSF Hub sonarw user SSH public key file path - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_gw_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_gw_public_key_file_path" {
type = string
default = null
description = "The Agentless Gateway sonarw user public key file path - used for remote Agentless Gateway federation, HADR, etc."
description = "The Agentless Gateway sonarw user SSH public key file path - used for remote Agentless Gateway federation, HADR, etc."
}

variable "use_hub_as_proxy" {
Expand Down
4 changes: 2 additions & 2 deletions modules/aws/agentless-gw/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,13 @@ variable "terraform_script_path_folder" {
variable "sonarw_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the Agentless Gateway sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_public_key_content" {
type = string
default = null
description = "The Agentless Gateway sonarw user public key - used for remote Agentless Gateway federation, HADR, etc."
description = "The Agentless Gateway sonarw user SSH public key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "volume_attachment_device_name" {
Expand Down
4 changes: 2 additions & 2 deletions modules/aws/hub/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,13 @@ variable "terraform_script_path_folder" {
variable "sonarw_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the DSF Hub sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_public_key_content" {
type = string
default = null
description = "The DSF Hub sonarw user public key - used for remote Agentless Gateway federation, HADR, etc."
description = "The DSF Hub sonarw user SSH public key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "generate_access_tokens" {
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/sonar-base-instance/secret.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ locals {
resource "aws_secretsmanager_secret" "sonarw_private_key_secret" {
count = local.should_create_sonarw_private_key_in_secrets_manager == true ? 1 : 0
name_prefix = "${var.name}-sonarw-private-key"
description = "Imperva DSF node sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Imperva DSF node sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
tags = var.tags
}

Expand Down
8 changes: 4 additions & 4 deletions modules/aws/sonar-base-instance/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ variable "main_node_sonarw_public_key" {

variable "main_node_sonarw_private_key" {
type = string
description = "Private key of the sonarw user taken from the main node output. This variable must only be defined for the DR node."
description = "SSH private key of the sonarw user taken from the main node output. This variable must only be defined for the DR node."
default = null
}

Expand All @@ -183,7 +183,7 @@ variable "proxy_info" {

variable "hub_sonarw_public_key" {
type = string
description = "Public key of the sonarw user taken from the main Hub output. This variable must only be defined for the Gateway. Used, for example, in federation."
description = "SSH public key of the sonarw user taken from the main Hub output. This variable must only be defined for the Gateway. Used, for example, in federation."
default = null
}

Expand All @@ -204,13 +204,13 @@ variable "terraform_script_path_folder" {
variable "sonarw_private_key_secret_name" {
type = string
default = null
description = "Secret name in AWS secrets manager which holds the DSF node sonarw user private key - used for remote Agentless Gateway federation, HADR, etc."
description = "Secret name in AWS secrets manager which holds the DSF node sonarw user SSH private key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "sonarw_public_key_content" {
type = string
default = null
description = "The DSF node sonarw user public key - used for remote Agentless Gateway federation, HADR, etc."
description = "The DSF node sonarw user SSH public key - used for remote Agentless Gateway federation, HADR, etc."
}

variable "generate_access_tokens" {
Expand Down
Loading

0 comments on commit ec43867

Please sign in to comment.