test(e2e): Add user name to AWS resources

This change makes it easier to identify who generated these resources when looking at the AWS console
hashicorp · Oct 4, 2024 · 991907c · 991907c
1 parent 21230e1
commit 991907c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/enos/modules/aws_boundary/boundary-instances.tf b/enos/modules/aws_boundary/boundary-instances.tf
@@ -1,6 +1,8 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: BUSL-1.1
 
+data "aws_caller_identity" "current" {}
+
 resource "aws_instance" "controller" {
   count         = var.controller_count
   ami           = var.ubuntu_ami_id
@@ -24,7 +26,7 @@ resource "aws_instance" "controller" {
 
   tags = merge(local.common_tags,
     {
-      Name = "${local.name_prefix}-boundary-controller-${count.index}"
+      Name = "${local.name_prefix}-boundary-controller-${count.index}-${split(":", data.aws_caller_identity.current.user_id)[1]}"
       Type = local.boundary_cluster_tag,
     },
   )
@@ -50,7 +52,7 @@ resource "aws_instance" "worker" {
 
   tags = merge(local.common_tags,
     {
-      Name = "${local.name_prefix}-boundary-worker-${count.index}",
+      Name = "${local.name_prefix}-boundary-worker-${count.index}-${split(":", data.aws_caller_identity.current.user_id)[1]}",
       Type = local.boundary_cluster_tag,
     },
   )

diff --git a/enos/modules/aws_boundary/rds.tf b/enos/modules/aws_boundary/rds.tf
@@ -32,7 +32,7 @@ resource "aws_db_instance" "boundary" {
   performance_insights_enabled = true
   tags = merge(local.common_tags,
     {
-      Name = "boundary-db-${random_string.cluster_id.result}"
+      Name = "boundary-db-${random_string.cluster_id.result}-${split(":", data.aws_caller_identity.current.user_id)[1]}"
       Type = local.boundary_cluster_tag
     },
   )

diff --git a/enos/modules/aws_target/main.tf b/enos/modules/aws_target/main.tf
@@ -28,6 +28,8 @@ variable "ingress_cidr" {
 
 data "enos_environment" "current" {}
 
+data "aws_caller_identity" "current" {}
+
 resource "aws_security_group" "boundary_target" {
   name_prefix = "boundary-target-sg"
   description = "SSH and boundary Traffic"
@@ -70,7 +72,7 @@ resource "aws_instance" "target" {
   key_name               = var.aws_ssh_keypair_name
 
   tags = merge(var.additional_tags, {
-    "Name" : "boundary-target-${count.index}",
+    "Name" : "boundary-target-${count.index}-${split(":", data.aws_caller_identity.current.user_id)[1]}",
     "Type" : "target",
     "Project" : "Enos",
     "Project Name" : "qti-enos-boundary",

diff --git a/enos/modules/aws_vault/main.tf b/enos/modules/aws_vault/main.tf
@@ -12,6 +12,8 @@ terraform {
 
 data "enos_environment" "localhost" {}
 
+data "aws_caller_identity" "current" {}
+
 resource "random_string" "cluster_id" {
   length  = 8
   lower   = true

diff --git a/enos/modules/aws_vault/vault-instances.tf b/enos/modules/aws_vault/vault-instances.tf
@@ -12,7 +12,7 @@ resource "aws_instance" "vault_instance" {
   tags = merge(
     var.common_tags,
     {
-      Name = "${local.name_suffix}-vault-${var.vault_node_prefix}-${each.key}"
+      Name = "${local.name_suffix}-vault-${var.vault_node_prefix}-${each.key}-${split(":", data.aws_caller_identity.current.user_id)[1]}"
       Type = local.vault_cluster_tag
     },
   )

diff --git a/enos/modules/aws_vpc/main.tf b/enos/modules/aws_vpc/main.tf
@@ -55,6 +55,8 @@ locals {
   )
 }
 
+data "aws_caller_identity" "current" {}
+
 data "aws_availability_zones" "available" {
   state = "available"
 
@@ -137,7 +139,7 @@ resource "aws_vpc" "vpc" {
   tags = merge(
     local.common_tags,
     {
-      "Name" = var.name
+      "Name" = "${var.name}-${split(":", data.aws_caller_identity.current.user_id)[1]}"
     },
   )
 }