test(e2e): Add test for vault oidc provider (#5384)
* test(e2e): Simplify vault address in docker network * test(e2e): Add oidc test using vault * Update enos/modules/docker_vault/main.tf Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com> --------- Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
This commit is contained in:
1 parent
20f11ab01b
commit
6ed077c69e
6 files changed
+334
-16
No files matched your search
@@ -1,4 +1,5 @@
|
||||
{
|
||||
"api_addr": "https://127.0.0.1:8300",
|
||||
"storage": {
|
||||
"file": {
|
||||
"path": "/vault/file"
|
||||
@@ -7,7 +8,7 @@
|
||||
"listener": [
|
||||
{
|
||||
"tcp": {
|
||||
"address": "0.0.0.0:8200",
|
||||
"address": "0.0.0.0:8300",
|
||||
"tls_disable": true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,6 +37,11 @@ variable "vault_port" {
|
||||
type = string
|
||||
default = "8300"
|
||||
}
|
||||
variable "vault_port_internal" {
|
||||
description = "Internal Port to use"
|
||||
type = string
|
||||
default = "8300"
|
||||
}
|
||||
|
||||
resource "docker_image" "vault" {
|
||||
name = var.image_name
|
||||
@@ -48,7 +53,7 @@ resource "docker_container" "vault" {
|
||||
name = var.container_name
|
||||
command = ["vault", "server", "-config", "/vault/config.d/config.json"]
|
||||
ports {
|
||||
internal = 8200
|
||||
internal = var.vault_port_internal
|
||||
external = var.vault_port
|
||||
}
|
||||
mounts {
|
||||
@@ -128,11 +133,11 @@ resource "enos_local_exec" "check_health" {
|
||||
}
|
||||
|
||||
output "address" {
|
||||
value = "0.0.0.0"
|
||||
value = "http://${var.container_name}:${var.vault_port}"
|
||||
}
|
||||
|
||||
output "address_internal" {
|
||||
value = var.container_name
|
||||
value = "http://${var.container_name}:${var.vault_port_internal}"
|
||||
}
|
||||
|
||||
output "token" {
|
||||
|
||||
@@ -286,12 +286,9 @@ resource "enos_local_exec" "get_go_version" {
|
||||
}
|
||||
|
||||
locals {
|
||||
go_version = var.go_version == "" ? enos_local_exec.get_go_version[0].stdout : var.go_version
|
||||
image_name = trimspace("${var.docker_mirror}/library/golang:${local.go_version}")
|
||||
|
||||
go_version = var.go_version == "" ? enos_local_exec.get_go_version[0].stdout : var.go_version
|
||||
image_name = trimspace("${var.docker_mirror}/library/golang:${local.go_version}")
|
||||
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
|
||||
vault_addr = var.vault_addr != "" ? "http://${var.vault_addr}:${var.vault_port}" : ""
|
||||
vault_addr_internal = var.vault_addr_internal != "" ? "http://${var.vault_addr_internal}:8200" : local.vault_addr
|
||||
package_name = reverse(split("/", var.test_package))[0]
|
||||
}
|
||||
|
||||
@@ -317,10 +314,10 @@ 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 = local.vault_addr
|
||||
VAULT_ADDR_INTERNAL = local.vault_addr_internal
|
||||
VAULT_ADDR = var.vault_addr
|
||||
VAULT_ADDR_INTERNAL = var.vault_addr_internal
|
||||
VAULT_TOKEN = var.vault_root_token
|
||||
E2E_VAULT_ADDR = local.vault_addr_internal
|
||||
E2E_VAULT_ADDR = var.vault_addr_internal
|
||||
E2E_BUCKET_NAME = var.bucket_name
|
||||
E2E_BUCKET_ENDPOINT_URL = var.bucket_endpoint_url
|
||||
E2E_BUCKET_USER_ID = var.bucket_user_id
|
||||
|
||||
@@ -196,8 +196,6 @@ variable "worker_tag_egress" {
|
||||
|
||||
locals {
|
||||
aws_ssh_private_key_path = abspath(var.aws_ssh_private_key_path)
|
||||
vault_addr = var.vault_addr != "" ? "http://${var.vault_addr}:${var.vault_port}" : ""
|
||||
vault_addr_internal = var.vault_addr_internal != "" ? "http://${var.vault_addr_internal}:8200" : local.vault_addr
|
||||
aws_host_set_ips = jsonencode(var.aws_host_set_ips)
|
||||
}
|
||||
|
||||
@@ -213,9 +211,9 @@ resource "enos_local_exec" "run_e2e_test" {
|
||||
E2E_SSH_KEY_PATH = local.aws_ssh_private_key_path
|
||||
E2E_SSH_CA_KEY = var.target_ca_key
|
||||
E2E_SSH_CA_KEY_PUBLIC = var.target_ca_key_public
|
||||
VAULT_ADDR = local.vault_addr
|
||||
VAULT_ADDR = var.vault_addr
|
||||
VAULT_TOKEN = var.vault_root_token
|
||||
E2E_VAULT_ADDR = local.vault_addr_internal
|
||||
E2E_VAULT_ADDR = var.vault_addr_internal
|
||||
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_filter
|
||||
|
||||
Reference in new issue
Block a user