CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(e2e): Remove aws_ssh_keypair requirement (#6583)

Browse Source 
* chore(e2e): Remove ssh key pair variable requirement

* CR

---------

Co-authored-by: Tony <wongtonyb@gmail.com>
This commit is contained in:
Michael LiandTony authored and GitHub committed 2026-04-16 13:42:08 -04:00
1 parent 0d4ff79f0b
commit f735676657
32 files changed
+499 -147
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

enos/ci/hcp-resources/main.tf
+17 -4
View File
@@ -27,11 +27,22 @@ provider "aws" {
region = var.aws_region
}
locals {
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
}
module "generate_ssh_key" {
source = "../../modules/aws_ssh_keypair"
local_key_path = local.aws_ssh_private_key_path
local_aws_keypair_name = var.aws_ssh_keypair_name != null ? var.aws_ssh_keypair_name : null
}
provider "enos" {
transport = {
ssh = {
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
private_key_path = module.generate_ssh_key.private_key_path
}
}
}
@@ -85,7 +96,7 @@ module "base_infra" {
}
module "worker" {
depends_on = [module.base_infra]
depends_on = [module.base_infra, module.generate_ssh_key]
source = "../../modules/aws_boundary"
controller_count = 0
@@ -93,7 +104,8 @@ module "worker" {
db_create = false
aws_region = var.aws_region
hcp_boundary_cluster_id = var.hcp_boundary_cluster_id
ssh_aws_keypair = var.aws_ssh_keypair_name
aws_ssh_keypair_name = module.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = module.generate_ssh_key.private_key_path
boundary_license = module.license.license
kms_key_arn = module.base_infra.kms_key_arn
ubuntu_ami_id = module.base_infra.ami_ids["ubuntu"]["amd64"]
@@ -129,7 +141,8 @@ module "target" {
source = "../../modules/aws_target"
target_count = var.target_count
aws_ssh_keypair_name = var.aws_ssh_keypair_name
aws_ssh_keypair_name = module.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = module.generate_ssh_key.private_key_path
instance_type = local.target_instance_type
enos_user = local.cluster_tag
environment = local.environment_tag
enos/enos-modules.hcl
+8 -5
View File
@@ -23,7 +23,6 @@ module "aws_boundary" {
alb_listener_api_port = var.alb_listener_api_port
boundary_binary_name = var.boundary_binary_name
ssh_aws_keypair = var.aws_ssh_keypair_name
}
module "aws_worker" {
@@ -35,8 +34,6 @@ module "aws_worker" {
"Enos User" : var.enos_user,
"Environment" : var.environment
}
ssh_aws_keypair = var.aws_ssh_keypair_name
}
module "aws_bucket" {
@@ -114,6 +111,14 @@ module "map2list" {
source = "./modules/map2list"
}
module "aws_ssh_keypair" {
source = "./modules/aws_ssh_keypair"
}
module "ssh_keypair" {
source = "./modules/ssh_keypair"
}
module "aws_target" {
source = "./modules/aws_target"
target_count = var.target_count
@@ -142,8 +147,6 @@ module "vault" {
"Enos User" : var.enos_user,
"Environment" : var.environment
}
ssh_aws_keypair = var.aws_ssh_keypair_name
}
module "test_e2e" {
enos/enos-scenario-e2e-aws-base-with-vault.hcl
+21 -4
View File
@@ -6,7 +6,6 @@ scenario "e2e_aws_base_with_vault" {
terraform = terraform.default
providers = [
provider.aws.default,
provider.enos.default
]
matrix {
@@ -14,7 +13,7 @@ scenario "e2e_aws_base_with_vault" {
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
boundary_install_dir = abspath(var.boundary_install_dir)
license_path = abspath(var.boundary_license_path != null ? var.boundary_license_path : joinpath(path.root, "./support/boundary.hclic"))
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
@@ -77,6 +76,15 @@ scenario "e2e_aws_base_with_vault" {
}
}
step "generate_ssh_key" {
module = module.aws_ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
local_aws_keypair_name = var.aws_ssh_keypair_name != null ? var.aws_ssh_keypair_name : null
}
}
step "create_boundary_cluster" {
module = module.aws_boundary
depends_on = [
@@ -101,6 +109,8 @@ scenario "e2e_aws_base_with_vault" {
worker_count = var.worker_count
worker_instance_type = var.worker_instance_type
aws_region = var.aws_region
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -124,6 +134,8 @@ scenario "e2e_aws_base_with_vault" {
edition = "oss"
}
vpc_id = step.create_base_infra.vpc_id
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -133,7 +145,8 @@ scenario "e2e_aws_base_with_vault" {
variables {
ami_id = step.create_base_infra.ami_ids["ubuntu"]["amd64"]
aws_ssh_keypair_name = var.aws_ssh_keypair_name
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
enos_user = var.enos_user
instance_type = var.target_instance_type
vpc_id = step.create_base_infra.vpc_id
@@ -158,7 +171,7 @@ scenario "e2e_aws_base_with_vault" {
auth_login_name = step.create_boundary_cluster.auth_login_name
auth_password = step.create_boundary_cluster.auth_password
local_boundary_dir = local.local_boundary_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_target.target_private_ips[0]
target_user = "ubuntu"
target_port = "22"
@@ -189,4 +202,8 @@ scenario "e2e_aws_base_with_vault" {
output "vault_ips" {
value = step.create_vault_cluster.instance_public_ips
}
output "aws_ssh_key_path" {
value = step.generate_ssh_key.private_key_path
}
}
enos/enos-scenario-e2e-aws-base.hcl
+27 -7
View File
@@ -6,7 +6,6 @@ scenario "e2e_aws_base" {
terraform = terraform.default
providers = [
provider.aws.default,
provider.enos.default
]
matrix {
@@ -14,7 +13,7 @@ scenario "e2e_aws_base" {
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
boundary_install_dir = abspath(var.boundary_install_dir)
license_path = abspath(var.boundary_license_path != null ? var.boundary_license_path : joinpath(path.root, "./support/boundary.hclic"))
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
@@ -76,12 +75,22 @@ scenario "e2e_aws_base" {
}
}
step "generate_ssh_key" {
module = module.aws_ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
local_aws_keypair_name = var.aws_ssh_keypair_name != null ? var.aws_ssh_keypair_name : null
}
}
step "create_boundary_cluster" {
module = module.aws_boundary
depends_on = [
step.create_base_infra,
step.create_db_password,
step.build_boundary
step.build_boundary,
step.generate_ssh_key
]
variables {
@@ -100,16 +109,22 @@ scenario "e2e_aws_base" {
worker_count = var.worker_count
worker_instance_type = var.worker_instance_type
aws_region = var.aws_region
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
step "create_target" {
module = module.aws_target
depends_on = [step.create_base_infra]
depends_on = [
step.create_base_infra,
step.generate_ssh_key
]
variables {
ami_id = step.create_base_infra.ami_ids["ubuntu"]["amd64"]
aws_ssh_keypair_name = var.aws_ssh_keypair_name
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
enos_user = var.enos_user
instance_type = var.target_instance_type
vpc_id = step.create_base_infra.vpc_id
@@ -122,7 +137,8 @@ scenario "e2e_aws_base" {
module = module.test_e2e
depends_on = [
step.create_boundary_cluster,
step.create_target
step.create_target,
step.generate_ssh_key
]
variables {
@@ -133,7 +149,7 @@ scenario "e2e_aws_base" {
auth_login_name = step.create_boundary_cluster.auth_login_name
auth_password = step.create_boundary_cluster.auth_password
local_boundary_dir = local.local_boundary_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_target.target_private_ips[0]
target_user = "ubuntu"
target_port = "22"
@@ -157,4 +173,8 @@ scenario "e2e_aws_base" {
output "target_ips" {
value = step.create_target.target_public_ips
}
output "aws_ssh_key_path" {
value = step.generate_ssh_key.private_key_path
}
}
enos/enos-scenario-e2e-aws-rdp-base.hcl
+22 -4
View File
@@ -10,7 +10,6 @@ scenario "e2e_aws_rdp_base" {
terraform = terraform.default
providers = [
provider.aws.default,
provider.enos.default
]
matrix {
@@ -24,7 +23,7 @@ scenario "e2e_aws_rdp_base" {
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
boundary_install_dir = abspath(var.boundary_install_dir)
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
@@ -74,6 +73,15 @@ scenario "e2e_aws_rdp_base" {
}
}
step "generate_ssh_key" {
module = module.aws_ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
local_aws_keypair_name = var.aws_ssh_keypair_name != null ? var.aws_ssh_keypair_name : null
}
}
step "build_boundary_linux" {
module = matrix.builder == "crt" ? module.build_crt : module.build_local
@@ -131,6 +139,7 @@ scenario "e2e_aws_rdp_base" {
module = module.vault
depends_on = [
step.create_base_infra,
step.generate_ssh_key
]
variables {
@@ -147,6 +156,8 @@ scenario "e2e_aws_rdp_base" {
edition = "oss"
}
vpc_id = step.create_base_infra.vpc_id
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -175,7 +186,8 @@ scenario "e2e_aws_rdp_base" {
step.build_boundary_linux,
step.create_windows_client,
step.create_vault_cluster,
step.read_boundary_license
step.read_boundary_license,
step.generate_ssh_key
]
variables {
@@ -200,6 +212,8 @@ scenario "e2e_aws_rdp_base" {
ip_version = local.ip_version
recording_storage_path = "/recording"
alb_sg_additional_ips = step.create_windows_client.public_ip_list
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -302,7 +316,7 @@ scenario "e2e_aws_rdp_base" {
auth_login_name = step.create_boundary_cluster.auth_login_name
auth_password = step.create_boundary_cluster.auth_password
local_boundary_dir = local.local_boundary_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_user = "ubuntu"
target_port = "22"
aws_bucket_name = step.create_bucket.bucket_name
@@ -433,4 +447,8 @@ scenario "e2e_aws_rdp_base" {
output "vault_root_token" {
value = step.create_vault_cluster.vault_root_token
}
output "aws_ssh_key_path" {
value = step.generate_ssh_key.private_key_path
}
}
enos/enos-scenario-e2e-aws-rdp-target.hcl
-1
View File
@@ -8,7 +8,6 @@ scenario "e2e_aws_rdp_target" {
terraform = terraform.default
providers = [
provider.aws.default,
provider.enos.default
]
matrix {
enos/enos-scenario-e2e-aws.hcl
+32 -9
View File
@@ -7,7 +7,6 @@ scenario "e2e_aws" {
terraform = terraform.default
providers = [
provider.aws.default,
provider.enos.default
]
matrix {
@@ -16,7 +15,7 @@ scenario "e2e_aws" {
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
boundary_install_dir = abspath(var.boundary_install_dir)
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
boundary_license_path = abspath(var.boundary_license_path != null ? var.boundary_license_path : joinpath(path.root, "./support/boundary.hclic"))
@@ -82,10 +81,20 @@ scenario "e2e_aws" {
}
}
step "generate_ssh_key" {
module = module.aws_ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
local_aws_keypair_name = var.aws_ssh_keypair_name != null ? var.aws_ssh_keypair_name : null
}
}
step "create_vault_cluster" {
module = module.vault
depends_on = [
step.create_base_infra,
step.generate_ssh_key
]
variables {
@@ -102,6 +111,8 @@ scenario "e2e_aws" {
edition = "oss"
}
vpc_id = step.create_base_infra.vpc_id
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -135,6 +146,8 @@ scenario "e2e_aws" {
worker_config_file_path = matrix.ip_version == "4" ? "templates/worker.hcl" : "templates/worker_vault_kms.hcl"
vault_address = matrix.ip_version == "4" ? "" : step.create_vault_cluster.instance_public_ips[0]
vault_transit_token = matrix.ip_version == "4" ? "" : step.create_vault_cluster.vault_transit_token
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -154,11 +167,12 @@ scenario "e2e_aws" {
step "create_targets_with_tag1" {
module = module.aws_target
depends_on = [step.create_base_infra]
depends_on = [step.create_base_infra, step.generate_ssh_key]
variables {
ami_id = step.create_base_infra.ami_ids["ubuntu"]["amd64"]
aws_ssh_keypair_name = var.aws_ssh_keypair_name
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
enos_user = var.enos_user
instance_type = var.target_instance_type
vpc_id = step.create_base_infra.vpc_id
@@ -197,7 +211,7 @@ scenario "e2e_aws" {
step "create_isolated_worker" {
module = module.aws_worker
depends_on = [step.create_boundary_cluster]
depends_on = [step.create_boundary_cluster, step.generate_ssh_key]
variables {
vpc_id = step.create_base_infra.vpc_id
availability_zones = step.create_base_infra.availability_zone_names
@@ -215,6 +229,8 @@ scenario "e2e_aws" {
worker_type_tags = [local.isolated_tag]
ip_version = matrix.ip_version
config_file_path = "templates/worker.hcl"
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -236,12 +252,14 @@ scenario "e2e_aws" {
module = module.aws_target
depends_on = [
step.create_base_infra,
step.create_isolated_worker
step.create_isolated_worker,
step.generate_ssh_key
]
variables {
ami_id = step.create_base_infra.ami_ids["ubuntu"]["amd64"]
aws_ssh_keypair_name = var.aws_ssh_keypair_name
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
enos_user = var.enos_user
instance_type = var.target_instance_type
vpc_id = step.create_base_infra.vpc_id
@@ -261,7 +279,8 @@ scenario "e2e_aws" {
step.create_targets_with_tag1,
step.iam_setup,
step.create_isolated_worker,
step.create_isolated_target
step.create_isolated_target,
step.generate_ssh_key
]
variables {
@@ -272,9 +291,9 @@ scenario "e2e_aws" {
auth_login_name = step.create_boundary_cluster.auth_login_name
auth_password = step.create_boundary_cluster.auth_password
local_boundary_dir = local.local_boundary_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
target_user = "ubuntu"
target_port = "22"
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
aws_access_key_id = step.iam_setup.access_key_id
aws_secret_access_key = step.iam_setup.secret_access_key
aws_host_set_filter1 = step.create_tag1_inputs.tag_string
@@ -304,4 +323,8 @@ scenario "e2e_aws" {
output "target_ips" {
value = step.create_targets_with_tag1.target_public_ips
}
output "aws_ssh_key_path" {
value = step.generate_ssh_key.private_key_path
}
}
enos/enos-scenario-e2e-database.hcl
+15 -6
View File
@@ -6,11 +6,10 @@ scenario "e2e_database" {
terraform = terraform.default
providers = [
provider.aws.default,
provider.enos.default
]
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
license_path = abspath(var.boundary_license_path != null ? var.boundary_license_path : joinpath(path.root, "./support/boundary.hclic"))
@@ -31,6 +30,14 @@ scenario "e2e_database" {
}
}
step "generate_ssh_key" {
module = module.aws_ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
local_aws_keypair_name = var.aws_ssh_keypair_name != null ? var.aws_ssh_keypair_name : null
}
}
step "find_azs" {
module = module.aws_az_finder
@@ -76,11 +83,12 @@ scenario "e2e_database" {
step "create_targets_with_tag" {
module = module.aws_target
depends_on = [step.create_base_infra]
depends_on = [step.create_base_infra, step.generate_ssh_key]
variables {
ami_id = step.create_base_infra.ami_ids["ubuntu"]["amd64"]
aws_ssh_keypair_name = var.aws_ssh_keypair_name
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
enos_user = var.enos_user
instance_type = var.target_instance_type
vpc_id = step.create_base_infra.vpc_id
@@ -114,7 +122,8 @@ scenario "e2e_database" {
module = module.test_e2e
depends_on = [
step.create_targets_with_tag,
step.iam_setup
step.iam_setup,
step.generate_ssh_key
]
variables {
@@ -123,7 +132,7 @@ scenario "e2e_database" {
boundary_license = var.boundary_edition != "oss" ? step.read_license.license : ""
local_boundary_dir = local.local_boundary_dir
target_user = "ubuntu"
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
aws_access_key_id = step.iam_setup.access_key_id
aws_secret_access_key = step.iam_setup.secret_access_key
aws_host_set_filter1 = step.create_tag_inputs.tag_string
enos/enos-scenario-e2e-docker-base-connect.hcl
+11 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_docker_base_connect" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -42,6 +39,14 @@ scenario "e2e_docker_base_connect" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network" {
module = module.docker_network
variables {
@@ -94,7 +99,7 @@ scenario "e2e_docker_base_connect" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_cluster]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -114,7 +119,7 @@ scenario "e2e_docker_base_connect" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-docker-base-plus.hcl
+11 -6
View File
@@ -5,16 +5,13 @@
scenario "e2e_docker_base_plus" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -43,6 +40,14 @@ scenario "e2e_docker_base_plus" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network" {
module = module.docker_network
variables {
@@ -108,7 +113,7 @@ scenario "e2e_docker_base_plus" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_cluster]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -128,7 +133,7 @@ scenario "e2e_docker_base_plus" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-docker-base-with-gcp.hcl
-1
View File
@@ -5,7 +5,6 @@ scenario "e2e_docker_base_with_gcp" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default,
provider.google.default
]
enos/enos-scenario-e2e-docker-base-with-vault.hcl
+11 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_docker_base_with_vault" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -42,6 +39,14 @@ scenario "e2e_docker_base_with_vault" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network" {
module = module.docker_network
variables {
@@ -105,7 +110,7 @@ scenario "e2e_docker_base_with_vault" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_cluster]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -137,7 +142,7 @@ scenario "e2e_docker_base_with_vault" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-docker-base-with-worker-version.hcl
+11 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_docker_base_with_worker_version" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -46,6 +43,14 @@ scenario "e2e_docker_base_with_worker_version" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network_database" {
module = module.docker_network
variables {
@@ -124,7 +129,7 @@ scenario "e2e_docker_base_with_worker_version" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_host]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -173,7 +178,7 @@ scenario "e2e_docker_base_with_worker_version" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-docker-base-with-worker.hcl
+11 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_docker_base_with_worker" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -44,6 +41,14 @@ scenario "e2e_docker_base_with_worker" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network_database" {
module = module.docker_network
variables {
@@ -122,7 +127,7 @@ scenario "e2e_docker_base_with_worker" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_host]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -168,7 +173,7 @@ scenario "e2e_docker_base_with_worker" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-docker-base.hcl
+11 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_docker_base" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -42,6 +39,14 @@ scenario "e2e_docker_base" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network" {
module = module.docker_network
variables {
@@ -94,7 +99,7 @@ scenario "e2e_docker_base" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_cluster]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -114,7 +119,7 @@ scenario "e2e_docker_base" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-docker-worker-registration-controller-led.hcl
+11 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_docker_worker_registration_controller_led" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -44,6 +41,14 @@ scenario "e2e_docker_worker_registration_controller_led" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network_database" {
module = module.docker_network
variables {
@@ -136,7 +141,7 @@ scenario "e2e_docker_worker_registration_controller_led" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_host]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -183,7 +188,7 @@ scenario "e2e_docker_worker_registration_controller_led" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-docker-worker-registration-worker-led.hcl
+12 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_docker_worker_registration_worker_led" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_src_dir = var.local_boundary_src_dir != null ? abspath(var.local_boundary_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -44,6 +41,15 @@ scenario "e2e_docker_worker_registration_worker_led" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_docker_network_database" {
module = module.docker_network
variables {
@@ -123,7 +129,7 @@ scenario "e2e_docker_worker_registration_worker_led" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_host]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -198,7 +204,7 @@ scenario "e2e_docker_worker_registration_worker_led" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_src_dir = local.local_boundary_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-scenario-e2e-ui-aws.hcl
+21 -4
View File
@@ -6,7 +6,6 @@ scenario "e2e_ui_aws" {
terraform = terraform.default
providers = [
provider.aws.default,
provider.enos.default
]
matrix {
@@ -15,7 +14,7 @@ scenario "e2e_ui_aws" {
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
boundary_install_dir = abspath(var.boundary_install_dir)
license_path = abspath(var.boundary_license_path != null ? var.boundary_license_path : joinpath(path.root, "./support/boundary.hclic"))
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
@@ -78,6 +77,15 @@ scenario "e2e_ui_aws" {
}
}
step "generate_ssh_key" {
module = module.aws_ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
local_aws_keypair_name = var.aws_ssh_keypair_name != null ? var.aws_ssh_keypair_name : null
}
}
locals {
egress_tag = "egress"
}
@@ -108,6 +116,8 @@ scenario "e2e_ui_aws" {
worker_type_tags = [local.egress_tag]
aws_region = var.aws_region
protocol = matrix.protocol
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -131,6 +141,8 @@ scenario "e2e_ui_aws" {
edition = "oss"
}
vpc_id = step.create_base_infra.vpc_id
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -154,13 +166,14 @@ scenario "e2e_ui_aws" {
variables {
ami_id = step.create_base_infra.ami_ids["ubuntu"]["amd64"]
aws_ssh_keypair_name = var.aws_ssh_keypair_name
enos_user = var.enos_user
instance_type = var.target_instance_type
vpc_id = step.create_base_infra.vpc_id
target_count = var.target_count <= 1 ? 2 : var.target_count
additional_tags = step.create_tag_inputs.tag_map
subnet_ids = step.create_boundary_cluster.subnet_ids
aws_ssh_keypair_name = step.generate_ssh_key.key_pair_name
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
}
}
@@ -201,7 +214,7 @@ scenario "e2e_ui_aws" {
auth_password = step.create_boundary_cluster.auth_password
local_boundary_dir = local.local_boundary_dir
local_boundary_ui_src_dir = local.local_boundary_ui_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_targets_with_tag.target_private_ips[0]
target_user = "ubuntu"
target_port = "22"
@@ -225,4 +238,8 @@ scenario "e2e_ui_aws" {
output "worker_ips" {
value = step.create_boundary_cluster.worker_ips
}
output "aws_ssh_key_path" {
value = step.generate_ssh_key.private_key_path
}
}
enos/enos-scenario-e2e-ui-docker.hcl
+11 -6
View File
@@ -4,16 +4,13 @@
scenario "e2e_ui_docker" {
terraform_cli = terraform_cli.default
terraform = terraform.default
providers = [
provider.enos.default
]
matrix {
builder = ["local", "crt"]
}
locals {
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
aws_ssh_private_key_path = var.aws_ssh_private_key_path != null ? abspath(var.aws_ssh_private_key_path) : null
local_boundary_dir = var.local_boundary_dir != null ? abspath(var.local_boundary_dir) : null
local_boundary_ui_src_dir = var.local_boundary_ui_src_dir != null ? abspath(var.local_boundary_ui_src_dir) : null
boundary_docker_image_file = abspath(var.boundary_docker_image_file)
@@ -50,6 +47,14 @@ scenario "e2e_ui_docker" {
}
}
step "generate_ssh_key" {
module = module.ssh_keypair
variables {
local_key_path = local.aws_ssh_private_key_path
}
}
step "create_boundary_database" {
depends_on = [
step.create_docker_network
@@ -106,7 +111,7 @@ scenario "e2e_ui_docker" {
variables {
image_name = "${var.docker_mirror}/linuxserver/openssh-server:latest"
network_name = [local.network_cluster]
private_key_file_path = local.aws_ssh_private_key_path
private_key_file_path = step.generate_ssh_key.private_key_path
}
}
@@ -161,7 +166,7 @@ scenario "e2e_ui_docker" {
auth_password = step.create_boundary.password
local_boundary_dir = local.local_boundary_dir
local_boundary_ui_src_dir = local.local_boundary_ui_src_dir
aws_ssh_private_key_path = local.aws_ssh_private_key_path
aws_ssh_private_key_path = step.generate_ssh_key.private_key_path
target_address = step.create_host.address
target_port = step.create_host.port
target_user = "ubuntu"
enos/enos-variables.hcl
+4 -1
View File
@@ -5,11 +5,13 @@
variable "aws_ssh_keypair_name" {
description = "Name of the AWS keypair Enos will use to connect"
type = string
default = null
}
variable "aws_ssh_private_key_path" {
description = "Path to the SSH key Enos will use to connect"
type = string
default = null
}
# Tagging
@@ -20,8 +22,9 @@ variable "environment" {
}
variable "enos_user" {
description = "The user running the tests, this is by default your OS user or Github User"
description = "The user running the tests, used for tagging purposes"
type = string
default = "enos"
}
# Test configs
enos/enos.hcl
-9
View File
@@ -29,15 +29,6 @@ provider "aws" "default" {
region = var.aws_region
}
provider "enos" "default" {
transport = {
ssh = {
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
provider "google" "default" {
region = var.gcp_region
project = var.gcp_project_id
enos/enos.vars.hcl
+31 -24
View File
@@ -19,29 +19,6 @@
// Recommend setting this to true unless running in CI.
// e2e_debug_no_run = true
// The AWS region you want to create the resources in. Make sure you choose a
// region where you've got an AWS keypair. Applies to AWS scenarios only.
// aws_region = "us-east-1"
// The name of the AWS keypair in EC2 -> Key Pairs. Ensure this key pair is
// available in the selected region. Applies to AWS scenarios only.
// aws_ssh_keypair_name = "mykeypair"
// The path to the local copy of the private key associated with your keypair.
// Applies to AWS scenarios only.
// aws_ssh_private_key_path = "/Users/<user>/.ssh/mykeypair.pem
// Name of user. This is used to tag resources in AWS to more easily identify
// your resources. Can be set to any string.
/// Applies to AWS scenarios only.
// enos_user = "enos"
// ENTERPRISE ONLY
// Path to a license file
// boundary_license_path = "./support/boundary.hclic"
// Directly set the boundary license. Overrides boundary license file.
// boundary_license = ""
// ==============================================================================
// OPTIONAL VARIABLES
// ==============================================================================
@@ -51,7 +28,10 @@
// variant. If you execute variants with the local builder this does not need
// to be set. In CI we use this to point to the artifacts generated as part
// of the build workflow.
// crt_bundle_path = "./boundary_linux_amd64.zip"
// crt_bundle_path = "~/Downloads/boundary_linux_amd64.zip"
// Docker image file for boundary. This is used for docker scenarios
// boundary_docker_image_file = "~/Downloads/boundary-docker-image.tar"
// Number of controller instances to create. Applies to AWS scenarios only.
// controller_count = 1
@@ -100,3 +80,30 @@
// The boundary version for the worker in scenarios with a worker and controller version
// mismatch. Will pull the official boundary docker image for given version.
// worker_version = "0.21"
// If you want to use your own ssh key instead of terraform generating one for
// you, use this variable.
// The name of the AWS keypair in EC2 -> Key Pairs. Ensure this key pair is
// available in the selected region. Applies to AWS scenarios only.
// aws_ssh_keypair_name = "mykeypair"
// If you want to use your own ssh key instead of terraform generating one for
// you, use this variable.
// The path to the local copy of the private key associated with your keypair.
// aws_ssh_private_key_path = "/Users/<user>/.ssh/mykeypair.pem"
// Name of user. This is used to tag resources in AWS to more easily identify
// your resources. Can be set to any string.
/// Applies to AWS scenarios only.
// enos_user = "enos"
// The AWS region you want to create the resources in. Make sure you choose a
// region where you've got an AWS keypair. Applies to AWS scenarios only.
// aws_region = "us-east-1"
// ENTERPRISE ONLY
// Path to a license file
// boundary_license_path = "./support/boundary.hclic"
// Directly set the boundary license. Overrides boundary license file.
// This can also be set by an environment variable ENOS_VAR_boundary_license
// boundary_license = ""
enos/modules/aws_boundary/boundary-instances.tf
+28 -2
View File
@@ -12,7 +12,7 @@ resource "aws_instance" "controller" {
aws_security_group.boundary_aux_sg.id,
]
subnet_id = tolist(data.aws_subnets.infra.ids)[count.index % length(data.aws_subnets.infra.ids)]
key_name = var.ssh_aws_keypair
key_name = var.aws_ssh_keypair_name
iam_instance_profile = aws_iam_instance_profile.boundary_profile.name
monitoring = var.controller_monitoring
ipv6_address_count = local.network_stack[var.ip_version].ipv6_address_count
@@ -45,7 +45,7 @@ resource "aws_instance" "worker" {
instance_type = var.worker_instance_type
vpc_security_group_ids = [aws_security_group.boundary_sg.id]
subnet_id = tolist(data.aws_subnets.infra.ids)[count.index % length(data.aws_subnets.infra.ids)]
key_name = var.ssh_aws_keypair
key_name = var.aws_ssh_keypair_name
iam_instance_profile = aws_iam_instance_profile.boundary_profile.name
monitoring = var.worker_monitoring
ipv6_address_count = local.network_stack[var.ip_version].ipv6_address_count
@@ -84,6 +84,8 @@ resource "enos_bundle_install" "controller" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.controller[tonumber(each.value)].ipv6_addresses[0] : aws_instance.controller[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -101,6 +103,8 @@ resource "enos_remote_exec" "update_path_controller" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.controller[tonumber(each.value)].ipv6_addresses[0] : aws_instance.controller[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -139,6 +143,8 @@ resource "enos_file" "controller_config" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.controller[tonumber(each.value)].ipv6_addresses[0] : aws_instance.controller[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -154,6 +160,8 @@ resource "enos_boundary_init" "controller" {
transport = {
ssh = {
host = try(var.ip_version == "6" ? aws_instance.controller[0].ipv6_addresses[0] : aws_instance.controller[0].public_ip, null)
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
@@ -171,6 +179,8 @@ resource "enos_boundary_start" "controller_start" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.controller[tonumber(each.value)].ipv6_addresses[0] : aws_instance.controller[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
@@ -196,6 +206,8 @@ resource "enos_remote_exec" "create_controller_audit_log_dir" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.controller[tonumber(each.value)].ipv6_addresses[0] : aws_instance.controller[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -213,6 +225,8 @@ resource "enos_bundle_install" "worker" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -230,6 +244,8 @@ resource "enos_remote_exec" "update_path_worker" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -258,6 +274,8 @@ resource "enos_file" "worker_config" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -275,6 +293,8 @@ resource "enos_boundary_start" "worker_start" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -295,6 +315,8 @@ resource "enos_remote_exec" "create_worker_audit_log_dir" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -315,6 +337,8 @@ resource "enos_remote_exec" "create_worker_auth_storage_dir" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -327,6 +351,8 @@ resource "enos_remote_exec" "get_worker_token" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
enos/modules/aws_boundary/variables.tf
+4 -5
View File
@@ -104,14 +104,13 @@ variable "controller_monitoring" {
default = false
}
variable "ssh_user" {
description = "SSH user to authenticate as"
variable "aws_ssh_keypair_name" {
description = "SSH keypair used to connect to EC2 instances"
type = string
default = "ubuntu"
}
variable "ssh_aws_keypair" {
description = "SSH keypair used to connect to EC2 instances"
variable "aws_ssh_private_key_path" {
description = "SSH private key path for connecting to instances"
type = string
}
enos/modules/aws_ssh_keypair/main.tf
+71
View File
@@ -0,0 +1,71 @@
# Copyright IBM Corp. 2024, 2026
# SPDX-License-Identifier: BUSL-1.1
terraform {
required_providers {
aws = {
source = "hashicorp/aws"
}
tls = {
source = "hashicorp/tls"
}
local = {
source = "hashicorp/local"
}
}
}
variable "local_key_path" {
type = string
description = "Path to a local key. If provided, this key will be used instead of generating a new one."
default = null
}
variable "local_aws_keypair_name" {
type = string
description = "Name of the key pair in AWS of the uploaded key from local_key_path."
default = null
}
check "local_key_path_requires_local_aws_keypair_name" {
assert {
condition = var.local_key_path == null || var.local_aws_keypair_name != null
error_message = "local_aws_keypair_name must be provided when local_key_path is set."
}
}
check "local_aws_keypair_name_requires_local_key_path" {
assert {
condition = var.local_aws_keypair_name == null || var.local_key_path != null
error_message = "local_key_path must be provided when local_aws_keypair_name is set."
}
}
resource "random_pet" "default" {}
resource "tls_private_key" "ssh" {
count = var.local_key_path == null ? 1 : 0
algorithm = "RSA"
rsa_bits = 4096
}
resource "aws_key_pair" "generated" {
count = var.local_key_path == null ? 1 : 0
key_name = "ssh-key-enos-aws-${random_pet.default.id}"
public_key = tls_private_key.ssh[0].public_key_openssh
}
resource "local_sensitive_file" "private_key" {
count = var.local_key_path == null ? 1 : 0
content = tls_private_key.ssh[0].private_key_pem
filename = "${path.root}/.terraform/tmp/${aws_key_pair.generated[0].key_name}"
file_permission = "0400"
}
output "key_pair_name" {
value = var.local_key_path != null ? var.local_aws_keypair_name : aws_key_pair.generated[0].key_name
}
output "private_key_path" {
value = var.local_key_path != null ? abspath(var.local_key_path) : abspath(local_sensitive_file.private_key[0].filename)
}
enos/modules/aws_target/main.tf
+3
View File
@@ -17,6 +17,7 @@ variable "environment" {}
variable "project_name" {}
variable "instance_type" {}
variable "aws_ssh_keypair_name" {}
variable "aws_ssh_private_key_path" {}
variable "enos_user" {}
variable "additional_tags" {
default = {}
@@ -150,6 +151,8 @@ resource "enos_remote_exec" "wait" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.target[each.key].ipv6_addresses[0] : aws_instance.target[each.key].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
enos/modules/aws_vault/variables.tf
+6 -1
View File
@@ -118,11 +118,16 @@ variable "sg_additional_ipv6_ips" {
default = []
}
variable "ssh_aws_keypair" {
variable "aws_ssh_keypair_name" {
description = "SSH keypair used to connect to EC2 instances"
type = string
}
variable "aws_ssh_private_key_path" {
description = "SSH private key path for connecting to instances"
type = string
}
variable "storage_backend" {
type = string
description = "The type of Vault storage backend which will be used"
enos/modules/aws_vault/vault-instances.tf
+29 -1
View File
@@ -7,7 +7,7 @@ resource "aws_instance" "vault_instance" {
instance_type = var.instance_type
vpc_security_group_ids = [aws_security_group.enos_vault_sg[0].id]
subnet_id = tolist(data.aws_subnets.infra.ids)[each.key % length(data.aws_subnets.infra.ids)]
key_name = var.ssh_aws_keypair
key_name = var.aws_ssh_keypair_name
iam_instance_profile = aws_iam_instance_profile.vault_profile[0].name
ipv6_address_count = local.network_stack[var.ip_version].ipv6_address_count
tags = merge(
@@ -42,6 +42,8 @@ resource "enos_remote_exec" "install_dependencies" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[each.value].ipv6_addresses[0] : aws_instance.vault_instance[each.value].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -58,6 +60,8 @@ resource "enos_bundle_install" "consul" {
transport = {
ssh = {
host = var.ip_version == "6" ? each.value.ipv6_addresses[0] : each.value.public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -73,6 +77,8 @@ resource "enos_bundle_install" "vault" {
transport = {
ssh = {
host = var.ip_version == "6" ? each.value.ipv6_addresses[0] : each.value.public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -99,6 +105,8 @@ resource "enos_consul_start" "consul" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[each.key].ipv6_addresses[0] : aws_instance.vault_instance[each.key].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -141,6 +149,8 @@ resource "enos_vault_start" "leader" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[each.key].ipv6_addresses[0] : aws_instance.vault_instance[each.key].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -182,6 +192,8 @@ resource "enos_vault_start" "followers" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[each.key].ipv6_addresses[0] : aws_instance.vault_instance[each.key].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -205,6 +217,8 @@ resource "enos_vault_init" "leader" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[0].ipv6_addresses[0] : aws_instance.vault_instance[0].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -223,6 +237,8 @@ resource "enos_vault_unseal" "leader" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[0].ipv6_addresses[0] : aws_instance.vault_instance[0].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -248,6 +264,8 @@ resource "enos_remote_exec" "create_audit_log_dir" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[each.value].ipv6_addresses[0] : aws_instance.vault_instance[each.value].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -277,6 +295,8 @@ resource "enos_remote_exec" "init_audit_device" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[each.key].ipv6_addresses[0] : aws_instance.vault_instance[each.key].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -300,6 +320,8 @@ resource "enos_vault_unseal" "followers" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[0].ipv6_addresses[0] : aws_instance.vault_instance[0].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -326,6 +348,8 @@ resource "enos_vault_unseal" "when_vault_unseal_when_no_init_is_set" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[each.key].ipv6_addresses[0] : aws_instance.vault_instance[each.key].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -346,6 +370,8 @@ resource "enos_remote_exec" "vault_write_license" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[0].ipv6_addresses[0] : aws_instance.vault_instance[0].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -365,6 +391,8 @@ resource "enos_remote_exec" "vault_kms_policy" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.vault_instance[0].ipv6_addresses[0] : aws_instance.vault_instance[0].public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
enos/modules/aws_worker/main.tf
+11 -1
View File
@@ -150,7 +150,7 @@ resource "aws_instance" "worker" {
instance_type = var.worker_instance_type
vpc_security_group_ids = [aws_security_group.default.id]
subnet_id = var.create_subnet ? aws_subnet.default[0].id : var.subnet_ids[0]
key_name = var.ssh_aws_keypair
key_name = var.aws_ssh_keypair_name
iam_instance_profile = aws_iam_instance_profile.boundary_profile.name
monitoring = var.worker_monitoring
@@ -189,6 +189,8 @@ resource "enos_bundle_install" "worker" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -205,6 +207,8 @@ resource "enos_remote_exec" "update_path_worker" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -235,6 +239,8 @@ resource "enos_file" "worker_config" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -251,6 +257,8 @@ resource "enos_boundary_start" "worker_start" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
@@ -270,6 +278,8 @@ resource "enos_remote_exec" "create_worker_audit_log_dir" {
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker.ipv6_addresses[0] : aws_instance.worker.public_ip
user = "ubuntu"
private_key_path = abspath(var.aws_ssh_private_key_path)
}
}
}
enos/modules/aws_worker/variables.tf
+8 -2
View File
@@ -34,11 +34,17 @@ variable "worker_instance_type" {
default = "t2.small"
}
variable "ssh_aws_keypair" {
description = "The name of the SSH keypair used to connect to EC2 instances"
variable "aws_ssh_keypair_name" {
description = "SSH keypair used to connect to EC2 instances"
type = string
}
variable "aws_ssh_private_key_path" {
description = "SSH private key path for connecting to instances"
type = string
sensitive = true
}
variable "worker_monitoring" {
description = "Enable detailed monitoring for workers"
type = bool
enos/modules/ssh_keypair/main.tf
+38
View File
@@ -0,0 +1,38 @@
# Copyright IBM Corp. 2024, 2026
# SPDX-License-Identifier: BUSL-1.1
terraform {
required_providers {
tls = {
source = "hashicorp/tls"
}
local = {
source = "hashicorp/local"
}
}
}
variable "local_key_path" {
type = string
description = "Path to a local key. If provided, this key will be used instead of generating a new one."
default = null
}
resource "random_pet" "default" {}
resource "tls_private_key" "ssh" {
count = var.local_key_path == null ? 1 : 0
algorithm = "RSA"
rsa_bits = 4096
}
resource "local_sensitive_file" "private_key" {
count = var.local_key_path == null ? 1 : 0
content = tls_private_key.ssh[0].private_key_pem
filename = "${path.root}/.terraform/tmp/ssh-key-enos-${random_pet.default.id}"
file_permission = "0400"
}
output "private_key_path" {
value = var.local_key_path != null ? abspath(var.local_key_path) : abspath(local_sensitive_file.private_key[0].filename)
}
enos/modules/test_e2e/main.tf
+3 -2
View File
@@ -51,11 +51,12 @@ variable "target_user" {
type = string
default = ""
}
variable "aws_ssh_private_key_path" {
description = "Local Path to key used to SSH onto created hosts"
description = "Path to the private key used to SSH into AWS instances"
type = string
default = ""
}
variable "target_address" {
description = "Address of target"
type = string