Browse Source

Add missing f shorthand for version command

Guillaume Tardif 5 years ago
parent
commit
d97f9d68fd
2 changed files with 6 additions and 1 deletions
  1. 1 1
      cli/cmd/version.go
  2. 5 0
      tests/e2e/e2e_test.go

+ 1 - 1
cli/cmd/version.go

@@ -38,7 +38,7 @@ func VersionCommand(version string) *cobra.Command {
 	}
 	// define flags for backward compatibility with com.docker.cli
 	flags := cmd.Flags()
-	flags.String("format", "", "Format the output using the given Go template")
+	flags.StringP("format", "f", "", "Format the output using the given Go template")
 	flags.String("kubeconfig", "", "Kubernetes config file")
 	mobyflags.AddMobyFlagsForRetrocompatibility(flags)
 

+ 5 - 0
tests/e2e/e2e_test.go

@@ -239,6 +239,11 @@ func (s *E2eSuite) TestDisplaysAdditionalLineInDockerVersion() {
 	Expect(output).To(ContainSubstring("Azure integration"))
 }
 
+func (s *E2eSuite) TestAllowsFormatFlagInVersion() {
+	s.NewDockerCommand("version", "-f", "{{ json . }}").ExecOrDie()
+	s.NewDockerCommand("version", "--format", "{{ json . }}").ExecOrDie()
+}
+
 func (s *E2eSuite) TestMockBackend() {
 	It("creates a new test context to hardcoded example backend", func() {
 		s.NewDockerCommand("context", "create", "example", "test-example").ExecOrDie()