test(e2e): Differentiate between public and private vault addresses (#5553)

enos/modules/test_e2e_docker/main.tf

@@ -94,13 +94,14 @@ variable "target_ca_key" {
   type        = string
   default     = ""
 }
-variable "vault_addr" {
-  description = "External network address of Vault. Will be converted to a URL below"
+variable "vault_addr_public" {
+  description = "Public address to a vault instance"
   type        = string
   default     = ""
 }
-variable "vault_addr_internal" {
-  description = "Internal network address of Vault (i.e. within a docker network). Will be converted to a URL below"
+
+variable "vault_addr_private" {
+  description = "Private address to a vault instance"
   type        = string
   default     = ""
 }
@@ -314,10 +315,11 @@ resource "enos_local_exec" "run_e2e_test" {
     E2E_SSH_USER                  = var.target_user
     E2E_SSH_KEY_PATH              = local.aws_ssh_private_key_path
     E2E_SSH_CA_KEY                = var.target_ca_key
-    VAULT_ADDR                    = var.vault_addr
-    VAULT_ADDR_INTERNAL           = var.vault_addr_internal
+    VAULT_ADDR                    = var.vault_addr_public
+    VAULT_ADDR_INTERNAL           = var.vault_addr_private
     VAULT_TOKEN                   = var.vault_root_token
-    E2E_VAULT_ADDR                = var.vault_addr_internal
+    E2E_VAULT_ADDR_PUBLIC         = var.vault_addr_public
+    E2E_VAULT_ADDR_PRIVATE        = var.vault_addr_private
     E2E_BUCKET_NAME               = var.bucket_name
     E2E_BUCKET_ENDPOINT_URL       = var.bucket_endpoint_url
     E2E_BUCKET_USER_ID            = var.bucket_user_id

enos/modules/test_e2e_docker/test_runner.sh

@@ -31,7 +31,8 @@ docker run \
     -e "E2E_MINIO_ALIAS=$E2E_MINIO_ALIAS" \
     -e "VAULT_ADDR=$VAULT_ADDR_INTERNAL" \
     -e "VAULT_TOKEN=$VAULT_TOKEN" \
-    -e "E2E_VAULT_ADDR=$E2E_VAULT_ADDR" \
+    -e "E2E_VAULT_ADDR_PUBLIC=$E2E_VAULT_ADDR_PUBLIC" \
+    -e "E2E_VAULT_ADDR_PRIVATE=$E2E_VAULT_ADDR_PRIVATE" \
     -e "E2E_POSTGRES_USER=$E2E_POSTGRES_USER" \
     -e "E2E_POSTGRES_PASSWORD=$E2E_POSTGRES_PASSWORD" \
     -e "E2E_POSTGRES_DB_NAME=$E2E_POSTGRES_DB_NAME" \