Merge branch 'main' into standalone-apm-server-tbs

carsonip · web-flow · commit 2d7483e41eef · 2025-01-23T09:29:11.000Z
diff --git a/testing/infra/terraform/modules/ec_deployment/outputs.tf b/testing/infra/terraform/modules/ec_deployment/outputs.tf
@@ -9,7 +9,7 @@ output "apm_url" {
 }
 
 output "apm_secret_token" {
-  value       = var.integrations_server ? data.local_sensitive_file.secret_token.content : ec_deployment.deployment.apm_secret_token
+  value       = var.integrations_server ? chomp(data.local_sensitive_file.secret_token.content) : ec_deployment.deployment.apm_secret_token
   sensitive   = true
   description = "The APM Secret token"
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ output "apm_url" {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`output "apm_secret_token" {`
`12`		`- value = var.integrations_server ? data.local_sensitive_file.secret_token.content : ec_deployment.deployment.apm_secret_token`
	`12`	`+ value = var.integrations_server ? chomp(data.local_sensitive_file.secret_token.content) : ec_deployment.deployment.apm_secret_token`
`13`	`13`	`sensitive = true`
`14`	`14`	`description = "The APM Secret token"`
`15`	`15`	`}`