Fix service update --env-add issue
#25427
Merged
Conversation
This file contains 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
yongtang
force-pushed
the
25404-service-update-env-add
branch
from
d6d2e98
to
2b7b359
Compare
|
Seems like it's been a punctual error: 03:57:26 ---> Making bundle: validate-dco (in bundles/1.13.0-dev/validate-dco) Can you trigger the build again manually? |
| out, err = d.Cmd("service", "inspect", "--format", "{{ .Spec.TaskTemplate.ContainerSpec.Env }}", name) | ||
| c.Assert(err, checker.IsNil) | ||
| c.Assert(strings.TrimSpace(out), checker.Equals, "[A=b]") | ||
| } |
There was a problem hiding this comment.
I don't think this needs to be an integration test.
We can fully test this change as a unit test. in api/client/service/update_test.go
There was a problem hiding this comment.
Thanks @dnephin. The integration test has been removed and replaced with a unit test.
This fix tries to address the issue in 25404 where updating environmental variable in `service update --env-add` will not work. The issue is because `--env-add` will only append the env, not update if the same env already exist. This fix tracks the env variable with a map and update if the variable is the same. An integration test has been added. This fix fixes 25404. Signed-off-by: Yong Tang <[email protected]>
yongtang
force-pushed
the
25404-service-update-env-add
branch
from
2b7b359
to
c6de8ad
Compare
|
LGTM |
|
retest this please |
|
LGTM |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
- What I did
This fix tries to address the issue in #25404 where updating environmental variable in
service update --env-addwill not work.The issue is because
--env-addwill only append the env, not update if the same env already exist.- How I did it
This fix tracks the env variable with a map and update if the variable is the same.
- How to verify it
An integration test has been added.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
This fix fixes #25404.
Signed-off-by: Yong Tang [email protected]