mirror of
https://gitlab.sarex.io/infra/terraform-contour-mirror.git
synced 2026-10-19 14:31:36 +03:00
++ fall back to the rabbitmq endpoint default when the var is set but empty
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
128cdf0958
commit
78316216b3
@ -16,6 +16,13 @@ locals {
|
|||||||
)
|
)
|
||||||
|
|
||||||
env_config = try(local.infra_config.environments[local.env_name], {})
|
env_config = try(local.infra_config.environments[local.env_name], {})
|
||||||
|
|
||||||
|
# get_env отдаёт дефолт только когда переменная НЕ ЗАДАНА. Воркфлоу маппит
|
||||||
|
# vars.* в env: безусловно, поэтому незаполненная переменная приезжает пустой
|
||||||
|
# строкой, дефолт не срабатывает, и провайдер уходит на свой собственный
|
||||||
|
# 127.0.0.1:15672 вместо брокера.
|
||||||
|
management_endpoint = trimspace(get_env("RABBITMQ_ENDPOINT", "")) != "" ? trimspace(get_env("RABBITMQ_ENDPOINT", "")) : "http://rabbitmq.rabbitmq.svc.cluster.local:15672"
|
||||||
|
management_username = trimspace(get_env("RABBITMQ_ADMIN_USER", "")) != "" ? trimspace(get_env("RABBITMQ_ADMIN_USER", "")) : "admin"
|
||||||
}
|
}
|
||||||
|
|
||||||
remote_state {
|
remote_state {
|
||||||
@ -48,8 +55,8 @@ terraform {
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
environment = local.env_name
|
environment = local.env_name
|
||||||
management_endpoint = get_env("RABBITMQ_ENDPOINT", "http://rabbitmq.rabbitmq.svc.cluster.local:15672")
|
management_endpoint = local.management_endpoint
|
||||||
management_username = get_env("RABBITMQ_ADMIN_USER", "admin")
|
management_username = local.management_username
|
||||||
management_password = get_env("RABBITMQ_ADMIN_PASSWORD", "")
|
management_password = get_env("RABBITMQ_ADMIN_PASSWORD", "")
|
||||||
amqp_host = try(local.env_config.rabbitmq.amqp_host, "rabbitmq.rabbitmq.svc.cluster.local")
|
amqp_host = try(local.env_config.rabbitmq.amqp_host, "rabbitmq.rabbitmq.svc.cluster.local")
|
||||||
amqp_port = try(local.env_config.rabbitmq.amqp_port, 5672)
|
amqp_port = try(local.env_config.rabbitmq.amqp_port, 5672)
|
||||||
|
|||||||
@ -58,6 +58,10 @@ for tg in "${STACK_FILES[@]}"; do
|
|||||||
cd "$stack_dir"
|
cd "$stack_dir"
|
||||||
terragrunt init -upgrade -reconfigure
|
terragrunt init -upgrade -reconfigure
|
||||||
|
|
||||||
|
if [[ "$stack_dir" == "live/rabbitmq" ]]; then
|
||||||
|
echo "--- rabbitmq endpoint: '${RABBITMQ_ENDPOINT:-<unset>}' user: '${RABBITMQ_ADMIN_USER:-<unset>}' ---"
|
||||||
|
fi
|
||||||
|
|
||||||
gp=$(find .terragrunt-cache -name provider.tf 2>/dev/null | head -1)
|
gp=$(find .terragrunt-cache -name provider.tf 2>/dev/null | head -1)
|
||||||
if [[ -n "$gp" ]] && grep -q 'provider "kafka"' "$gp" 2>/dev/null; then
|
if [[ -n "$gp" ]] && grep -q 'provider "kafka"' "$gp" 2>/dev/null; then
|
||||||
echo "--- generated provider.tf kafka block ---"
|
echo "--- generated provider.tf kafka block ---"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user