From c50945e3010faf860c8743abe7c289cfbce847e3 Mon Sep 17 00:00:00 2001 From: hc-github-team-es-release-engineering <82989873+hc-github-team-es-release-engineering@users.noreply.github.com> Date: Thu, 25 Sep 2025 12:13:29 -0400 Subject: [PATCH 1/6] Bumped product version to 0.20.1. --- version/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/VERSION b/version/VERSION index a881cf79f2..9d2632160c 100644 --- a/version/VERSION +++ b/version/VERSION @@ -1 +1 @@ -0.20.0 \ No newline at end of file +0.20.1 \ No newline at end of file From a8875a8294057c62c1c801554bf011863fef4712 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-boundary <82989682+hc-github-team-secure-boundary@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:26:51 -0400 Subject: [PATCH 2/6] backport of commit b0b97ae71e0d18089ca3e107073f4916032fda3b (#6091) Co-authored-by: Michael Li --- enos/modules/aws_boundary/rds.tf | 8 ++++++-- enos/modules/aws_boundary/variables.tf | 8 +------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/enos/modules/aws_boundary/rds.tf b/enos/modules/aws_boundary/rds.tf index 76f5335b99..699866d366 100644 --- a/enos/modules/aws_boundary/rds.tf +++ b/enos/modules/aws_boundary/rds.tf @@ -6,14 +6,18 @@ resource "aws_db_subnet_group" "boundary" { subnet_ids = data.aws_subnets.infra.ids } +data "aws_rds_engine_version" "default" { + engine = var.db_engine +} + resource "aws_db_instance" "boundary" { count = var.db_create == true ? 1 : 0 identifier = "boundary-db-${random_string.cluster_id.result}" allocated_storage = var.db_storage storage_type = var.db_storage_type iops = var.db_storage_iops - engine = var.db_engine - engine_version = var.db_engine == "aurora-postgres" ? null : var.db_version + engine = data.aws_rds_engine_version.default.engine + engine_version = data.aws_rds_engine_version.default.version instance_class = var.db_class monitoring_interval = var.db_monitoring_interval monitoring_role_arn = var.db_monitoring_role_arn diff --git a/enos/modules/aws_boundary/variables.tf b/enos/modules/aws_boundary/variables.tf index 81ffe02676..5a55a00a6e 100644 --- a/enos/modules/aws_boundary/variables.tf +++ b/enos/modules/aws_boundary/variables.tf @@ -136,12 +136,6 @@ variable "db_class" { default = "db.t4g.small" } -variable "db_version" { - description = "AWS RDS DBS engine version (for postgres/mysql)" - type = string - default = "15.7" -} - variable "db_engine" { description = "AWS RDS DB engine type" type = string @@ -406,4 +400,4 @@ variable "vault_transit_token" { description = "vault token used for kms transit in the boundary config" type = string default = "" -} \ No newline at end of file +} From da8012bbfc47c915543d713a0ecf4d84794edebb Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-boundary <82989682+hc-github-team-secure-boundary@users.noreply.github.com> Date: Tue, 30 Sep 2025 22:49:20 +0530 Subject: [PATCH 3/6] backport of commit ab521f92c3214d2253709f68d0b8a82191306fea (#6099) Co-authored-by: irenarindos --- .../session-recording/compliance/configure-storage-policy.mdx | 4 ++-- .../session-recording/compliance/update-storage-policy.mdx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/docs/session-recording/compliance/configure-storage-policy.mdx b/website/content/docs/session-recording/compliance/configure-storage-policy.mdx index 733df1a756..7f3f31d077 100644 --- a/website/content/docs/session-recording/compliance/configure-storage-policy.mdx +++ b/website/content/docs/session-recording/compliance/configure-storage-policy.mdx @@ -68,8 +68,8 @@ Complete the following steps to create a storage policy in Boundary for session - **Description**: `SOC 2 compliant storage policy for session recordings` - **Retention Policy**: `SOC 2 (7 years)` - **Deletion Policy**: `Custom` - Delete after: `2657` days - Toggle the switch beside **Allow orgs to override**. + - Delete after: `2657` days + - Toggle the switch beside **Allow orgs to override**. 1. Click **Save**. diff --git a/website/content/docs/session-recording/compliance/update-storage-policy.mdx b/website/content/docs/session-recording/compliance/update-storage-policy.mdx index 0adedf6206..f589ad58b6 100644 --- a/website/content/docs/session-recording/compliance/update-storage-policy.mdx +++ b/website/content/docs/session-recording/compliance/update-storage-policy.mdx @@ -69,8 +69,8 @@ The following is an example of updating the `soc2-policy` policy. - **Description**: `SOC 2 compliant storage policy for session recordings, V2` - **Retention Policy**: `SOC 2 (7 years)` - **Deletion Policy**: `Custom` - **Delete after**: `2757` days - Toggle the switch beside **Allow orgs to override** to the off position. + - **Delete after**: `2757` days + - Toggle the switch beside **Allow orgs to override** to the off position. 1. Click **Save**. From 27a9866c1455a5cc16fed1edaab9e2e8f8edd247 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-boundary <82989682+hc-github-team-secure-boundary@users.noreply.github.com> Date: Tue, 30 Sep 2025 12:16:34 -0600 Subject: [PATCH 4/6] backport of commit e0ef9be90f27fd56fd8b60d4e3f70a8402a22d84 (#6100) Co-authored-by: Pradeep Sekar --- enos/README.md | 2 ++ enos/modules/aws_boundary/boundary-instances.tf | 10 ++++++++++ enos/modules/aws_rdp_domain_controller/main.tf | 1 + enos/modules/aws_rdp_member_server/main.tf | 1 + enos/modules/aws_rdp_member_server_with_worker/main.tf | 1 + enos/modules/aws_target/main.tf | 7 ++++++- enos/modules/aws_vault/vault-instances.tf | 5 +++++ enos/modules/aws_windows_client/main.tf | 1 + enos/modules/aws_worker/main.tf | 5 +++++ 9 files changed, 32 insertions(+), 1 deletion(-) diff --git a/enos/README.md b/enos/README.md index 7511d97695..9ecc555977 100644 --- a/enos/README.md +++ b/enos/README.md @@ -66,6 +66,8 @@ following lines 127.0.0.1 localhost worker 127.0.0.1 localhost vault ``` +### AWS Credentials +Copy the AWS Account credentials from doormat and set it in the terminal, where the enos commands are run. ## Executing Scenarios From the `enos` directory: diff --git a/enos/modules/aws_boundary/boundary-instances.tf b/enos/modules/aws_boundary/boundary-instances.tf index 7362884e6b..3f4bd7a204 100644 --- a/enos/modules/aws_boundary/boundary-instances.tf +++ b/enos/modules/aws_boundary/boundary-instances.tf @@ -26,6 +26,11 @@ resource "aws_instance" "controller" { encrypted = true } + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + } + tags = merge(local.common_tags, { Name = "${local.name_prefix}-boundary-controller-${count.index}-${split(":", data.aws_caller_identity.current.user_id)[1]}" @@ -54,6 +59,11 @@ resource "aws_instance" "worker" { encrypted = true } + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + } + tags = merge(local.common_tags, { Name = "${local.name_prefix}-boundary-worker-${count.index}-${split(":", data.aws_caller_identity.current.user_id)[1]}", diff --git a/enos/modules/aws_rdp_domain_controller/main.tf b/enos/modules/aws_rdp_domain_controller/main.tf index 931ef40087..8516313aa0 100644 --- a/enos/modules/aws_rdp_domain_controller/main.tf +++ b/enos/modules/aws_rdp_domain_controller/main.tf @@ -302,6 +302,7 @@ resource "aws_instance" "domain_controller" { metadata_options { http_endpoint = "enabled" + http_tokens = "required" instance_metadata_tags = "enabled" } get_password_data = true diff --git a/enos/modules/aws_rdp_member_server/main.tf b/enos/modules/aws_rdp_member_server/main.tf index 86b5ba6878..1b712788d8 100644 --- a/enos/modules/aws_rdp_member_server/main.tf +++ b/enos/modules/aws_rdp_member_server/main.tf @@ -234,6 +234,7 @@ ${var.domain_admin_password} metadata_options { http_endpoint = "enabled" + http_tokens = "required" instance_metadata_tags = "enabled" } get_password_data = true diff --git a/enos/modules/aws_rdp_member_server_with_worker/main.tf b/enos/modules/aws_rdp_member_server_with_worker/main.tf index ccd2ad5a32..3b91f6234b 100644 --- a/enos/modules/aws_rdp_member_server_with_worker/main.tf +++ b/enos/modules/aws_rdp_member_server_with_worker/main.tf @@ -251,6 +251,7 @@ ${var.domain_admin_password} metadata_options { http_endpoint = "enabled" + http_tokens = "required" instance_metadata_tags = "enabled" } get_password_data = true diff --git a/enos/modules/aws_target/main.tf b/enos/modules/aws_target/main.tf index 2179a550b0..e7694cf9b1 100644 --- a/enos/modules/aws_target/main.tf +++ b/enos/modules/aws_target/main.tf @@ -126,13 +126,18 @@ resource "aws_instance" "target" { "Type" : "target", "Project" : "Enos", "Project Name" : "qti-enos-boundary", - "Environment" : var.environment + "Environment" : var.environment, "Enos User" : var.enos_user, }) root_block_device { encrypted = true } + + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + } } resource "enos_remote_exec" "wait" { diff --git a/enos/modules/aws_vault/vault-instances.tf b/enos/modules/aws_vault/vault-instances.tf index 2fd1b092c4..8ed35ce60a 100644 --- a/enos/modules/aws_vault/vault-instances.tf +++ b/enos/modules/aws_vault/vault-instances.tf @@ -17,6 +17,11 @@ resource "aws_instance" "vault_instance" { Type = local.vault_cluster_tag }, ) + + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + } } resource "enos_remote_exec" "install_dependencies" { diff --git a/enos/modules/aws_windows_client/main.tf b/enos/modules/aws_windows_client/main.tf index 837a9dbc6e..b616ef88be 100644 --- a/enos/modules/aws_windows_client/main.tf +++ b/enos/modules/aws_windows_client/main.tf @@ -253,6 +253,7 @@ resource "aws_instance" "client" { metadata_options { http_endpoint = "enabled" + http_tokens = "required" instance_metadata_tags = "enabled" } get_password_data = true diff --git a/enos/modules/aws_worker/main.tf b/enos/modules/aws_worker/main.tf index a7ba4d11e1..e92061a439 100644 --- a/enos/modules/aws_worker/main.tf +++ b/enos/modules/aws_worker/main.tf @@ -161,6 +161,11 @@ resource "aws_instance" "worker" { Name = "${var.name_prefix}-boundary-worker-${split(":", data.aws_caller_identity.current.user_id)[1]}", }, ) + + metadata_options { + http_endpoint = "enabled" + http_tokens = "required" + } } resource "enos_bundle_install" "worker" { From f7ced86f826a6cb1aed3fae867aa180f153696c2 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-boundary <82989682+hc-github-team-secure-boundary@users.noreply.github.com> Date: Wed, 1 Oct 2025 11:16:10 -0400 Subject: [PATCH 5/6] backport of commit 3b9ac7b907de3f245a4b5491ffb2009fe6c05dca (#6105) Co-authored-by: Dan Heath <76443935+Dan-Heath@users.noreply.github.com> --- website/content/docs/session-recording/index.mdx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/content/docs/session-recording/index.mdx b/website/content/docs/session-recording/index.mdx index 55d1eb0706..cfa33b3938 100644 --- a/website/content/docs/session-recording/index.mdx +++ b/website/content/docs/session-recording/index.mdx @@ -81,7 +81,9 @@ Be careful when you use Secure File Copy (SCP) to transfer large files during a ## asciicast When you view recorded sessions using the CLI or Admin UI, Boundary can convert the recording into other formats for playback. -Currently Boundary supports converting the recording of an individual SSH channel into an [asciicast](https://github.com/asciinema/asciinema/blob/develop/doc/asciicast-v2.md) format to play back an interactive SSH session. +Currently Boundary supports converting the recording of an individual SSH channel into an asciicast format to play back an interactive SSH session. + +Refer to the [asciinema documentation](https://docs.asciinema.org/) for more information about the [asciicast](https://docs.asciinema.org/manual/asciicast/v3/) format. ### Limitations From 68185d26ace57e35468f939d2620412394d6cfc8 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-boundary <82989682+hc-github-team-secure-boundary@users.noreply.github.com> Date: Wed, 1 Oct 2025 11:51:33 -0400 Subject: [PATCH 6/6] chore(e2e): Update framework to remove boundary_docker_image_name (#6092) (#6096) * remove name var necessity in docker scenario * rm log * parse from docker load * rm docker image name var from enos-variables * rm boundary_docker_image_name from files (cherry picked from commit bc40164871b2b459e819da9100678c753d8f9106) Co-authored-by: Tony <52470376+wongtonyb@users.noreply.github.com> --- .github/workflows/build.yml | 1 - .github/workflows/enos-run.yml | 4 ---- enos/enos-scenario-e2e-docker-base-plus.hcl | 2 +- enos/enos-scenario-e2e-docker-base-with-gcp.hcl | 2 +- enos/enos-scenario-e2e-docker-base-with-vault.hcl | 2 +- .../enos-scenario-e2e-docker-base-with-worker.hcl | 4 ++-- enos/enos-scenario-e2e-docker-base.hcl | 2 +- ...-docker-worker-registration-controller-led.hcl | 6 +++--- ...-e2e-docker-worker-registration-worker-led.hcl | 6 +++--- enos/enos-scenario-e2e-ui-docker.hcl | 4 ++-- enos/enos-variables.hcl | 6 ------ enos/modules/build_boundary_docker_crt/main.tf | 15 +++++++++++++++ 12 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c4b0ee2d5..c09d688986 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -405,7 +405,6 @@ jobs: artifact-name: "boundary_${{ needs.set-product-version.outputs.product-version }}_linux_amd64.zip" go-version: ${{ needs.product-metadata.outputs.go-version }} edition: ${{ needs.product-metadata.outputs.product-edition }} - docker-image-name: ${{ needs.build-docker.outputs.name }} docker-image-file: "boundary_default_linux_amd64_${{ needs.set-product-version.outputs.product-version }}_${{ github.sha }}.docker.dev.tar" secrets: inherit bats: diff --git a/.github/workflows/enos-run.yml b/.github/workflows/enos-run.yml index b245383a76..c8f6f3538c 100644 --- a/.github/workflows/enos-run.yml +++ b/.github/workflows/enos-run.yml @@ -15,9 +15,6 @@ on: go-version: required: true type: string - docker-image-name: - required: false - type: string docker-image-file: required: false type: string @@ -96,7 +93,6 @@ jobs: ENOS_VAR_crt_bundle_path: ./support/boundary.zip ENOS_VAR_test_email: ${{ secrets.SERVICE_USER_EMAIL }} ENOS_VAR_boundary_edition: ${{ inputs.edition }} - ENOS_VAR_boundary_docker_image_name: ${{ inputs.docker-image-name }} ENOS_VAR_boundary_docker_image_file: ./support/boundary_docker_image.tar ENOS_VAR_go_version: ${{ inputs.go-version }} ENOS_VAR_gcp_project_id: ${{ secrets.GCP_PROJECT_ID_CI }} diff --git a/enos/enos-scenario-e2e-docker-base-plus.hcl b/enos/enos-scenario-e2e-docker-base-plus.hcl index 26413d646a..2974fef247 100644 --- a/enos/enos-scenario-e2e-docker-base-plus.hcl +++ b/enos/enos-scenario-e2e-docker-base-plus.hcl @@ -81,7 +81,7 @@ scenario "e2e_docker_base_plus" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster] database_network = local.network_cluster postgres_address = step.create_boundary_database.address diff --git a/enos/enos-scenario-e2e-docker-base-with-gcp.hcl b/enos/enos-scenario-e2e-docker-base-with-gcp.hcl index 106f8590b3..a24e25cda0 100644 --- a/enos/enos-scenario-e2e-docker-base-with-gcp.hcl +++ b/enos/enos-scenario-e2e-docker-base-with-gcp.hcl @@ -82,7 +82,7 @@ scenario "e2e_docker_base_with_gcp" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster] database_network = local.network_cluster postgres_address = step.create_boundary_database.address diff --git a/enos/enos-scenario-e2e-docker-base-with-vault.hcl b/enos/enos-scenario-e2e-docker-base-with-vault.hcl index 4e19859f42..6b8cd1c306 100644 --- a/enos/enos-scenario-e2e-docker-base-with-vault.hcl +++ b/enos/enos-scenario-e2e-docker-base-with-vault.hcl @@ -83,7 +83,7 @@ scenario "e2e_docker_base_with_vault" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster] database_network = local.network_cluster postgres_address = step.create_boundary_database.address diff --git a/enos/enos-scenario-e2e-docker-base-with-worker.hcl b/enos/enos-scenario-e2e-docker-base-with-worker.hcl index 0fda20cf29..ad398c821b 100644 --- a/enos/enos-scenario-e2e-docker-base-with-worker.hcl +++ b/enos/enos-scenario-e2e-docker-base-with-worker.hcl @@ -99,7 +99,7 @@ scenario "e2e_docker_base_with_worker" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster, local.network_database] database_network = local.network_database postgres_address = step.create_boundary_database.address @@ -143,7 +143,7 @@ scenario "e2e_docker_base_with_worker" { step.create_boundary ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name boundary_license = var.boundary_edition != "oss" ? step.read_license.license : "" config_file = "worker-config.hcl" container_name = "worker" diff --git a/enos/enos-scenario-e2e-docker-base.hcl b/enos/enos-scenario-e2e-docker-base.hcl index e4ae9cdeb6..a57b865411 100644 --- a/enos/enos-scenario-e2e-docker-base.hcl +++ b/enos/enos-scenario-e2e-docker-base.hcl @@ -81,7 +81,7 @@ scenario "e2e_docker_base" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster] database_network = local.network_cluster postgres_address = step.create_boundary_database.address diff --git a/enos/enos-scenario-e2e-docker-worker-registration-controller-led.hcl b/enos/enos-scenario-e2e-docker-worker-registration-controller-led.hcl index 15dc01b90a..451c4a0eec 100644 --- a/enos/enos-scenario-e2e-docker-worker-registration-controller-led.hcl +++ b/enos/enos-scenario-e2e-docker-worker-registration-controller-led.hcl @@ -99,7 +99,7 @@ scenario "e2e_docker_worker_registration_controller_led" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster, local.network_database] database_network = local.network_database postgres_address = step.create_boundary_database.address @@ -113,7 +113,7 @@ scenario "e2e_docker_worker_registration_controller_led" { depends_on = [step.create_boundary] variables { address = step.create_boundary.address - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = local.network_cluster login_name = step.create_boundary.login_name password = step.create_boundary.password @@ -157,7 +157,7 @@ scenario "e2e_docker_worker_registration_controller_led" { step.create_boundary ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name boundary_license = var.boundary_edition != "oss" ? step.read_license.license : "" config_file = "worker-config-controller-led.hcl" container_name = "worker" diff --git a/enos/enos-scenario-e2e-docker-worker-registration-worker-led.hcl b/enos/enos-scenario-e2e-docker-worker-registration-worker-led.hcl index 93651ecbd4..208a0850f4 100644 --- a/enos/enos-scenario-e2e-docker-worker-registration-worker-led.hcl +++ b/enos/enos-scenario-e2e-docker-worker-registration-worker-led.hcl @@ -99,7 +99,7 @@ scenario "e2e_docker_worker_registration_worker_led" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster, local.network_database] database_network = local.network_database postgres_address = step.create_boundary_database.address @@ -144,7 +144,7 @@ scenario "e2e_docker_worker_registration_worker_led" { step.create_boundary ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name boundary_license = var.boundary_edition != "oss" ? step.read_license.license : "" config_file = "worker-config-worker-led.hcl" container_name = "worker" @@ -165,7 +165,7 @@ scenario "e2e_docker_worker_registration_worker_led" { ] variables { address = step.create_boundary.address - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = local.network_cluster login_name = step.create_boundary.login_name password = step.create_boundary.password diff --git a/enos/enos-scenario-e2e-ui-docker.hcl b/enos/enos-scenario-e2e-ui-docker.hcl index 7128afe10a..7acc96c9fd 100644 --- a/enos/enos-scenario-e2e-ui-docker.hcl +++ b/enos/enos-scenario-e2e-ui-docker.hcl @@ -81,7 +81,7 @@ scenario "e2e_ui_docker" { step.build_boundary_docker_image ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name network_name = [local.network_cluster] database_network = local.network_cluster postgres_address = step.create_boundary_database.address @@ -124,7 +124,7 @@ scenario "e2e_ui_docker" { step.create_boundary ] variables { - image_name = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name + image_name = step.build_boundary_docker_image.image_name boundary_license = var.boundary_edition != "oss" ? step.read_license.license : "" config_file = "worker-config.hcl" container_name = "worker" diff --git a/enos/enos-variables.hcl b/enos/enos-variables.hcl index c8e4021557..4bcac203af 100644 --- a/enos/enos-variables.hcl +++ b/enos/enos-variables.hcl @@ -25,12 +25,6 @@ variable "enos_user" { } # Test configs -variable "boundary_docker_image_name" { - description = "Name:Tag of Docker image to use" - type = string - default = "docker.io/hashicorp/boundary:latest" -} - variable "boundary_docker_image_file" { description = "Path to Boundary Docker image" type = string diff --git a/enos/modules/build_boundary_docker_crt/main.tf b/enos/modules/build_boundary_docker_crt/main.tf index 1f27ee6041..d8d80e3ccc 100644 --- a/enos/modules/build_boundary_docker_crt/main.tf +++ b/enos/modules/build_boundary_docker_crt/main.tf @@ -27,6 +27,21 @@ resource "enos_local_exec" "load_docker_image" { inline = ["docker load -i ${var.path}"] } +locals { + boundary_docker_image_name = replace( + element( + split("\n", trimspace(enos_local_exec.load_docker_image.stdout)), + -1 + ), + "Loaded image: ", + "" + ) +} + output "cli_zip_path" { value = var.cli_build_path } + +output "image_name" { + value = local.boundary_docker_image_name +}