From 918ad461fee565bbc09a0d2faf1a429a7643bb37 Mon Sep 17 00:00:00 2001
From: Kostiantyn Masliuk <1pkg@protonmail.com>
Date: Thu, 2 Jan 2025 08:04:54 -0800
Subject: [PATCH] benchmarking: moxy use default tags only (#15078)

---
 testing/benchmark/main.tf                                   | 2 --
 testing/infra/terraform/modules/moxy/main.tf                | 3 ---
 testing/infra/terraform/modules/moxy/variables.tf           | 6 ------
 .../infra/terraform/modules/standalone_apm_server/main.tf   | 3 ---
 .../terraform/modules/standalone_apm_server/variables.tf    | 6 ------
 5 files changed, 20 deletions(-)

diff --git a/testing/benchmark/main.tf b/testing/benchmark/main.tf
index 98e6ca317a7..134725343af 100644
--- a/testing/benchmark/main.tf
+++ b/testing/benchmark/main.tf
@@ -146,7 +146,6 @@ module "moxy" {
 
   aws_provisioner_key_name = var.private_key
 
-  tags       = merge(local.ci_tags, module.tags.tags)
   depends_on = [module.vpc]
 }
 
@@ -167,6 +166,5 @@ module "standalone_apm_server" {
   elasticsearch_username = "elastic"
   elasticsearch_password = module.moxy[0].moxy_password
 
-  tags       = merge(local.ci_tags, module.tags.tags)
   depends_on = [module.moxy]
 }
diff --git a/testing/infra/terraform/modules/moxy/main.tf b/testing/infra/terraform/modules/moxy/main.tf
index 245b69f0987..7247940b50e 100644
--- a/testing/infra/terraform/modules/moxy/main.tf
+++ b/testing/infra/terraform/modules/moxy/main.tf
@@ -88,13 +88,10 @@ resource "aws_instance" "moxy" {
       "sleep 1"
     ]
   }
-
-  tags = var.tags
 }
 
 resource "aws_key_pair" "provisioner_key" {
   public_key = file("${var.aws_provisioner_key_name}.pub")
-  tags       = var.tags
 }
 
 resource "random_password" "moxy_password" {
diff --git a/testing/infra/terraform/modules/moxy/variables.tf b/testing/infra/terraform/modules/moxy/variables.tf
index 4c8538b2661..ee167ef37b0 100644
--- a/testing/infra/terraform/modules/moxy/variables.tf
+++ b/testing/infra/terraform/modules/moxy/variables.tf
@@ -17,9 +17,3 @@ variable "moxy_bin_path" {
   type        = string
   description = "Moxy path to binary to copy to the worker machine"
 }
-
-variable "tags" {
-  type        = map(string)
-  default     = {}
-  description = "Optional set of tags to use for all resources"
-}
diff --git a/testing/infra/terraform/modules/standalone_apm_server/main.tf b/testing/infra/terraform/modules/standalone_apm_server/main.tf
index e426fa0e5ce..759a1e6a396 100644
--- a/testing/infra/terraform/modules/standalone_apm_server/main.tf
+++ b/testing/infra/terraform/modules/standalone_apm_server/main.tf
@@ -217,8 +217,6 @@ resource "aws_instance" "apm" {
       ]
     )
   }
-
-  tags = var.tags
 }
 
 resource "null_resource" "apm_server_log" {
@@ -247,7 +245,6 @@ data "external" "latest_apm_server" {
 
 resource "aws_key_pair" "provisioner_key" {
   public_key = file("${var.aws_provisioner_key_name}.pub")
-  tags       = var.tags
 }
 
 resource "random_password" "apm_secret_token" {
diff --git a/testing/infra/terraform/modules/standalone_apm_server/variables.tf b/testing/infra/terraform/modules/standalone_apm_server/variables.tf
index dbdf8dd7239..fbf61ae4290 100644
--- a/testing/infra/terraform/modules/standalone_apm_server/variables.tf
+++ b/testing/infra/terraform/modules/standalone_apm_server/variables.tf
@@ -54,9 +54,3 @@ variable "apm_server_bin_path" {
   type        = string
   description = "Optionally use the apm-server binary from the specified path instead"
 }
-
-variable "tags" {
-  type        = map(string)
-  default     = {}
-  description = "Optional set of tags to use for all deployments"
-}