Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix Environment Secrets overlap #714

Merged
merged 20 commits into from
Nov 21, 2023
Merged

Bugfix Environment Secrets overlap #714

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c3f0761
Don't die if access is not defined in target list #696
thorfi Nov 9, 2023
e278708
make conform formatting #696
thorfi Nov 9, 2023
ebcb48f
Bump to 0.23.27-rc2
JohnPreston Nov 10, 2023
06f419d
Fixing elbv2.Targets no access and conditions set
JohnPreston Nov 12, 2023
e33f7b0
Fix x-cloudmap Vpc to use Ref:
thorfi Nov 12, 2023
2f3c036
Merge branch 'compose-x:main' into main
thorfi Nov 12, 2023
de8fd07
Merge pull request #1 from compose-x/fix/elbv2-conditions-no-access
thorfi Nov 13, 2023
438331b
Get secrets, then delete environment variables that are in secrets #707
thorfi Nov 13, 2023
cc60924
Don't try to Name filter unless things are Environment #707
thorfi Nov 13, 2023
920d73f
Merge branch 'main' of github.com:thorfi/ecs_composex
thorfi Nov 13, 2023
7b0e873
Merge branch 'main' into 707-ecs-container-environment-secrets
thorfi Nov 13, 2023
bbff615
make conform #707
thorfi Nov 13, 2023
36e10b1
Merge branch 'main' of github.com:thorfi/ecs_composex
thorfi Nov 14, 2023
ae56a14
Merge branch 'main' into 707-ecs-container-environment-secrets
thorfi Nov 14, 2023
5c1c204
Rename the environment if it's duplicated by secrets #707
thorfi Nov 14, 2023
7ef7967
LOG.warning if we rename environment variables #707
thorfi Nov 14, 2023
1ca05b8
Merge branch 'main' of github.com:thorfi/ecs_composex
thorfi Nov 17, 2023
f33b570
Iterate environment in reverse for pop()ing #707 #710
thorfi Nov 20, 2023
8532a87
Bugfix reversed() #707
thorfi Nov 20, 2023
7c74574
Merge branch 'compose-x:main' into 707-bugfix-environment
thorfi Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ecs_composex/ecs/ecs_family/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,8 @@ def sort_env_vars(
_secret.Name
for _secret in getattr(service.container_definition, "Secrets", [])
]
for _index, _env in enumerate(sorted_env):
# Iterate in reverse for popping so we don't mess up indexes
for _index, _env in reversed(tuple(enumerate(sorted_env))):
if _env.Name in secrets_names:
LOG.warning(
"services.{}: Environment variable {} overlaps with Secret. Removing.".format(
Expand Down