Fix missing global prefix of command suffix #2494
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
rfay
approved these changes
Sep 16, 2020
| @@ -135,7 +135,7 @@ func addCustomCommands(rootCmd *cobra.Command) error { | |||
| } | |||
|
|
|||
| descSuffix := " (shell " + service + " container command)" | |||
| if serviceDirOnHost[0:1] == "." { | |||
| if commandSet == targetGlobalCommandPath { | |||
There was a problem hiding this comment.
The serviceDirOnHost[0:1] was completely wrong. It wasn't just Windows, glad you got this fixed!
There was a problem hiding this comment.
Also, the way you did it is far more readable, although this whole function is pretty obtuse.
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.
The Problem/Issue/Bug:
The global prefix in the command suffix of global commands is missing.
How this PR Solves The Problem:
This patch fixes the condition and adds tests to avoid regressions in this place.
Manual Testing Instructions:
run
ddevand check if the global prefix is added to global commands suffixes e.g.Run TYPO3 CLI (typo3) command inside the web container (global shell web container command)Automated Testing Overview:
The new tests are checking the correct behavior of global host and web commands. Also a new test is provided to ensure global host commands gets properly overwritten by the project ones.
Related Issue Link(s):
Release/Deployment notes: