terraform: add apm-server prefix to benchmarks (#14914) (#14916)

Adds the apm-server prefix to the benchmarks project tag to facilitate filtering for project. Signed-off-by: Marc Lopez Rubio <[email protected]> (cherry picked from commit f4937b4) Co-authored-by: Marc Lopez Rubio <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
elastic · Dec 12, 2024 · 44a71ca · 44a71ca
1 parent c5d8aaa
commit 44a71ca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/testing/benchmark/main.tf b/testing/benchmark/main.tf
@@ -26,19 +26,23 @@ locals {
     build        = var.BUILD_ID
     created_date = coalesce(var.CREATED_DATE, time_static.created_date.unix)
   }
+  project = "apm-server-benchmarks"
 }
 
 module "tags" {
   source = "../infra/terraform/modules/tags"
   # use the convention for team/shared owned resources if we are running in CI.
   # assume this is an individually owned resource otherwise.
-  project = startswith(var.user_name, "benchci") ? "benchmarks" : var.user_name
+  project = startswith(var.user_name, "benchci") ? local.project : "${local.project}-${var.user_name}"
 }
 
 provider "ec" {}
 
 provider "aws" {
   region = var.worker_region
+  default_tags {
+    tags = merge(local.ci_tags, module.tags.labels)
+  }
 }
 
 locals {

diff --git a/testing/infra/terraform/modules/rally_workers/main.tf b/testing/infra/terraform/modules/rally_workers/main.tf
@@ -1,6 +1,7 @@
 provider "google" {
-  project = var.gcp_project
-  region  = var.gcp_region
+  project        = var.gcp_project
+  region         = var.gcp_region
+  default_labels = module.tags
 }
 
 locals {

diff --git a/testing/infra/terraform/modules/soaktest_workers/main.tf b/testing/infra/terraform/modules/soaktest_workers/main.tf
@@ -72,10 +72,6 @@ resource "google_compute_instance" "worker" {
     access_config {}
   }
 
-  labels = merge(module.tags.labels, {
-    workspace = terraform.workspace
-  })
-
   metadata = {
     ssh-keys = "${local.ssh_user_name}:${data.tls_public_key.worker_login.public_key_openssh}"
   }

diff --git a/testing/infra/terraform/modules/soaktest_workers/provider.tf b/testing/infra/terraform/modules/soaktest_workers/provider.tf
@@ -2,4 +2,8 @@ provider "google" {
   project = var.gcp_project
   region  = var.gcp_region
   zone    = var.gcp_zone
+
+  default_labels = merge(module.tags.labels, {
+    workspace = terraform.workspace
+  })
 }