From bd1e502def45e8ad7864d07eacd904b6e6af4528 Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Wed, 7 Aug 2024 16:19:23 +0200
Subject: [PATCH] terraform: enable build tag (#13841)

(cherry picked from commit b4c79b3ab0245090f2439b78a04dabf5b6451ae9)

# Conflicts:
#	testing/infra/terraform/modules/tags/output.tf
---
 testing/infra/terraform/modules/tags/README.md | 1 +
 testing/infra/terraform/modules/tags/output.tf | 3 +++
 testing/infra/terraform/modules/tags/vars.tf   | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/testing/infra/terraform/modules/tags/README.md b/testing/infra/terraform/modules/tags/README.md
index 351720d6a7a..6b3d4d171f2 100644
--- a/testing/infra/terraform/modules/tags/README.md
+++ b/testing/infra/terraform/modules/tags/README.md
@@ -8,6 +8,7 @@ This modules exports the default tags / labels to use on Cloud Service Providers
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_project"></a> [project](#input\_project) | The value to use for the project tag/label | `any` | n/a | yes |
+| <a name="input_build"></a> [build](#input\_build) | The value to use for the build tag/label, normally related to the CICD executions. | `any` | `unknown` | no |
 
 ## Outputs
 
diff --git a/testing/infra/terraform/modules/tags/output.tf b/testing/infra/terraform/modules/tags/output.tf
index 0731f8f9b96..d466c77d789 100644
--- a/testing/infra/terraform/modules/tags/output.tf
+++ b/testing/infra/terraform/modules/tags/output.tf
@@ -5,7 +5,10 @@ locals {
     "team" : "apm-server"
     "project" : var.project
     "build" : var.build
+<<<<<<< HEAD
     "ephemeral" : "true"
+=======
+>>>>>>> b4c79b3ab (terraform: enable build tag (#13841))
   }
 }
 
diff --git a/testing/infra/terraform/modules/tags/vars.tf b/testing/infra/terraform/modules/tags/vars.tf
index 72bd8a5a15a..b4ca5f35985 100644
--- a/testing/infra/terraform/modules/tags/vars.tf
+++ b/testing/infra/terraform/modules/tags/vars.tf
@@ -1,3 +1,8 @@
 variable "project" {
   description = "The value to use for the project tag/label"
 }
+
+variable "build" {
+  description = "The value to use for the build tag/label"
+  default     = "unknown"
+}