From d9b163c6a1b1bf50ddb079f9cbf92eebbab5534a Mon Sep 17 00:00:00 2001 From: Christopher Papke Date: Tue, 3 Oct 2023 08:18:47 -0700 Subject: [PATCH 1/3] format modules --- modules/aws/sonar-upgrader/main.tf | 2 +- modules/aws/sonar-upgrader/variables.tf | 40 ++++++++++++------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/aws/sonar-upgrader/main.tf b/modules/aws/sonar-upgrader/main.tf index 151632ee0..61aeb032d 100644 --- a/modules/aws/sonar-upgrader/main.tf +++ b/modules/aws/sonar-upgrader/main.tf @@ -15,7 +15,7 @@ locals { resource "null_resource" "upgrade_cmd" { provisioner "local-exec" { - command = local.upgrade_cmd + command = local.upgrade_cmd interpreter = ["bash", "-c"] } diff --git a/modules/aws/sonar-upgrader/variables.tf b/modules/aws/sonar-upgrader/variables.tf index eb5bddc46..31a47a669 100644 --- a/modules/aws/sonar-upgrader/variables.tf +++ b/modules/aws/sonar-upgrader/variables.tf @@ -1,9 +1,9 @@ variable "agentless_gws" { type = list(object({ main = optional(object({ - host = string # IP or hostname, can be private or public - ssh_user = string - ssh_private_key_file_path = string + host = string # IP or hostname, can be private or public + ssh_user = string + ssh_private_key_file_path = string proxy = optional(object({ host = string # IP or hostname, can be private or public ssh_user = string @@ -11,9 +11,9 @@ variable "agentless_gws" { })) })), dr = optional(object({ - host = string # IP or hostname, can be private or public - ssh_user = string - ssh_private_key_file_path = string + host = string # IP or hostname, can be private or public + ssh_user = string + ssh_private_key_file_path = string proxy = optional(object({ host = string # IP or hostname, can be private or public ssh_user = string @@ -21,9 +21,9 @@ variable "agentless_gws" { })) })), minor = optional(object({ - host = string # IP or hostname, can be private or public - ssh_user = string - ssh_private_key_file_path = string + host = string # IP or hostname, can be private or public + ssh_user = string + ssh_private_key_file_path = string proxy = optional(object({ host = string # IP or hostname, can be private or public ssh_user = string @@ -39,9 +39,9 @@ variable "agentless_gws" { variable "dsf_hubs" { type = list(object({ main = optional(object({ - host = string # IP or hostname, can be private or public - ssh_user = string - ssh_private_key_file_path = string + host = string # IP or hostname, can be private or public + ssh_user = string + ssh_private_key_file_path = string proxy = optional(object({ host = string # IP or hostname, can be private or public ssh_user = string @@ -49,9 +49,9 @@ variable "dsf_hubs" { })) })), dr = optional(object({ - host = string # IP or hostname, can be private or public - ssh_user = string - ssh_private_key_file_path = string + host = string # IP or hostname, can be private or public + ssh_user = string + ssh_private_key_file_path = string proxy = optional(object({ host = string # IP or hostname, can be private or public ssh_user = string @@ -59,9 +59,9 @@ variable "dsf_hubs" { })) })), minor = optional(object({ - host = string # IP or hostname, can be private or public - ssh_user = string - ssh_private_key_file_path = string + host = string # IP or hostname, can be private or public + ssh_user = string + ssh_private_key_file_path = string proxy = optional(object({ host = string # IP or hostname, can be private or public ssh_user = string @@ -81,8 +81,8 @@ variable "target_version" { } variable "connection_timeout" { - type = number - default = 90 + type = number + default = 90 description = "Client connection timeout in seconds used for the SSH connections between the installer machine and the DSF nodes being upgraded. Its purpose is to ensure a uniform behavior across different platforms. Note that the SSH server in the DSF nodes may have its own timeout configurations which may override this setting." } From 431db64e9acc89dc584ee1deea4b4f5d5185a1c8 Mon Sep 17 00:00:00 2001 From: Christopher Papke Date: Mon, 16 Oct 2023 10:00:07 -0700 Subject: [PATCH 2/3] format --- modules/aws/sonar-base-instance/userdata.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/aws/sonar-base-instance/userdata.tf b/modules/aws/sonar-base-instance/userdata.tf index 95dd625cc..067fec5ab 100644 --- a/modules/aws/sonar-base-instance/userdata.tf +++ b/modules/aws/sonar-base-instance/userdata.tf @@ -3,9 +3,9 @@ locals { bastion_private_key = try(file(var.proxy_info.proxy_private_ssh_key_path), "") bastion_user = try(var.proxy_info.proxy_ssh_user, null) - instance_address = var.use_public_ip ? local.public_ip : local.private_ip - display_name = var.name - sonar_base_directory = var.base_directory != null ? var.base_directory : "" + instance_address = var.use_public_ip ? local.public_ip : local.private_ip + display_name = var.name + sonar_base_directory = var.base_directory != null ? var.base_directory : "" script_path = var.terraform_script_path_folder == null ? null : (join("/", [var.terraform_script_path_folder, "terraform_%RAND%.sh"])) install_script = templatefile("${path.module}/setup.tftpl", { From f1c2ae5bab94ac3e332649b152bdb859d160ed75 Mon Sep 17 00:00:00 2001 From: Christopher Papke Date: Tue, 31 Oct 2023 06:58:12 -0700 Subject: [PATCH 3/3] format --- modules/aws/hub/dra_assocoation.tf | 10 +++++----- modules/aws/hub/variables.tf | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/aws/hub/dra_assocoation.tf b/modules/aws/hub/dra_assocoation.tf index e9c75df34..6729dffb8 100644 --- a/modules/aws/hub/dra_assocoation.tf +++ b/modules/aws/hub/dra_assocoation.tf @@ -1,10 +1,10 @@ locals { # we are using one password for all services and we have one DRA only - admin_password = var.dra_details == null ? "" : urlencode(var.dra_details.password) - archiver_password = var.dra_details == null ? "" : urlencode(var.dra_details.archiver_password) - admin_username = var.dra_details == null ? "" : var.dra_details.username - admin_address = var.dra_details == null ? "" : var.dra_details.address - dra_association_commands = var.dra_details == null ? "" : <<-EOF + admin_password = var.dra_details == null ? "" : urlencode(var.dra_details.password) + archiver_password = var.dra_details == null ? "" : urlencode(var.dra_details.archiver_password) + admin_username = var.dra_details == null ? "" : var.dra_details.username + admin_address = var.dra_details == null ? "" : var.dra_details.address + dra_association_commands = var.dra_details == null ? "" : <<-EOF curl -k --max-time 10000 -X POST -G 'https://127.0.0.1:8443/register-to-dra' -d adminIpOrHostname=${local.admin_address} -d adminRegistrationPassword=${local.admin_password} -d adminReportingServer=true -d analyticsArchiveUsername=${local.admin_username} -d analyticsArchivePassword=${local.archiver_password} -d resumeDraJobs=true --header "Authorization: Bearer ${module.hub_instance.access_tokens["archiver"].token}" EOF } diff --git a/modules/aws/hub/variables.tf b/modules/aws/hub/variables.tf index beda8412c..f308cba93 100644 --- a/modules/aws/hub/variables.tf +++ b/modules/aws/hub/variables.tf @@ -284,18 +284,18 @@ variable "mx_details" { variable "dra_details" { description = "List of the DSF DRA to onboard to Sonar Hub" type = object({ - name = string - address = string - username = string - password = string + name = string + address = string + username = string + password = string archiver_password = string }) validation { - condition = (var.dra_details == null || (can(var.dra_details.name) && can(var.dra_details.address))) + condition = (var.dra_details == null || (can(var.dra_details.name) && can(var.dra_details.address))) error_message = "Each DRA Admin must specify name and address" } validation { - condition = (var.dra_details == null || (can(var.dra_details.username) && can(var.dra_details.password))) + condition = (var.dra_details == null || (can(var.dra_details.username) && can(var.dra_details.password))) error_message = "Each DRA Admin must specify username and password" } default = null