test(e2e): Add user name to AWS resources (#5149)

This change makes it easier to identify who generated these resources when looking at the AWS console
This commit is contained in:
Michael Li authored and GitHub committed 2024-10-07 14:12:00 -04:00
1 parent a7105868d1
commit 9398248c32
4 files changed
+11 -5

No files matched your search

@@ -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,
},
)
+3 -1
View File
@@ -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",
+1 -1
View File
@@ -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
},
)
+3 -1
View File
@@ -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]}"
},
)
}