test(e2e): Use vault version from variable (#6589)

This commit is contained in:
Michael Li authored and GitHub committed 2026-04-15 14:18:24 -04:00
1 parent e3f19279c7
commit 0d4ff79f0b
4 files changed
+9 -1

No files matched your search

+1
View File
@@ -129,6 +129,7 @@ scenario "e2e_database" {
aws_host_set_filter1 = step.create_tag_inputs.tag_string
max_page_size = 10
aws_region = var.aws_region
vault_version = var.vault_version
}
}
+6
View File
@@ -81,6 +81,11 @@ variable "vault_root_token" {
type = string
default = ""
}
variable "vault_version" {
description = "Version of vault being tested, used to determine which tests to run"
type = string
default = ""
}
variable "aws_access_key_id" {
description = "Access Key Id for AWS IAM user used in dynamic host catalogs"
type = string
@@ -281,6 +286,7 @@ resource "enos_local_exec" "run_e2e_test" {
VAULT_TOKEN = var.vault_root_token
E2E_VAULT_ADDR_PUBLIC = var.vault_addr_public
E2E_VAULT_ADDR_PRIVATE = var.vault_addr_private
E2E_VAULT_VERSION = var.vault_version
E2E_AWS_ACCESS_KEY_ID = var.aws_access_key_id
E2E_AWS_SECRET_ACCESS_KEY = var.aws_secret_access_key
E2E_AWS_HOST_SET_FILTER = var.aws_host_set_filter1
@@ -10,6 +10,7 @@ type config struct {
TargetSshKeyPath string `envconfig:"E2E_SSH_KEY_PATH" required:"true"` // e.g. /Users/username/key.pem
TargetPort string `envconfig:"E2E_TARGET_PORT" default:"22"`
VaultSecretPath string `envconfig:"E2E_VAULT_SECRET_PATH" default:"e2e_secrets"`
VaultVersion string `envconfig:"E2E_VAULT_VERSION" default:"1.17.6"`
AwsAccessKeyId string `envconfig:"E2E_AWS_ACCESS_KEY_ID" required:"true"`
AwsSecretAccessKey string `envconfig:"E2E_AWS_SECRET_ACCESS_KEY" required:"true"`
AwsHostSetFilter string `envconfig:"E2E_AWS_HOST_SET_FILTER" required:"true"` // e.g. "tag:testtag=true"
@@ -89,7 +89,7 @@ func setupEnvironment(t testing.TB, c *config, boundaryRepo, boundaryTag string)
})
// Start Vault
v, vaultToken := infra.StartVault(t, pool, network, "hashicorp/vault", "latest")
v, vaultToken := infra.StartVault(t, pool, network, "hashicorp/vault", c.VaultVersion)
t.Cleanup(func() {
if err := pool.Purge(v.Resource); err != nil {
t.Logf("error purging pool: %v", err)