Don't try to Name filter unless things are Environment compose-x#707

thorfi · Nov 13, 2023 · cc60924 · cc60924
1 parent 438331b
commit cc60924
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ecs_composex/ecs/ecs_family/__init__.py b/ecs_composex/ecs/ecs_family/__init__.py
@@ -526,9 +526,9 @@ def sort_env_vars_alphabetically(self):
                 secret_names = frozenset()
             environment = getattr(service.container_definition, "Environment")
             if environment:
-                remove_secrets = [_env for _env in environment if _env.Name not in secret_names]
-                original = [_env for _env in remove_secrets if isinstance(_env, Environment)]
-                sorted_env = sorted(original, key=lambda x: x.Name)
+                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)
                 for _env in environment:
                     if not isinstance(_env, Environment):
                         sorted_env.append(_env)