fix(manifest): preserve default network config on empty env overrides#2442
Merged
mergify[bot] merged 3 commits intoaws:mainlinefrom Jun 14, 2021
Merged
fix(manifest): preserve default network config on empty env overrides#2442mergify[bot] merged 3 commits intoaws:mainlinefrom
mergify[bot] merged 3 commits intoaws:mainlinefrom
Conversation
huanjani
reviewed
Jun 11, 2021
Fixes aws#2420 Previously, when a user provided a network config and an env override: ```yaml network: vpc: security_groups: ['sg-123123'] environments: dev: count: 2 ``` The network config for the "dev" environment got overriden to an empty struct{}. This change ensures that the default entry is preserved for network config is preserved for the "dev" environment. This is done by changing the type for the Network field to a pointer so that mergo does not overwrite it.
efekarakus
force-pushed
the
issues/fix-2420
branch
from
31aa4a7 to
6233e83
Compare
iamhopaul123
approved these changes
Jun 11, 2021
Comment on lines
+537
to
545
| if network == nil || network.VPC == nil { | ||
| return &template.NetworkOpts{ | ||
| AssignPublicIP: template.EnablePublicIP, | ||
| SubnetsType: template.PublicSubnetsPlacement, | ||
| } | ||
| } | ||
| opts := &template.NetworkOpts{ | ||
| AssignPublicIP: template.EnablePublicIP, | ||
| SubnetsType: template.PublicSubnetsPlacement, |
Contributor
There was a problem hiding this comment.
Suggested change
| if network == nil || network.VPC == nil { | |
| return &template.NetworkOpts{ | |
| AssignPublicIP: template.EnablePublicIP, | |
| SubnetsType: template.PublicSubnetsPlacement, | |
| } | |
| } | |
| opts := &template.NetworkOpts{ | |
| AssignPublicIP: template.EnablePublicIP, | |
| SubnetsType: template.PublicSubnetsPlacement, | |
| opts := &template.NetworkOpts{ | |
| AssignPublicIP: template.EnablePublicIP, | |
| SubnetsType: template.PublicSubnetsPlacement | |
| } | |
| if network == nil || network.VPC == nil { | |
| return opts | |
| } | |
| opts.SecurityGroups = network.VPC.SecurityGroups |
mergify Bot
pushed a commit
that referenced
this pull request
Jun 21, 2021
…verrides (#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 #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.
thrau
pushed a commit
to localstack/copilot-cli-local
that referenced
this pull request
Dec 9, 2022
…aws#2442) Fixes aws#2420 Previously, when a user provided a network config and an env override: ```yaml network: vpc: security_groups: ['sg-123123'] environments: dev: count: 2 ``` The network config for the "dev" environment got overriden to an empty struct{}. This change ensures that the default entry is preserved for network config is preserved for the "dev" environment. This is done by changing the type for the Network field to a pointer so that mergo does not overwrite it. <!-- Provide summary of changes --> <!-- Issue number, if available. E.g. "Fixes aws#31", "Addresses aws#42, 77" --> By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
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
4 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.
Fixes #2420
Previously, when a user provided a network config and an env override:
The network config for the "dev" environment got overriden to an empty
struct{}.
This change ensures that the default entry is preserved for network
config is preserved for the "dev" environment.
This is done by changing the type for the Network field to a pointer so
that mergo does not overwrite it.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.