Skip to content

Commit

Permalink
Merge pull request #11752 from ndeloof/flag_equal
Browse files Browse the repository at this point in the history
fix support for `--flag=value` syntax in compatibility mode
  • Loading branch information
glours committed Apr 22, 2024
2 parents 5682480 + 9970a84 commit 2c9c60e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 7 deletions.
25 changes: 18 additions & 7 deletions cmd/compatibility/convert.go
Expand Up @@ -19,6 +19,7 @@ package compatibility
import (
"fmt"
"os"
"strings"

"github.com/docker/compose/v2/cmd/compose"
)
Expand Down Expand Up @@ -55,6 +56,7 @@ func Convert(args []string) []string {
var rootFlags []string
command := []string{compose.PluginName}
l := len(args)
ARGS:
for i := 0; i < l; i++ {
arg := args[i]
if contains(getCompletionCommands(), arg) {
Expand All @@ -81,14 +83,23 @@ func Convert(args []string) []string {
rootFlags = append(rootFlags, arg)
continue
}
if contains(getStringFlags(), arg) {
i++
if i >= l {
fmt.Fprintf(os.Stderr, "flag needs an argument: '%s'\n", arg)
os.Exit(1)
for _, flag := range getStringFlags() {
if arg == flag {
i++
if i >= l {
fmt.Fprintf(os.Stderr, "flag needs an argument: '%s'\n", arg)
os.Exit(1)
}
rootFlags = append(rootFlags, arg, args[i])
continue ARGS
}
if strings.HasPrefix(arg, flag) {
_, val, found := strings.Cut(arg, "=")
if found {
rootFlags = append(rootFlags, flag, val)
continue ARGS
}
}
rootFlags = append(rootFlags, arg, args[i])
continue
}
command = append(command, arg)
}
Expand Down
5 changes: 5 additions & 0 deletions cmd/compatibility/convert_test.go
Expand Up @@ -38,6 +38,11 @@ func Test_convert(t *testing.T) {
args: []string{"--context", "foo", "-f", "compose.yaml", "up"},
want: []string{"--context", "foo", "compose", "-f", "compose.yaml", "up"},
},
{
name: "with context arg",
args: []string{"--context=foo", "-f", "compose.yaml", "up"},
want: []string{"--context", "foo", "compose", "-f", "compose.yaml", "up"},
},
{
name: "with host",
args: []string{"--host", "tcp://1.2.3.4", "up"},
Expand Down

0 comments on commit 2c9c60e

Please sign in to comment.