Skip to content

Commit 7da773e

Browse files
Remove all Redis AWS IAM passwordless configurations from PostgreSQL-only branch
- Remove Redis AWS IAM variables from runtime_container_engine_config - Remove Redis AWS IAM variables from settings module - Remove Redis AWS IAM configuration from tfe_redis_config.tf - Keep only Azure MSI Redis variables that were in main branch - This branch should only contain PostgreSQL passwordless authentication
1 parent 014a42f commit 7da773e

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

modules/runtime_container_engine_config/redis_config.tf

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,25 @@ locals {
2020
TFE_REDIS_PASSWORDLESS_AZURE_USE_MSI = var.redis_passwordless_azure_use_msi
2121
TFE_REDIS_SIDEKIQ_PASSWORDLESS_AZURE_USE_MSI = var.redis_passwordless_azure_use_msi
2222
TFE_REDIS_PASSWORDLESS_AZURE_CLIENT_ID = var.redis_passwordless_azure_client_id
23+
# Additional legacy variables that TFE might expect
24+
REDIS_HOST = var.redis_use_tls != null ? var.redis_use_tls ? "${var.redis_host}:6380" : var.redis_host : null
25+
REDIS_USER = var.redis_user
26+
REDIS_PASSWORD = var.redis_password
27+
REDIS_USE_TLS = var.redis_use_tls ? "true" : "false"
28+
REDIS_USE_AUTH = var.redis_use_auth ? "true" : "false"
29+
# Legacy Redis IAM environment variables (for backward compatibility)
30+
REDIS_PASSWORDLESS_AWS_USE_INSTANCE_PROFILE = var.redis_passwordless_aws_use_iam ? "true" : ""
31+
REDIS_PASSWORDLESS_AWS_REGION = var.redis_passwordless_aws_region
32+
REDIS_PASSWORDLESS_AWS_SERVICE_NAME = var.redis_passwordless_aws_service_name
33+
REDIS_PASSWORDLESS_AWS_HOST_NAME = var.redis_passwordless_aws_host_name
34+
# Additional legacy variables that TFE might expect
35+
REDIS_HOST = var.redis_use_tls != null ? var.redis_use_tls ? "${var.redis_host}:6380" : var.redis_host : null
36+
REDIS_USER = var.redis_user
37+
REDIS_PASSWORD = var.redis_password
38+
REDIS_USE_TLS = var.redis_use_tls ? "true" : "false"
39+
REDIS_USE_AUTH = var.redis_use_auth ? "true" : "false"
40+
# Redis URL should not be set when using IAM authentication as it conflicts with passwordless auth
41+
REDIS_URL = var.redis_passwordless_aws_use_iam ? null : null
2342
}
2443
redis_configuration = local.active_active ? local.redis : {}
2544
}

0 commit comments

Comments
 (0)