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