Push ec_target down to ec_deployment

Author: carsonip

testing/benchmark/main.tf

@@ -29,8 +29,8 @@ locals {
   project   = "apm-server-benchmarks"
   ec_target = lower(var.ec_target)
   api_endpoints = {
-    qa   = "https://public-api.qa.cld.elstc.co"
-    pro  = "https://api.elastic-cloud.com"
+    qa  = "https://public-api.qa.cld.elstc.co"
+    pro = "https://api.elastic-cloud.com"
   }
 }
 
@@ -99,6 +99,7 @@ module "ec_deployment" {
   count  = var.run_standalone ? 0 : 1
   source = "../infra/terraform/modules/ec_deployment"
 
+  ec_target     = var.ec_target
   region        = var.ess_region
   stack_version = var.stack_version
 

testing/benchmark/outputs.tf

@@ -1,12 +1,3 @@
-locals {
-  ec_target = lower(var.ec_target)
-  adminconsole_urls = {
-    qa   = "https://admin.qa.cld.elstc.co"
-    pro  = "https://cloud.elastic.co"
-  }
-  ec_console_url = local.adminconsole_urls[local.ec_target]
-}
-
 output "public_ip" {
   value       = module.benchmark_worker.public_ip
   description = "The worker public IP"
@@ -57,6 +48,6 @@ output "moxy_ip" {
 }
 
 output "admin_console_url" {
-  value       = var.run_standalone ? "${local.ec_console_url}/deployments" : "${local.ec_console_url}/deployments/${module.ec_deployment[0].deployment_id}/integrations_server"
+  value       = var.run_standalone ? "https://cloud.elastic.co/deployments" : module.ec_deployment[0].admin_console_url
   description = "The admin console URL"
 }

testing/infra/terraform/modules/ec_deployment/outputs.tf

@@ -1,3 +1,10 @@
+locals {
+  admin_console_urls = {
+    qa  = "https://admin.qa.cld.elstc.co"
+    pro = "https://cloud.elastic.co"
+  }
+}
+
 output "deployment_id" {
   value       = ec_deployment.deployment.id
   description = "The deployment ID for the created cluster"
@@ -46,7 +53,7 @@ output "stack_version" {
 }
 
 output "admin_console_url" {
-  value = "https://admin.found.no/deployments/${ec_deployment.deployment.id}/integrations_server"
+  value = "${local.admin_console_urls[lower(var.ec_target)]}/deployments/${ec_deployment.deployment.id}/integrations_server"
 }
 
 output "ech_apm_component_id" {

testing/infra/terraform/modules/ec_deployment/variables.tf

@@ -18,6 +18,16 @@ variable "deployment_template" {
   type        = string
 }
 
+variable "ec_target" {
+  default     = "pro"
+  description = "Elastic Cloud target for endpoint-specific links"
+  type        = string
+  validation {
+    condition     = contains(["qa", "pro"], lower(var.ec_target))
+    error_message = "ec_target must be one of: qa, pro"
+  }
+}
+
 variable "stack_version" {
   default     = "latest"
   description = "Optional stack version"