From 491407b541cf9d568aca435f7e39a53fa3107017 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 2 Sep 2022 22:45:05 +0200 Subject: [PATCH] linting: remove unused nolint comments (nolintlint) cli/context/store/tlsstore.go:46:88: directive `//nolint:unused` is unused for linter "unused" (nolintlint) func (s *tlsStore) remove(contextID contextdir, endpointName, filename string) error { //nolint:unused ^ cli-plugins/manager/plugin.go:37:1: directive `//nolint:gocyclo` is unused for linter "gocyclo" (nolintlint) //nolint:gocyclo ^ cli/command/image/formatter_history_test.go:189:2: directive `//nolint:lll` is unused for linter "lll" (nolintlint) //nolint:lll ^ cli/command/service/list.go:113:1: directive `//nolint:gocyclo` is unused for linter "gocyclo" (nolintlint) //nolint:gocyclo ^ cli/command/stack/swarm/deploy_composefile.go:178:1: directive `//nolint:gocyclo` is unused for linter "gocyclo" (nolintlint) //nolint:gocyclo ^ Signed-off-by: Sebastiaan van Stijn --- cli-plugins/manager/plugin.go | 2 -- cli/command/image/formatter_history_test.go | 6 +++--- cli/command/service/list.go | 2 -- cli/command/stack/swarm/deploy_composefile.go | 1 - cli/context/store/tlsstore.go | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cli-plugins/manager/plugin.go b/cli-plugins/manager/plugin.go index e501af7228..99db25d5c8 100644 --- a/cli-plugins/manager/plugin.go +++ b/cli-plugins/manager/plugin.go @@ -33,8 +33,6 @@ type Plugin struct { // is set, and is always a `pluginError`, but the `Plugin` is still // returned with no error. An error is only returned due to a // non-recoverable error. -// -//nolint:gocyclo func newPlugin(c Candidate, rootcmd *cobra.Command) (Plugin, error) { path := c.Path() if path == "" { diff --git a/cli/command/image/formatter_history_test.go b/cli/command/image/formatter_history_test.go index 2facc0c90f..4655b81671 100644 --- a/cli/command/image/formatter_history_test.go +++ b/cli/command/image/formatter_history_test.go @@ -186,14 +186,14 @@ func TestHistoryContext_Table(t *testing.T) { {ID: "imageID3", Created: unixTime, CreatedBy: "/bin/bash ls", Size: int64(182964289), Comment: "Hi", Tags: []string{"image:tag2"}}, {ID: "imageID4", Created: unixTime, CreatedBy: "/bin/bash grep", Size: int64(182964289), Comment: "Hi", Tags: []string{"image:tag2"}}, } - //nolint:lll - expectedNoTrunc := `IMAGE CREATED CREATED BY SIZE COMMENT + + const expectedNoTrunc = `IMAGE CREATED CREATED BY SIZE COMMENT imageID1 24 hours ago /bin/bash ls && npm i && npm run test && karma -c karma.conf.js start && npm start && more commands here && the list goes on 183MB Hi imageID2 24 hours ago /bin/bash echo 183MB Hi imageID3 24 hours ago /bin/bash ls 183MB Hi imageID4 24 hours ago /bin/bash grep 183MB Hi ` - expectedTrunc := `IMAGE CREATED CREATED BY SIZE COMMENT + const expectedTrunc = `IMAGE CREATED CREATED BY SIZE COMMENT imageID1 24 hours ago /bin/bash ls && npm i && npm run test && kar… 183MB Hi imageID2 24 hours ago /bin/bash echo 183MB Hi imageID3 24 hours ago /bin/bash ls 183MB Hi diff --git a/cli/command/service/list.go b/cli/command/service/list.go index efaa8a193b..3bca98b70e 100644 --- a/cli/command/service/list.go +++ b/cli/command/service/list.go @@ -109,8 +109,6 @@ func runList(dockerCli command.Cli, opts listOptions) error { // there may be other situations where the client uses the "default" version. // To take these situations into account, we do a quick check for services // that don't have ServiceStatus set, and perform a lookup for those. -// -//nolint:gocyclo func AppendServiceStatus(ctx context.Context, c client.APIClient, services []swarm.Service) ([]swarm.Service, error) { status := map[string]*swarm.ServiceStatus{} taskFilter := filters.NewArgs() diff --git a/cli/command/stack/swarm/deploy_composefile.go b/cli/command/stack/swarm/deploy_composefile.go index 8c77ca92f7..f317662430 100644 --- a/cli/command/stack/swarm/deploy_composefile.go +++ b/cli/command/stack/swarm/deploy_composefile.go @@ -175,7 +175,6 @@ func createNetworks(ctx context.Context, dockerCli command.Cli, namespace conver return nil } -//nolint:gocyclo func deployServices(ctx context.Context, dockerCli command.Cli, services map[string]swarm.ServiceSpec, namespace convert.Namespace, sendAuth bool, resolveImage string) error { apiClient := dockerCli.Client() out := dockerCli.Out() diff --git a/cli/context/store/tlsstore.go b/cli/context/store/tlsstore.go index 797fbaf51f..8267e87964 100644 --- a/cli/context/store/tlsstore.go +++ b/cli/context/store/tlsstore.go @@ -43,7 +43,7 @@ func (s *tlsStore) getData(contextID contextdir, endpointName, filename string) return data, nil } -func (s *tlsStore) remove(contextID contextdir, endpointName, filename string) error { //nolint:unused +func (s *tlsStore) remove(contextID contextdir, endpointName, filename string) error { err := os.Remove(s.filePath(contextID, endpointName, filename)) if os.IsNotExist(err) { return nil