Skip to content

IL-826 Revert "Pass compatibility flag to v2" #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ulyssessouza merged 1 commit into from
Dec 13, 2021
Merged

IL-826 Revert "Pass compatibility flag to v2" #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions redirect/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ var (
)

func Convert(args []string) []string {
var rootFlags []string
command := []string{"compose", "--compatibility"}
rootFlags := []string{}
command := []string{"compose"}
l := len(args)
for i := 0; i < l; i++ {
arg := args[i]
Expand Down
17 changes: 9 additions & 8 deletions redirect/convert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,43 +31,44 @@ func Test_convert(t *testing.T) {
{
name: "compose only",
args: []string{"up"},
want: []string{"compose", "--compatibility", "up"},
want: []string{"compose", "up"},
},
{
name: "with context",
args: []string{"--context", "foo", "-f", "compose.yaml", "up"},
want: []string{"--context", "foo", "compose", "--compatibility", "-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"},
want: []string{"--host", "tcp://1.2.3.4", "compose", "--compatibility", "up"},
want: []string{"--host", "tcp://1.2.3.4", "compose", "up"},
},
{
name: "compose --version",
args: []string{"--version"},
want: []string{"compose", "--compatibility", "version"},
want: []string{"compose", "version"},
},
{
name: "help",
args: []string{"-h"},
want: []string{"compose", "--compatibility", "--help"},
want: []string{"compose", "--help"},
},
{
name: "issues/1962",
args: []string{"psql", "-h", "postgres"},
want: []string{"compose", "--compatibility", "psql", "-h", "postgres"}, // -h should not be converted to --help
want: []string{"compose", "psql", "-h", "postgres"}, // -h should not be converted to --help
},
{
name: "issues/8648",
args: []string{"exec", "mongo", "mongo", "--host", "mongo"},
want: []string{"compose", "--compatibility", "exec", "mongo", "mongo", "--host", "mongo"}, // --host is passed to exec
want: []string{"compose", "exec", "mongo", "mongo", "--host", "mongo"}, // --host is passed to exec
},
{
name: "issues/12",
args: []string{"--log-level", "INFO", "up"},
want: []string{"--log-level", "INFO", "compose", "--compatibility", "up"},
want: []string{"--log-level", "INFO", "compose", "up"},
},

}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down