From 820eb395a3ba7aeec9a6780ee7c0a377b497acea Mon Sep 17 00:00:00 2001 From: Michael Li Date: Mon, 18 Nov 2024 15:02:19 -0500 Subject: [PATCH] chore(e2e): Increase worker instance size (#5251) * chore(e2e): Update to use t2.small instances Using the updated AWS SDK required more memory and was causing workers to crash. * chore(e2e): Add identifier to aws instance --- enos/modules/aws_boundary/variables.tf | 4 ++-- enos/modules/aws_worker/main.tf | 3 ++- enos/modules/aws_worker/variables.tf | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/enos/modules/aws_boundary/variables.tf b/enos/modules/aws_boundary/variables.tf index abeaf87080..1509dd3723 100644 --- a/enos/modules/aws_boundary/variables.tf +++ b/enos/modules/aws_boundary/variables.tf @@ -25,7 +25,7 @@ variable "worker_count" { variable "worker_instance_type" { description = "EC2 Instance type" type = string - default = "t2.micro" + default = "t2.small" } variable "worker_type_tags" { @@ -72,7 +72,7 @@ variable "controller_count" { variable "controller_instance_type" { description = "EC2 Instance type" type = string - default = "t2.micro" + default = "t2.small" } variable "controller_ebs_iops" { diff --git a/enos/modules/aws_worker/main.tf b/enos/modules/aws_worker/main.tf index 67b8a8d8d8..1d1ce692dc 100644 --- a/enos/modules/aws_worker/main.tf +++ b/enos/modules/aws_worker/main.tf @@ -10,6 +10,7 @@ terraform { } data "enos_environment" "current" {} +data "aws_caller_identity" "current" {} locals { selected_az = data.aws_availability_zones.available.names[random_integer.az.result] @@ -144,7 +145,7 @@ resource "aws_instance" "worker" { tags = merge( local.common_tags, { - Name = "${var.name_prefix}-boundary-worker", + Name = "${var.name_prefix}-boundary-worker-${split(":", data.aws_caller_identity.current.user_id)[1]}", }, ) } diff --git a/enos/modules/aws_worker/variables.tf b/enos/modules/aws_worker/variables.tf index dcda83f665..2b3dfbe426 100644 --- a/enos/modules/aws_worker/variables.tf +++ b/enos/modules/aws_worker/variables.tf @@ -31,7 +31,7 @@ variable "ubuntu_ami_id" { variable "worker_instance_type" { description = "The EC2 Instance type to be used for the worker's node" type = string - default = "t2.micro" + default = "t2.small" } variable "ssh_aws_keypair" {