fix(manifest): preserve default entrypoint and command on empty env overrides#2490
Merged
mergify[bot] merged 2 commits intoaws:mainlinefrom Jun 21, 2021
Merged
Conversation
efekarakus
approved these changes
Jun 21, 2021
Contributor
efekarakus
left a comment
efekarakus
left a comment
There was a problem hiding this comment.
Cool thank you!!
I don't know how we can enforce a mechanism yet since this has been a fragile section of our codebase, but noting here things we learned:
- New manifest fields need to be pointers, so that mergo doesn't override them with empty structs due to
mergo.withOverriteWithEmptyValue - Override logic won't appear in our code coverage, so we just have to ensure in our PRs that we have unit tests for them
bvtujo
approved these changes
Jun 21, 2021
Contributor
bvtujo
left a comment
bvtujo
left a comment
There was a problem hiding this comment.
Looks great, thank you for this!
iamhopaul123
added
do-not-merge
thrau
pushed a commit
to localstack/copilot-cli-local
that referenced
this pull request
Dec 9, 2022
…verrides (aws#2490) This fixes the bug where an empty environment `entrypoint`/`command` will replace the default `entrypoint`/`command` in manifest if they are specified as list. This is because an empty list `[]string` isn't considered a zero value, hence `mergo` will use the empty list to replace the original list. This is the same fix as aws#2442, only it's on entrypoint and command overrides. By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes the bug where an empty environment
entrypoint/commandwill replace the defaultentrypoint/commandin manifest if they are specified as list.This is because an empty list
[]stringisn't considered a zero value, hencemergowill use the empty list to replace the original list.This is the same fix as #2442, only it's on entrypoint and command overrides.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.