chore(e2e): Set auth_storage_path to a non-temp directory (#5786)

pull/5820/head
Michael Li 11 months ago committed by GitHub
parent 7b8fdbc024
commit 284cb5e7aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -96,8 +96,9 @@ resource "enos_remote_exec" "update_path_controller" {
}
locals {
audit_log_directory = "/var/log/boundary"
service_user = "boundary"
audit_log_directory = "/var/log/boundary"
auth_storage_directory = "/var/lib/boundary"
service_user = "boundary"
}
resource "enos_file" "controller_config" {
@ -176,11 +177,11 @@ resource "enos_remote_exec" "create_controller_audit_log_dir" {
for_each = toset([for idx in range(var.controller_count) : tostring(idx)])
environment = {
LOG_DIR = local.audit_log_directory
NEW_DIR = local.audit_log_directory
SERVICE_USER = local.service_user
}
scripts = [abspath("${path.module}/scripts/create-audit-log-dir.sh")]
scripts = [abspath("${path.module}/scripts/create-dir.sh")]
transport = {
ssh = {
@ -235,6 +236,7 @@ resource "enos_file" "worker_config" {
region = var.aws_region
type = jsonencode(var.worker_type_tags)
recording_storage_path = var.recording_storage_path
auth_storage_path = local.auth_storage_directory
audit_log_dir = local.audit_log_directory
hcp_boundary_cluster_id = var.hcp_boundary_cluster_id
vault_address = local.network_stack[var.ip_version].vault_address
@ -273,11 +275,31 @@ resource "enos_remote_exec" "create_worker_audit_log_dir" {
for_each = toset([for idx in range(var.worker_count) : tostring(idx)])
environment = {
LOG_DIR = local.audit_log_directory
NEW_DIR = local.audit_log_directory
SERVICE_USER = local.service_user
}
scripts = [abspath("${path.module}/scripts/create-audit-log-dir.sh")]
scripts = [abspath("${path.module}/scripts/create-dir.sh")]
transport = {
ssh = {
host = var.ip_version == "6" ? aws_instance.worker[tonumber(each.value)].ipv6_addresses[0] : aws_instance.worker[tonumber(each.value)].public_ip
}
}
}
resource "enos_remote_exec" "create_worker_auth_storage_dir" {
depends_on = [
enos_boundary_start.worker_start,
]
for_each = toset([for idx in range(var.worker_count) : tostring(idx)])
environment = {
NEW_DIR = local.auth_storage_directory
SERVICE_USER = local.service_user
}
scripts = [abspath("${path.module}/scripts/create-dir.sh")]
transport = {
ssh = {

@ -9,7 +9,7 @@ fail() {
exit 1
}
[[ -z "$LOG_DIR" ]] && fail "LOG_DIR env variable has not been set"
[[ -z "$NEW_DIR" ]] && fail "NEW_DIR env variable has not been set"
[[ -z "$SERVICE_USER" ]] && fail "SERVICE_USER env variable has not been set"
function retry {
@ -34,5 +34,5 @@ function retry {
retry 7 id -a "$SERVICE_USER"
sudo mkdir -p "$LOG_DIR"
sudo chown -R "$SERVICE_USER":"$SERVICE_USER" "$LOG_DIR"
sudo mkdir -p "$NEW_DIR"
sudo chown -R "$SERVICE_USER":"$SERVICE_USER" "$NEW_DIR"

@ -17,7 +17,7 @@ worker {
region = ["${region}"]
}
auth_storage_path = "/tmp/boundary/worker"
auth_storage_path = "${auth_storage_path}/worker"
recording_storage_path = "${recording_storage_path}"
}

@ -246,11 +246,11 @@ resource "enos_remote_exec" "create_worker_audit_log_dir" {
]
environment = {
LOG_DIR = local.audit_log_directory
NEW_DIR = local.audit_log_directory
SERVICE_USER = local.service_user
}
scripts = [abspath("${path.module}/scripts/create-audit-log-dir.sh")]
scripts = [abspath("${path.module}/scripts/create-dir.sh")]
transport = {
ssh = {

@ -9,7 +9,7 @@ fail() {
exit 1
}
[[ -z "$LOG_DIR" ]] && fail "LOG_DIR env variable has not been set"
[[ -z "$NEW_DIR" ]] && fail "NEW_DIR env variable has not been set"
[[ -z "$SERVICE_USER" ]] && fail "SERVICE_USER env variable has not been set"
function retry {
@ -34,5 +34,5 @@ function retry {
retry 7 id -a "$SERVICE_USER"
sudo mkdir -p "$LOG_DIR"
sudo chown -R "$SERVICE_USER":"$SERVICE_USER" "$LOG_DIR"
sudo mkdir -p "$NEW_DIR"
sudo chown -R "$SERVICE_USER":"$SERVICE_USER" "$NEW_DIR"
Loading…
Cancel
Save