Merge pull request #1884 from thaJeztah/dont_trim_version_prefix

Do not strip "v" prefix from version when printing

cli/cmd/version.go

@@ -57,17 +57,16 @@ func runVersion(cmd *cobra.Command) error {
 	var versionString string
 	var err error
 	format := strings.ToLower(strings.ReplaceAll(cmd.Flag(formatOpt).Value.String(), " ", ""))
-	displayedVersion := strings.TrimPrefix(internal.Version, "v")
 	// Replace is preferred in this case to keep the order.
 	switch format {
 	case formatter.PRETTY, "":
 		versionString, err = getOutFromMoby(cmd, fixedPrettyArgs(os.Args[1:])...)
 		versionString = strings.Replace(versionString,
-			"\n Version:", "\n Cloud integration: "+displayedVersion+"\n Version:", 1)
+			"\n Version:", "\n Cloud integration: "+internal.Version+"\n Version:", 1)
 	case formatter.JSON, formatter.TemplateLegacyJSON: // Try to catch full JSON formats
 		versionString, err = getOutFromMoby(cmd, fixedJSONArgs(os.Args[1:])...)
 		versionString = strings.Replace(versionString,
-			`"Version":`, fmt.Sprintf(`"CloudIntegration":%q,"Version":`, displayedVersion), 1)
+			`"Version":`, fmt.Sprintf(`"CloudIntegration":%q,"Version":`, internal.Version), 1)
 	default:
 		versionString, err = getOutFromMoby(cmd)
 	}

cmd/compose/version.go

@@ -18,7 +18,6 @@ package compose
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -52,14 +51,13 @@ func versionCommand() *cobra.Command {
 }
 
 func runVersion(opts versionOptions) {
-	displayedVersion := strings.TrimPrefix(internal.Version, "v")
 	if opts.short {
-		fmt.Println(displayedVersion)
+		fmt.Println(internal.Version)
 		return
 	}
 	if opts.format == formatter.JSON {
-		fmt.Printf(`{"version":"%s"}\n`, displayedVersion)
+		fmt.Printf(`{"version":%q}\n`, internal.Version)
 		return
 	}
-	fmt.Printf("Docker Compose version %s\n", displayedVersion)
+	fmt.Println("Docker Compose version", internal.Version)
 }

cmd/main.go

@@ -17,8 +17,6 @@
 package main
 
 import (
-	"strings"
-
 	dockercli "github.com/docker/cli/cli"
 	"github.com/docker/cli/cli-plugins/manager"
 	"github.com/docker/cli/cli-plugins/plugin"
@@ -58,6 +56,6 @@ func main() {
 		manager.Metadata{
 			SchemaVersion: "0.1.0",
 			Vendor:        "Docker Inc.",
-			Version:       strings.TrimPrefix(internal.Version, "v"),
+			Version:       internal.Version,
 		})
 }