From dcce853abcaee508299d197ca9032d67d01f1430 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Wed, 16 Nov 2016 22:17:40 -0800 Subject: [PATCH] Fix several issues with `go vet` and `go fmt` For some reason, `go vet` and `go fmt` validate does not capture several issues. The following was the output of `go vet`: ``` ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$' cli/command/formatter/container_test.go:393: possible formatting directive in Log call volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool ``` The following was the output of `go fmt -s`: ``` ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor cli/command/stack/list.go daemon/commit.go ``` Fixed above issues with `go vet` and `go fmt -s` Signed-off-by: Yong Tang Upstream-commit: ace786e9d517777473bd431e65d6c464d82e4f65 Component: engine --- components/engine/cli/command/formatter/container_test.go | 4 ++-- components/engine/cli/command/stack/list.go | 2 +- components/engine/daemon/commit.go | 4 ++-- components/engine/volume/volume_test.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/engine/cli/command/formatter/container_test.go b/components/engine/cli/command/formatter/container_test.go index cdfc911a94..16137897b9 100644 --- a/components/engine/cli/command/formatter/container_test.go +++ b/components/engine/cli/command/formatter/container_test.go @@ -372,7 +372,7 @@ func TestContainerContextWriteJSONField(t *testing.T) { } func TestContainerBackCompat(t *testing.T) { - containers := []types.Container{types.Container{ID: "brewhaha"}} + containers := []types.Container{{ID: "brewhaha"}} cases := []string{ "ID", "Names", @@ -390,7 +390,7 @@ func TestContainerBackCompat(t *testing.T) { for _, c := range cases { ctx := Context{Format: Format(fmt.Sprintf("{{ .%s }}", c)), Output: buf} if err := ContainerWrite(ctx, containers); err != nil { - t.Log("could not render template for field '%s': %v", c, err) + t.Logf("could not render template for field '%s': %v", c, err) t.Fail() } buf.Reset() diff --git a/components/engine/cli/command/stack/list.go b/components/engine/cli/command/stack/list.go index 7be42525dd..f655b929ad 100644 --- a/components/engine/cli/command/stack/list.go +++ b/components/engine/cli/command/stack/list.go @@ -72,7 +72,7 @@ func printTable(out io.Writer, stacks []*stack) { type stack struct { // Name is the name of the stack - Name string + Name string // Services is the number of the services Services int } diff --git a/components/engine/daemon/commit.go b/components/engine/daemon/commit.go index d0de6c0981..ae6f51be3c 100644 --- a/components/engine/daemon/commit.go +++ b/components/engine/daemon/commit.go @@ -240,8 +240,8 @@ func (daemon *Daemon) Commit(name string, c *backend.ContainerCommitConfig) (str } attributes := map[string]string{ - "comment": c.Comment, - "imageID": id.String(), + "comment": c.Comment, + "imageID": id.String(), "imageRef": imageRef, } daemon.LogContainerEventWithAttributes(container, "commit", attributes) diff --git a/components/engine/volume/volume_test.go b/components/engine/volume/volume_test.go index 25e384ac6c..54df38053f 100644 --- a/components/engine/volume/volume_test.go +++ b/components/engine/volume/volume_test.go @@ -254,7 +254,7 @@ func TestParseMountSpec(t *testing.T) { t.Fatalf("Expected mount source to match. Expected: '%s', Actual: '%s'", c.expected.Source, mp.Source) } if c.expected.RW != mp.RW { - t.Fatalf("Expected mount writable to match. Expected: '%v', Actual: '%s'", c.expected.RW, mp.RW) + t.Fatalf("Expected mount writable to match. Expected: '%v', Actual: '%v'", c.expected.RW, mp.RW) } if c.expected.Propagation != mp.Propagation { t.Fatalf("Expected mount propagation to match. Expected: '%v', Actual: '%s'", c.expected.Propagation, mp.Propagation)