Merge pull request #9507 from TheodosiouTh/tc/simplify-flag-conversion

TC: Use switch case to simplify flag conversion and avoid multiple if statements

cmd/compatibility/convert.go

@@ -58,17 +58,18 @@ func Convert(args []string) []string {
 			command = append(command, args[i:]...)
 			break
 		}
-		if arg == "--verbose" {
+
+		switch arg {
+		case "--verbose":
 			arg = "--debug"
-		}
+		case "-h":
-		if arg == "-h" {
 			// docker cli has deprecated -h to avoid ambiguity with -H, while docker-compose still support it
 			arg = "--help"
-		}
+		case "--version", "-v":
-		if arg == "--version" || arg == "-v" {
 			// redirect --version pseudo-command to actual command
 			arg = "version"
 		}
+
 		if contains(getBoolFlags(), arg) {
 			rootFlags = append(rootFlags, arg)
 			continue

cmd/compatibility/convert_test.go

@@ -43,11 +43,21 @@ func Test_convert(t *testing.T) {
 			args: []string{"--host", "tcp://1.2.3.4", "up"},
 			want: []string{"--host", "tcp://1.2.3.4", "compose", "up"},
 		},
+		{
+			name: "compose --verbose",
+			args: []string{"--verbose"},
+			want: []string{"--debug", "compose"},
+		},
 		{
 			name: "compose --version",
 			args: []string{"--version"},
 			want: []string{"compose", "version"},
 		},
+		{
+			name: "compose -v",
+			args: []string{"-v"},
+			want: []string{"compose", "version"},
+		},
 		{
 			name: "help",
 			args: []string{"-h"},