From 5c1c2040cd474a8fc817a1ac7fc8723fa4ef32b9 Mon Sep 17 00:00:00 2001 From: David Goh Date: Tue, 14 Nov 2023 14:21:11 +1100 Subject: [PATCH] Rename the environment if it's duplicated by secrets #707 --- ecs_composex/ecs/ecs_family/__init__.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ecs_composex/ecs/ecs_family/__init__.py b/ecs_composex/ecs/ecs_family/__init__.py index 6d5a758b..7369db21 100644 --- a/ecs_composex/ecs/ecs_family/__init__.py +++ b/ecs_composex/ecs/ecs_family/__init__.py @@ -528,16 +528,17 @@ def sort_env_vars_alphabetically(self): secret_names = frozenset() environment = getattr(service.container_definition, "Environment") if environment: - original = [ - _env for _env in environment if isinstance(_env, Environment) - ] - remove_secrets = [ - _env for _env in original if _env.Name not in secret_names - ] - sorted_env = sorted(remove_secrets, key=lambda x: x.Name) + original = [] + extras = [] for _env in environment: - if not isinstance(_env, Environment): - sorted_env.append(_env) + if isinstance(_env, Environment): + while _env.Name in secret_names: + _env.Name += "_IN_SECRETS" + original.append(_env) + else: + extras.append(_env) + sorted_env = sorted(original, key=lambda x: x.Name) + sorted_env.extend(extras) setattr(service.container_definition, "Environment", sorted_env) def set_services_to_services_dependencies(self):