Skip to content

Commit 51aad5a

Browse files
Extract repeated redis_passwordless_aws_use_instance_profile condition into local variable
Address feedback from nikolasrieble and GitHub Copilot: - Extract var.redis_passwordless_aws_use_instance_profile into local.use_redis_passwordless_aws - Replace 5 occurrences of the repeated condition with the local variable - Improves maintainability and reduces duplication as suggested This makes the code easier to maintain if the condition logic ever needs to change.
1 parent 42c91b4 commit 51aad5a

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

modules/runtime_container_engine_config/redis_config.tf

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
# SPDX-License-Identifier: MPL-2.0
33

44
locals {
5+
# Extract repeated condition for better maintainability
6+
use_redis_passwordless_aws = var.redis_passwordless_aws_use_instance_profile
7+
58
redis = {
69
TFE_REDIS_HOST = var.redis_use_tls != null ? var.redis_use_tls ? "${var.redis_host}:6380" : var.redis_host : null
7-
TFE_REDIS_USER = var.redis_passwordless_aws_use_instance_profile ? var.redis_passwordless_aws_iam_user : var.redis_user
8-
TFE_REDIS_PASSWORD = var.redis_passwordless_aws_use_instance_profile ? null : var.redis_password
10+
TFE_REDIS_USER = local.use_redis_passwordless_aws ? var.redis_passwordless_aws_iam_user : var.redis_user
11+
TFE_REDIS_PASSWORD = local.use_redis_passwordless_aws ? null : var.redis_password
912
TFE_REDIS_USE_TLS = var.redis_use_tls
1013
TFE_REDIS_USE_AUTH = var.redis_use_auth
1114
TFE_REDIS_SENTINEL_ENABLED = var.redis_use_sentinel
@@ -20,13 +23,13 @@ locals {
2023
TFE_REDIS_PASSWORDLESS_AZURE_USE_MSI = var.redis_passwordless_azure_use_msi
2124
TFE_REDIS_SIDEKIQ_PASSWORDLESS_AZURE_USE_MSI = var.redis_passwordless_azure_use_msi
2225
TFE_REDIS_PASSWORDLESS_AZURE_CLIENT_ID = var.redis_passwordless_azure_client_id
23-
TFE_REDIS_PASSWORDLESS_AWS_USE_INSTANCE_PROFILE = var.redis_passwordless_aws_use_instance_profile
24-
TFE_REDIS_SIDEKIQ_PASSWORDLESS_AWS_USE_INSTANCE_PROFILE = var.redis_passwordless_aws_use_instance_profile
26+
TFE_REDIS_PASSWORDLESS_AWS_USE_INSTANCE_PROFILE = local.use_redis_passwordless_aws
27+
TFE_REDIS_SIDEKIQ_PASSWORDLESS_AWS_USE_INSTANCE_PROFILE = local.use_redis_passwordless_aws
2528
TFE_REDIS_PASSWORDLESS_AWS_REGION = var.redis_passwordless_aws_region
2629
TFE_REDIS_SIDEKIQ_PASSWORDLESS_AWS_REGION = var.redis_passwordless_aws_region
2730
TFE_REDIS_PASSWORDLESS_AWS_HOST_NAME = var.redis_passwordless_aws_host_name
2831
TFE_REDIS_SIDEKIQ_PASSWORDLESS_AWS_HOST_NAME = var.redis_passwordless_aws_host_name
29-
TFE_REDIS_SIDEKIQ_USER = var.redis_passwordless_aws_use_instance_profile ? var.redis_passwordless_aws_iam_user : var.redis_user
32+
TFE_REDIS_SIDEKIQ_USER = local.use_redis_passwordless_aws ? var.redis_passwordless_aws_iam_user : var.redis_user
3033
TFE_REDIS_SIDEKIQ_USE_TLS = var.redis_use_tls
3134
}
3235
redis_configuration = local.active_active ? local.redis : {}

0 commit comments

Comments
 (0)