diff --git a/enos/enos-scenario-e2e-target.hcl b/enos/enos-scenario-e2e-target.hcl index 08bab9ed2..b4c35bea1 100644 --- a/enos/enos-scenario-e2e-target.hcl +++ b/enos/enos-scenario-e2e-target.hcl @@ -18,6 +18,11 @@ scenario "e2e_target" { "local" = "/tmp", "crt" = var.crt_bundle_path == null ? null : abspath(var.crt_bundle_path) } + tags = merge({ + "Project Name" : var.project_name + "Project" : "Enos", + "Environment" : "ci" + }, var.tags) } step "find_azs" { @@ -48,6 +53,7 @@ scenario "e2e_target" { variables { availability_zones = step.find_azs.availability_zones + common_tags = local.tags } } @@ -60,6 +66,7 @@ scenario "e2e_target" { variables { boundary_install_dir = local.boundary_install_dir + common_tags = local.tags controller_instance_type = var.controller_instance_type controller_count = var.controller_count db_pass = step.create_db_password.string diff --git a/enos/enos-variables.hcl b/enos/enos-variables.hcl index 4d4ffce78..7d6ee3e26 100644 --- a/enos/enos-variables.hcl +++ b/enos/enos-variables.hcl @@ -52,6 +52,18 @@ variable "alb_listener_api_port" { default = 9200 } +variable "project_name" { + description = "The description of the project" + type = string + default = "boundary-enos-integration" +} + +variable "tags" { + description = "Tags that will be applied to infrastructure resources that support tagging" + type = map(string) + default = null +} + variable "target_instance_type" { description = "Instance type for test target nodes" type = string diff --git a/enos/enos.hcl b/enos/enos.hcl index bb3d12d06..09b106af1 100644 --- a/enos/enos.hcl +++ b/enos/enos.hcl @@ -54,6 +54,11 @@ scenario "integration" { "local" = "/tmp", "crt" = var.crt_bundle_path == null ? null : abspath(var.crt_bundle_path) } + tags = merge({ + "Project Name" : var.project_name + "Project" : "Enos", + "Environment" : "ci" + }, var.tags) } step "ensure_bats_and_deps_are_installed" { @@ -89,6 +94,7 @@ scenario "integration" { variables { availability_zones = step.find_azs.availability_zones + common_tags = local.tags } } @@ -101,6 +107,7 @@ scenario "integration" { variables { boundary_install_dir = local.boundary_install_dir + common_tags = local.tags controller_instance_type = var.controller_instance_type controller_count = var.controller_count db_pass = step.create_db_password.string