cli/command/stack: fix faulty sort for sorting stacks #5212
Conversation
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
This code was updated in 7b9580d, which removed support for using kubernetes as orchestrator, but in doing so made this `sort.Slice` (probably) not do what it was expected to do ':) index 412cc2e..861ae1b 100644 @@ -75,8 +54,7 @@ func format(dockerCli command.Cli, opts options.List, orchestrator command.Orche } sort.Slice(stacks, func(i, j int) bool { return sortorder.NaturalLess(stacks[i].Name, stacks[j].Name) || - !sortorder.NaturalLess(stacks[j].Name, stacks[i].Name) && - sortorder.NaturalLess(stacks[j].Namespace, stacks[i].Namespace) + !sortorder.NaturalLess(stacks[j].Name, stacks[i].Name) }) return formatter.StackWrite(stackCtx, stacks) } The extra condition was added in 84241cc to support multiple namespaces. This patch removes it, bringing it back to the state it was before that commit. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5212 +/- ##
==========================================
- Coverage 61.43% 61.42% -0.01%
==========================================
Files 298 298
Lines 20799 20798 -1
==========================================
- Hits 12777 12776 -1
Misses 7109 7109
Partials 913 913 |
Benehiko
approved these changes
Jul 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 code was updated in 7b9580d (#3139), which removed support for using kubernetes as orchestrator, but in doing so made this
sort.Slice(probably) not do what it was expected to do ':)The extra condition was added in 84241cc (#1031) to support multiple namespaces. This patch removes it, bringing it back to the state it was before that commit.
- A picture of a cute animal (not mandatory but encouraged)