From 73dcf50d5a53ba97312fdcf9df8638da6bee9bc8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 16 Jan 2020 12:47:12 +0100 Subject: [PATCH] cli/command: fix formatting of comments, and minor linting issues Comments should have a leading space unless the comment is for special purposes (go:generate, nolint:) Signed-off-by: Sebastiaan van Stijn --- cli/command/container/run.go | 2 +- cli/command/defaultcontextstore_test.go | 8 +++----- cli/command/image/build_buildkit.go | 2 +- cli/command/service/update.go | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cli/command/container/run.go b/cli/command/container/run.go index 1b0b76770c..dd10c3259f 100644 --- a/cli/command/container/run.go +++ b/cli/command/container/run.go @@ -164,7 +164,7 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio statusChan := waitExitOrRemoved(ctx, dockerCli, createResponse.ID, copts.autoRemove) - //start the container + // start the container if err := client.ContainerStart(ctx, createResponse.ID, types.ContainerStartOptions{}); err != nil { // If we have hijackedIOStreamer, we should notify // hijackedIOStreamer we are going to exit and wait diff --git a/cli/command/defaultcontextstore_test.go b/cli/command/defaultcontextstore_test.go index e1c7c1df9b..ccbe99e9b9 100644 --- a/cli/command/defaultcontextstore_test.go +++ b/cli/command/defaultcontextstore_test.go @@ -40,11 +40,9 @@ func testDefaultMetadata() store.Metadata { } func testStore(t *testing.T, meta store.Metadata, tls store.ContextTLSData) (store.Store, func()) { - //meta := testDefaultMetadata() testDir, err := ioutil.TempDir("", t.Name()) assert.NilError(t, err) - //defer os.RemoveAll(testDir) - store := &ContextStoreWithDefault{ + s := &ContextStoreWithDefault{ Store: store.New(testDir, testCfg), Resolver: func() (*DefaultContext, error) { return &DefaultContext{ @@ -53,8 +51,8 @@ func testStore(t *testing.T, meta store.Metadata, tls store.ContextTLSData) (sto }, nil }, } - return store, func() { - os.RemoveAll(testDir) + return s, func() { + _ = os.RemoveAll(testDir) } } diff --git a/cli/command/image/build_buildkit.go b/cli/command/image/build_buildkit.go index 5c2de4630b..d6054f356a 100644 --- a/cli/command/image/build_buildkit.go +++ b/cli/command/image/build_buildkit.go @@ -233,7 +233,7 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error { buildOptions := imageBuildOptions(dockerCli, options) buildOptions.Version = types.BuilderBuildKit buildOptions.Dockerfile = dockerfileName - //buildOptions.AuthConfigs = authConfigs // handled by session + // buildOptions.AuthConfigs = authConfigs // handled by session buildOptions.RemoteContext = remote buildOptions.SessionID = s.ID() buildOptions.BuildID = buildID diff --git a/cli/command/service/update.go b/cli/command/service/update.go index 6578047cbe..b71f59d83e 100644 --- a/cli/command/service/update.go +++ b/cli/command/service/update.go @@ -1036,7 +1036,7 @@ portLoop: if _, ok := portSet[portConfigToString(&port)]; ok { continue } - //portSet[portConfigToString(&port)] = port + // portSet[portConfigToString(&port)] = port newPorts = append(newPorts, port) } }