Fix always listing nodes in docker stack ps command #1093
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
…. A user without node listing rights could not use this command as it always fails. Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
thaJeztah
requested changes
May 30, 2018
| @@ -20,8 +20,7 @@ func RunRemove(dockerCli *KubeCli, opts options.Remove) error { | |||
| fmt.Fprintf(dockerCli.Out(), "Removing stack: %s\n", stack) | |||
| err := stacks.Delete(stack) | |||
| if err != nil { | |||
| fmt.Fprintf(dockerCli.Out(), "Failed to remove stack %s: %s\n", stack, err) | |||
| return err | |||
| return fmt.Errorf("Failed to remove stack %s: %s", stack, err) | |||
There was a problem hiding this comment.
nit; probably better to use;
return errors.Wrapf(err, "Failed to remove stack %s", stack)Can also put the err inside the if;
if err := stacks.Delete(stack); err != nil {
return errors.Wrapf(err, "Failed to remove stack %s", stack)
}
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
silvin-lubecki
force-pushed
the
fix-listing-nodes
branch
from
8c64150
to
a252cb1
Compare
mat007
reviewed
May 30, 2018
| fmt.Fprintf(dockerCli.Out(), "Failed to remove stack %s: %s\n", stack, err) | ||
| return err | ||
| if err := stacks.Delete(stack); err != nil { | ||
| return errors.Wrapf(err, "Failed to remove stack %s", stack) |
There was a problem hiding this comment.
nit: shouldn't error messages be all lowercase?
There was a problem hiding this comment.
Was looking at that, but this is printed on the CLI, and other messages (non-error) were also capitalised ("Removing stack ..." and so on)
There was a problem hiding this comment.
Fair enough even if the other messages are not errors but printed directly to dockerCli.Out().
There was a problem hiding this comment.
We should have a look through all messages to check for consistency though 👍
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
docker stack pscommand on Kubernetes which always failed with a user without node listing privilege.docker stack rmcommand.- How to verify it
docker stack pson this namespace -> it should not fail and list all the containers- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)