diff --git a/cli-plugins/manager/plugin.go b/cli-plugins/manager/plugin.go
index 9663cf761c..341e92d7f0 100644
--- a/cli-plugins/manager/plugin.go
+++ b/cli-plugins/manager/plugin.go
@@ -10,9 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var (
-	pluginNameRe = regexp.MustCompile("^[a-z][a-z0-9]*$")
-)
+var pluginNameRe = regexp.MustCompile("^[a-z][a-z0-9]*$")
 
 // Plugin represents a potential plugin with all it's metadata.
 type Plugin struct {
diff --git a/cli-plugins/manager/suffix_unix.go b/cli-plugins/manager/suffix_unix.go
index afaf0007f5..8d5a5c3e72 100644
--- a/cli-plugins/manager/suffix_unix.go
+++ b/cli-plugins/manager/suffix_unix.go
@@ -6,6 +6,7 @@ package manager
 func trimExeSuffix(s string) (string, error) {
 	return s, nil
 }
+
 func addExeSuffix(s string) string {
 	return s
 }
diff --git a/cli/command/checkpoint/list.go b/cli/command/checkpoint/list.go
index 1c7b9fbac9..d4e7c46196 100644
--- a/cli/command/checkpoint/list.go
+++ b/cli/command/checkpoint/list.go
@@ -33,7 +33,6 @@ func newListCommand(dockerCli command.Cli) *cobra.Command {
 	flags.StringVarP(&opts.checkpointDir, "checkpoint-dir", "", "", "Use a custom checkpoint storage directory")
 
 	return cmd
-
 }
 
 func runList(dockerCli command.Cli, container string, opts listOptions) error {
diff --git a/cli/command/cli_test.go b/cli/command/cli_test.go
index 85a49aca17..c6d106f94e 100644
--- a/cli/command/cli_test.go
+++ b/cli/command/cli_test.go
@@ -120,7 +120,7 @@ func (c *fakeClient) NegotiateAPIVersionPing(types.Ping) {
 func TestInitializeFromClient(t *testing.T) {
 	defaultVersion := "v1.55"
 
-	var testcases = []struct {
+	testcases := []struct {
 		doc            string
 		pingFunc       func() (types.Ping, error)
 		expectedServer ServerInfo
@@ -222,7 +222,7 @@ func TestInitializeFromClientHangs(t *testing.T) {
 func TestExperimentalCLI(t *testing.T) {
 	defaultVersion := "v1.55"
 
-	var testcases = []struct {
+	testcases := []struct {
 		doc        string
 		configfile string
 	}{
diff --git a/cli/command/config/create_test.go b/cli/command/config/create_test.go
index e65d488ce6..0d1f345788 100644
--- a/cli/command/config/create_test.go
+++ b/cli/command/config/create_test.go
@@ -29,7 +29,8 @@ func TestConfigCreateErrors(t *testing.T) {
 			args:          []string{"too_few"},
 			expectedError: "requires exactly 2 arguments",
 		},
-		{args: []string{"too", "many", "arguments"},
+		{
+			args:          []string{"too", "many", "arguments"},
 			expectedError: "requires exactly 2 arguments",
 		},
 		{
diff --git a/cli/command/config/formatter_test.go b/cli/command/config/formatter_test.go
index c6ebcb4f25..73ab880577 100644
--- a/cli/command/config/formatter_test.go
+++ b/cli/command/config/formatter_test.go
@@ -26,29 +26,39 @@ func TestConfigContextFormatWrite(t *testing.T) {
 			`template parsing error: template: :1:2: executing "" at <nil>: nil is not a command`,
 		},
 		// Table format
-		{formatter.Context{Format: NewFormat("table", false)},
+		{
+			formatter.Context{Format: NewFormat("table", false)},
 			`ID        NAME        CREATED                  UPDATED
 1         passwords   Less than a second ago   Less than a second ago
 2         id_rsa      Less than a second ago   Less than a second ago
-`},
-		{formatter.Context{Format: NewFormat("table {{.Name}}", true)},
+`,
+		},
+		{
+			formatter.Context{Format: NewFormat("table {{.Name}}", true)},
 			`NAME
 passwords
 id_rsa
-`},
-		{formatter.Context{Format: NewFormat("{{.ID}}-{{.Name}}", false)},
+`,
+		},
+		{
+			formatter.Context{Format: NewFormat("{{.ID}}-{{.Name}}", false)},
 			`1-passwords
 2-id_rsa
-`},
+`,
+		},
 	}
 
 	configs := []swarm.Config{
-		{ID: "1",
+		{
+			ID:   "1",
 			Meta: swarm.Meta{CreatedAt: time.Now(), UpdatedAt: time.Now()},
-			Spec: swarm.ConfigSpec{Annotations: swarm.Annotations{Name: "passwords"}}},
-		{ID: "2",
+			Spec: swarm.ConfigSpec{Annotations: swarm.Annotations{Name: "passwords"}},
+		},
+		{
+			ID:   "2",
 			Meta: swarm.Meta{CreatedAt: time.Now(), UpdatedAt: time.Now()},
-			Spec: swarm.ConfigSpec{Annotations: swarm.Annotations{Name: "id_rsa"}}},
+			Spec: swarm.ConfigSpec{Annotations: swarm.Annotations{Name: "id_rsa"}},
+		},
 	}
 	for _, tc := range cases {
 		tc := tc
diff --git a/cli/command/config/inspect.go b/cli/command/config/inspect.go
index 956246eba2..64773419ad 100644
--- a/cli/command/config/inspect.go
+++ b/cli/command/config/inspect.go
@@ -68,5 +68,4 @@ func RunConfigInspect(dockerCli command.Cli, opts InspectOptions) error {
 		return cli.StatusError{StatusCode: 1, Status: err.Error()}
 	}
 	return nil
-
 }
diff --git a/cli/command/container/cp_test.go b/cli/command/container/cp_test.go
index 015fa40c1f..6c9581f8e2 100644
--- a/cli/command/container/cp_test.go
+++ b/cli/command/container/cp_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 func TestRunCopyWithInvalidArguments(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		doc         string
 		options     copyOptions
 		expectedErr string
@@ -143,7 +143,7 @@ func TestRunCopyToContainerSourceDoesNotExist(t *testing.T) {
 }
 
 func TestSplitCpArg(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		doc               string
 		path              string
 		os                string
diff --git a/cli/command/container/exec_test.go b/cli/command/container/exec_test.go
index d4cf9cd794..7b17d3ebf9 100644
--- a/cli/command/container/exec_test.go
+++ b/cli/command/container/exec_test.go
@@ -158,7 +158,7 @@ func TestParseExecNoSuchFile(t *testing.T) {
 }
 
 func TestRunExec(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		doc           string
 		options       ExecOptions
 		client        fakeClient
diff --git a/cli/command/container/formatter_diff.go b/cli/command/container/formatter_diff.go
index cf6a0b0b4a..15e3fc547c 100644
--- a/cli/command/container/formatter_diff.go
+++ b/cli/command/container/formatter_diff.go
@@ -24,7 +24,6 @@ func NewDiffFormat(source string) formatter.Format {
 
 // DiffFormatWrite writes formatted diff using the Context
 func DiffFormatWrite(ctx formatter.Context, changes []container.ContainerChangeResponseItem) error {
-
 	render := func(format func(subContext formatter.SubContext) error) error {
 		for _, change := range changes {
 			if err := format(&diffContext{c: change}); err != nil {
@@ -65,7 +64,6 @@ func (d *diffContext) Type() string {
 		kind = "D"
 	}
 	return kind
-
 }
 
 func (d *diffContext) Path() string {
diff --git a/cli/command/container/logs_test.go b/cli/command/container/logs_test.go
index 711e7bf7b6..14efb0341c 100644
--- a/cli/command/container/logs_test.go
+++ b/cli/command/container/logs_test.go
@@ -26,7 +26,7 @@ func TestRunLogs(t *testing.T) {
 		}, nil
 	}
 
-	var testcases = []struct {
+	testcases := []struct {
 		doc           string
 		options       *logsOptions
 		client        fakeClient
diff --git a/cli/command/container/opts.go b/cli/command/container/opts.go
index f00c9126d0..5e572cf8dd 100644
--- a/cli/command/container/opts.go
+++ b/cli/command/container/opts.go
@@ -27,9 +27,7 @@ import (
 	"github.com/spf13/pflag"
 )
 
-var (
-	deviceCgroupRuleRegexp = regexp.MustCompile(`^[acb] ([0-9]+|\*):([0-9]+|\*) [rwm]{1,3}$`)
-)
+var deviceCgroupRuleRegexp = regexp.MustCompile(`^[acb] ([0-9]+|\*):([0-9]+|\*) [rwm]{1,3}$`)
 
 // containerOptions is a data object with all the options for creating a container
 type containerOptions struct {
@@ -978,7 +976,7 @@ func validateDeviceCgroupRule(val string) (string, error) {
 // validDeviceMode checks if the mode for device is valid or not.
 // Valid mode is a composition of r (read), w (write), and m (mknod).
 func validDeviceMode(mode string) bool {
-	var legalDeviceMode = map[rune]bool{
+	legalDeviceMode := map[rune]bool{
 		'r': true,
 		'w': true,
 		'm': true,
diff --git a/cli/command/container/opts_test.go b/cli/command/container/opts_test.go
index 18a887bd43..7e78562a48 100644
--- a/cli/command/container/opts_test.go
+++ b/cli/command/container/opts_test.go
@@ -184,7 +184,6 @@ func TestParseRunWithInvalidArgs(t *testing.T) {
 
 //nolint:gocyclo
 func TestParseWithVolumes(t *testing.T) {
-
 	// A single volume
 	arr, tryit := setupPlatformVolume([]string{`/tmp`}, []string{`c:\tmp`})
 	if config, hostConfig := mustParse(t, tryit); hostConfig.Binds != nil {
@@ -252,7 +251,6 @@ func TestParseWithVolumes(t *testing.T) {
 			t.Fatalf("Error parsing %s. Should have a single bind mount and no volumes", arr[0])
 		}
 	}
-
 }
 
 // setupPlatformVolume takes two arrays of volume specs - a Unix style
@@ -453,7 +451,6 @@ func TestParseDevice(t *testing.T) {
 			t.Fatalf("Expected %v, got %v", deviceMapping, hostconfig.Devices)
 		}
 	}
-
 }
 
 func TestParseNetworkConfig(t *testing.T) {
@@ -956,7 +953,6 @@ func TestConvertToStandardNotation(t *testing.T) {
 
 	for key, ports := range valid {
 		convertedPorts, err := convertToStandardNotation(ports)
-
 		if err != nil {
 			assert.NilError(t, err)
 		}
diff --git a/cli/command/container/run.go b/cli/command/container/run.go
index 5efcf61ecd..037d580fba 100644
--- a/cli/command/container/run.go
+++ b/cli/command/container/run.go
@@ -174,7 +174,6 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio
 		}
 
 		close, err := attachContainer(ctx, dockerCli, &errCh, config, createResponse.ID)
-
 		if err != nil {
 			return err
 		}
diff --git a/cli/command/container/signals_test.go b/cli/command/container/signals_test.go
index 248d4b1480..325fb5d985 100644
--- a/cli/command/container/signals_test.go
+++ b/cli/command/container/signals_test.go
@@ -44,5 +44,4 @@ func TestForwardSignals(t *testing.T) {
 	case <-timer.C:
 		t.Fatal("timeout waiting for signal to be processed")
 	}
-
 }
diff --git a/cli/command/context/show_test.go b/cli/command/context/show_test.go
index a1ba6c62b8..08bedee69b 100644
--- a/cli/command/context/show_test.go
+++ b/cli/command/context/show_test.go
@@ -15,5 +15,4 @@ func TestShow(t *testing.T) {
 	cli.OutBuffer().Reset()
 	assert.NilError(t, runShow(cli))
 	golden.Assert(t, cli.OutBuffer().String(), "show.golden")
-
 }
diff --git a/cli/command/formatter/container_test.go b/cli/command/formatter/container_test.go
index bc59447708..c076d3e4b1 100644
--- a/cli/command/formatter/container_test.go
+++ b/cli/command/formatter/container_test.go
@@ -33,18 +33,20 @@ func TestContainerPsContext(t *testing.T) {
 		{types.Container{Image: "ubuntu"}, true, "ubuntu", ctx.Image},
 		{types.Container{Image: "verylongimagename"}, true, "verylongimagename", ctx.Image},
 		{types.Container{Image: "verylongimagename"}, false, "verylongimagename", ctx.Image},
-		{types.Container{
-			Image:   "a5a665ff33eced1e0803148700880edab4",
-			ImageID: "a5a665ff33eced1e0803148700880edab4269067ed77e27737a708d0d293fbf5",
-		},
+		{
+			types.Container{
+				Image:   "a5a665ff33eced1e0803148700880edab4",
+				ImageID: "a5a665ff33eced1e0803148700880edab4269067ed77e27737a708d0d293fbf5",
+			},
 			true,
 			"a5a665ff33ec",
 			ctx.Image,
 		},
-		{types.Container{
-			Image:   "a5a665ff33eced1e0803148700880edab4",
-			ImageID: "a5a665ff33eced1e0803148700880edab4269067ed77e27737a708d0d293fbf5",
-		},
+		{
+			types.Container{
+				Image:   "a5a665ff33eced1e0803148700880edab4",
+				ImageID: "a5a665ff33eced1e0803148700880edab4269067ed77e27737a708d0d293fbf5",
+			},
 			false,
 			"a5a665ff33eced1e0803148700880edab4",
 			ctx.Image,
@@ -446,7 +448,8 @@ func TestDisplayablePorts(t *testing.T) {
 					Type:        "tcp",
 				},
 			},
-			"9988/tcp"},
+			"9988/tcp",
+		},
 		{
 			[]types.Port{
 				{
diff --git a/cli/command/formatter/disk_usage.go b/cli/command/formatter/disk_usage.go
index cd8119076b..7a369f546b 100644
--- a/cli/command/formatter/disk_usage.go
+++ b/cli/command/formatter/disk_usage.go
@@ -289,7 +289,6 @@ func (c *diskUsageImagesContext) Active() string {
 
 func (c *diskUsageImagesContext) Size() string {
 	return units.HumanSize(float64(c.totalSize))
-
 }
 
 func (c *diskUsageImagesContext) Reclaimable() string {
@@ -391,7 +390,6 @@ func (c *diskUsageVolumesContext) TotalCount() string {
 }
 
 func (c *diskUsageVolumesContext) Active() string {
-
 	used := 0
 	for _, v := range c.volumes {
 		if v.UsageData.RefCount > 0 {
diff --git a/cli/command/formatter/disk_usage_test.go b/cli/command/formatter/disk_usage_test.go
index 7fff4b2147..6205873958 100644
--- a/cli/command/formatter/disk_usage_test.go
+++ b/cli/command/formatter/disk_usage_test.go
@@ -19,7 +19,8 @@ func TestDiskUsageContextFormatWrite(t *testing.T) {
 				Context: Context{
 					Format: NewDiskUsageFormat("table", false),
 				},
-				Verbose: false},
+				Verbose: false,
+			},
 			`TYPE            TOTAL     ACTIVE    SIZE      RECLAIMABLE
 Images          0         0         0B        0B
 Containers      0         0         0B        0B
diff --git a/cli/command/formatter/displayutils_test.go b/cli/command/formatter/displayutils_test.go
index d9ff43daa1..1dd3e75cb7 100644
--- a/cli/command/formatter/displayutils_test.go
+++ b/cli/command/formatter/displayutils_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestEllipsis(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		source   string
 		width    int
 		expected string
diff --git a/cli/command/formatter/image.go b/cli/command/formatter/image.go
index 384b35dc19..89553d1048 100644
--- a/cli/command/formatter/image.go
+++ b/cli/command/formatter/image.go
@@ -177,7 +177,6 @@ func imageFormatTaggedAndDigest(ctx ImageContext, image types.ImageSummary) []*i
 			}
 		} else {
 			addImage(repo, "<none>", "")
-
 		}
 	}
 	return images
diff --git a/cli/command/formatter/reflect_test.go b/cli/command/formatter/reflect_test.go
index 58bd7fe42b..c4e2383f03 100644
--- a/cli/command/formatter/reflect_test.go
+++ b/cli/command/formatter/reflect_test.go
@@ -5,8 +5,7 @@ import (
 	"testing"
 )
 
-type dummy struct {
-}
+type dummy struct{}
 
 func (d *dummy) Func1() string {
 	return "Func1"
diff --git a/cli/command/formatter/tabwriter/tabwriter.go b/cli/command/formatter/tabwriter/tabwriter.go
index 0fbaeb5010..b5f6793ac4 100644
--- a/cli/command/formatter/tabwriter/tabwriter.go
+++ b/cli/command/formatter/tabwriter/tabwriter.go
@@ -576,7 +576,6 @@ func (b *Writer) Write(buf []byte) (n int, err error) {
 					b.startEscape(ch)
 				}
 			}
-
 		} else {
 			// inside escape
 			if ch == b.endChar {
diff --git a/cli/command/idresolver/idresolver.go b/cli/command/idresolver/idresolver.go
index 3d1f71a099..4bc2e4acab 100644
--- a/cli/command/idresolver/idresolver.go
+++ b/cli/command/idresolver/idresolver.go
@@ -48,7 +48,6 @@ func (r *IDResolver) get(ctx context.Context, t interface{}, id string) (string,
 	default:
 		return "", errors.Errorf("unsupported type")
 	}
-
 }
 
 // Resolve will attempt to resolve an ID to a Name by querying the manager.
diff --git a/cli/command/image/build/context_test.go b/cli/command/image/build/context_test.go
index c55ffef34b..dac66a104d 100644
--- a/cli/command/image/build/context_test.go
+++ b/cli/command/image/build/context_test.go
@@ -119,7 +119,6 @@ func TestGetContextFromLocalDirWithCustomDockerfile(t *testing.T) {
 
 func TestGetContextFromReaderString(t *testing.T) {
 	tarArchive, relDockerfile, err := GetContextFromReader(io.NopCloser(strings.NewReader(dockerfileContents)), "")
-
 	if err != nil {
 		t.Fatalf("Error when executing GetContextFromReader: %s", err)
 	}
@@ -253,7 +252,7 @@ func chdir(t *testing.T, dir string) {
 }
 
 func TestIsArchive(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		doc      string
 		header   []byte
 		expected bool
@@ -285,7 +284,7 @@ func TestIsArchive(t *testing.T) {
 }
 
 func TestDetectArchiveReader(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		file     string
 		desc     string
 		expected bool
diff --git a/cli/command/image/build_test.go b/cli/command/image/build_test.go
index bb308869d2..1ff092cc06 100644
--- a/cli/command/image/build_test.go
+++ b/cli/command/image/build_test.go
@@ -82,7 +82,7 @@ func TestRunBuildResetsUidAndGidInContext(t *testing.T) {
 		{Name: "Dockerfile"},
 		{Name: "foo"},
 	}
-	var cmpTarHeaderNameAndOwner = cmp.Comparer(func(x, y tar.Header) bool {
+	cmpTarHeaderNameAndOwner := cmp.Comparer(func(x, y tar.Header) bool {
 		return x.Name == y.Name && x.Uid == y.Uid && x.Gid == y.Gid
 	})
 	assert.DeepEqual(t, expected, headers, cmpTarHeaderNameAndOwner)
diff --git a/cli/command/image/client_test.go b/cli/command/image/client_test.go
index a1b8cb08a2..afae0b735d 100644
--- a/cli/command/image/client_test.go
+++ b/cli/command/image/client_test.go
@@ -44,7 +44,8 @@ func (cli *fakeClient) ImageSave(_ context.Context, images []string) (io.ReadClo
 }
 
 func (cli *fakeClient) ImageRemove(_ context.Context, image string,
-	options types.ImageRemoveOptions) ([]types.ImageDeleteResponseItem, error) {
+	options types.ImageRemoveOptions,
+) ([]types.ImageDeleteResponseItem, error) {
 	if cli.imageRemoveFunc != nil {
 		return cli.imageRemoveFunc(image, options)
 	}
@@ -101,7 +102,8 @@ func (cli *fakeClient) ImageInspectWithRaw(_ context.Context, image string) (typ
 }
 
 func (cli *fakeClient) ImageImport(_ context.Context, source types.ImageImportSource, ref string,
-	options types.ImageImportOptions) (io.ReadCloser, error) {
+	options types.ImageImportOptions,
+) (io.ReadCloser, error) {
 	if cli.imageImportFunc != nil {
 		return cli.imageImportFunc(source, ref, options)
 	}
diff --git a/cli/command/image/formatter_history_test.go b/cli/command/image/formatter_history_test.go
index 3de08534dd..0a8e367a86 100644
--- a/cli/command/image/formatter_history_test.go
+++ b/cli/command/image/formatter_history_test.go
@@ -234,18 +234,20 @@ imageID6   17 years ago   /bin/bash echo                                  183MB
 		context  formatter.Context
 		expected string
 	}{
-		{formatter.Context{
-			Format: NewHistoryFormat("table", false, true),
-			Trunc:  true,
-			Output: out,
-		},
+		{
+			formatter.Context{
+				Format: NewHistoryFormat("table", false, true),
+				Trunc:  true,
+				Output: out,
+			},
 			expectedTrunc,
 		},
-		{formatter.Context{
-			Format: NewHistoryFormat("table", false, true),
-			Trunc:  false,
-			Output: out,
-		},
+		{
+			formatter.Context{
+				Format: NewHistoryFormat("table", false, true),
+				Trunc:  false,
+				Output: out,
+			},
 			expectedNoTrunc,
 		},
 	}
diff --git a/cli/command/image/load.go b/cli/command/image/load.go
index 41380164c5..517610ec09 100644
--- a/cli/command/image/load.go
+++ b/cli/command/image/load.go
@@ -44,7 +44,6 @@ func NewLoadCommand(dockerCli command.Cli) *cobra.Command {
 }
 
 func runLoad(dockerCli command.Cli, opts loadOptions) error {
-
 	var input io.Reader = dockerCli.In()
 	if opts.input != "" {
 		// We use sequential.Open to use sequential file access on Windows, avoiding
diff --git a/cli/command/image/remove.go b/cli/command/image/remove.go
index ab0882c640..e96195b6d0 100644
--- a/cli/command/image/remove.go
+++ b/cli/command/image/remove.go
@@ -59,7 +59,7 @@ func runRemove(dockerCli command.Cli, opts removeOptions, images []string) error
 	}
 
 	var errs []string
-	var fatalErr = false
+	fatalErr := false
 	for _, img := range images {
 		dels, err := client.ImageRemove(ctx, img, options)
 		if err != nil {
diff --git a/cli/command/image/trust.go b/cli/command/image/trust.go
index 8bbf28acb9..fad29def4c 100644
--- a/cli/command/image/trust.go
+++ b/cli/command/image/trust.go
@@ -312,7 +312,6 @@ func TrustedReference(ctx context.Context, cli command.Cli, ref reference.NamedT
 	r, err := convertTarget(t.Target)
 	if err != nil {
 		return nil, err
-
 	}
 	return reference.WithDigest(reference.TrimNamed(ref), r.digest)
 }
diff --git a/cli/command/manifest/push.go b/cli/command/manifest/push.go
index afd0e1fbbf..9ab2e246b6 100644
--- a/cli/command/manifest/push.go
+++ b/cli/command/manifest/push.go
@@ -63,7 +63,6 @@ func newPushListCommand(dockerCli command.Cli) *cobra.Command {
 }
 
 func runPush(dockerCli command.Cli, opts pushOpts) error {
-
 	targetRef, err := normalizeReference(opts.target)
 	if err != nil {
 		return err
diff --git a/cli/command/network/create.go b/cli/command/network/create.go
index 6b47bd3907..7e9662746b 100644
--- a/cli/command/network/create.go
+++ b/cli/command/network/create.go
@@ -229,9 +229,7 @@ func consolidateIpam(subnets, ranges, gateways []string, auxaddrs map[string]str
 }
 
 func subnetMatches(subnet, data string) (bool, error) {
-	var (
-		ip net.IP
-	)
+	var ip net.IP
 
 	_, s, err := net.ParseCIDR(subnet)
 	if err != nil {
diff --git a/cli/command/network/create_test.go b/cli/command/network/create_test.go
index ec96c58749..95938df15e 100644
--- a/cli/command/network/create_test.go
+++ b/cli/command/network/create_test.go
@@ -142,6 +142,7 @@ func TestNetworkCreateErrors(t *testing.T) {
 
 	}
 }
+
 func TestNetworkCreateWithFlags(t *testing.T) {
 	expectedDriver := "foo"
 	expectedOpts := []network.IPAMConfig{
diff --git a/cli/command/network/formatter_test.go b/cli/command/network/formatter_test.go
index 3cadbecbcf..b7807cd536 100644
--- a/cli/command/network/formatter_test.go
+++ b/cli/command/network/formatter_test.go
@@ -75,7 +75,6 @@ func TestNetworkContextWrite(t *testing.T) {
 		context  formatter.Context
 		expected string
 	}{
-
 		// Errors
 		{
 			formatter.Context{Format: "{{InvalidFunction}}"},
diff --git a/cli/command/network/list_test.go b/cli/command/network/list_test.go
index 99bd8508b9..b32c08f85b 100644
--- a/cli/command/network/list_test.go
+++ b/cli/command/network/list_test.go
@@ -75,7 +75,8 @@ func TestNetworkList(t *testing.T) {
 				return []types.NetworkResource{
 					*NetworkResource(NetworkResourceName("network-2-foo")),
 					*NetworkResource(NetworkResourceName("network-1-foo")),
-					*NetworkResource(NetworkResourceName("network-10-foo"))}, nil
+					*NetworkResource(NetworkResourceName("network-10-foo")),
+				}, nil
 			},
 		},
 	}
diff --git a/cli/command/node/formatter_test.go b/cli/command/node/formatter_test.go
index 442359f671..afa44981ae 100644
--- a/cli/command/node/formatter_test.go
+++ b/cli/command/node/formatter_test.go
@@ -59,7 +59,6 @@ func TestNodeContextWrite(t *testing.T) {
 		expected    string
 		clusterInfo swarm.ClusterInfo
 	}{
-
 		// Errors
 		{
 			context:     formatter.Context{Format: "{{InvalidFunction}}"},
diff --git a/cli/command/node/update.go b/cli/command/node/update.go
index dbae49c6f0..38b3a462d5 100644
--- a/cli/command/node/update.go
+++ b/cli/command/node/update.go
@@ -13,9 +13,7 @@ import (
 	"github.com/spf13/pflag"
 )
 
-var (
-	errNoRoleChange = errors.New("role was already set to the requested value")
-)
+var errNoRoleChange = errors.New("role was already set to the requested value")
 
 func newUpdateCommand(dockerCli command.Cli) *cobra.Command {
 	options := newNodeOptions()
diff --git a/cli/command/plugin/formatter_test.go b/cli/command/plugin/formatter_test.go
index b2e991287d..a5e1a4b1f7 100644
--- a/cli/command/plugin/formatter_test.go
+++ b/cli/command/plugin/formatter_test.go
@@ -55,7 +55,6 @@ func TestPluginContextWrite(t *testing.T) {
 		context  formatter.Context
 		expected string
 	}{
-
 		// Errors
 		{
 			formatter.Context{Format: "{{InvalidFunction}}"},
diff --git a/cli/command/plugin/install_test.go b/cli/command/plugin/install_test.go
index f1a4ff975b..e49b582f83 100644
--- a/cli/command/plugin/install_test.go
+++ b/cli/command/plugin/install_test.go
@@ -93,7 +93,6 @@ func TestInstallContentTrustErrors(t *testing.T) {
 		cli := test.NewFakeCli(&fakeClient{
 			pluginInstallFunc: func(name string, options types.PluginInstallOptions) (io.ReadCloser, error) {
 				return nil, fmt.Errorf("should not try to install plugin")
-
 			},
 		}, test.EnableContentTrust)
 		cli.SetNotaryClient(tc.notaryFunc)
diff --git a/cli/command/plugin/remove_test.go b/cli/command/plugin/remove_test.go
index 1b811f0c70..36cfe0ba45 100644
--- a/cli/command/plugin/remove_test.go
+++ b/cli/command/plugin/remove_test.go
@@ -12,7 +12,6 @@ import (
 )
 
 func TestRemoveErrors(t *testing.T) {
-
 	testCases := []struct {
 		args             []string
 		pluginRemoveFunc func(name string, options types.PluginRemoveOptions) error
diff --git a/cli/command/registry.go b/cli/command/registry.go
index e3f98faf5c..94b0c4171a 100644
--- a/cli/command/registry.go
+++ b/cli/command/registry.go
@@ -74,7 +74,7 @@ func GetDefaultAuthConfig(cli Cli, checkCredStore bool, serverAddress string, is
 	if !isDefaultRegistry {
 		serverAddress = registry.ConvertToHostname(serverAddress)
 	}
-	var authconfig = configtypes.AuthConfig{}
+	authconfig := configtypes.AuthConfig{}
 	var err error
 	if checkCredStore {
 		authconfig, err = cli.ConfigFile().GetAuthConfig(serverAddress)
diff --git a/cli/command/registry/formatter_search_test.go b/cli/command/registry/formatter_search_test.go
index 8c72408cf3..bb53e5dbfb 100644
--- a/cli/command/registry/formatter_search_test.go
+++ b/cli/command/registry/formatter_search_test.go
@@ -108,7 +108,6 @@ func TestSearchContextWrite(t *testing.T) {
 		context  formatter.Context
 		expected string
 	}{
-
 		// Errors
 		{
 			formatter.Context{Format: "{{InvalidFunction}}"},
diff --git a/cli/command/registry/login_test.go b/cli/command/registry/login_test.go
index 480faeef38..2f5bc94a88 100644
--- a/cli/command/registry/login_test.go
+++ b/cli/command/registry/login_test.go
@@ -16,15 +16,19 @@ import (
 	"gotest.tools/v3/fs"
 )
 
-const userErr = "userunknownError"
-const testAuthErrMsg = "UNKNOWN_ERR"
+const (
+	userErr        = "userunknownError"
+	testAuthErrMsg = "UNKNOWN_ERR"
+)
 
 var testAuthErrors = map[string]error{
 	userErr: fmt.Errorf(testAuthErrMsg),
 }
 
-var expiredPassword = "I_M_EXPIRED"
-var useToken = "I_M_TOKEN"
+var (
+	expiredPassword = "I_M_EXPIRED"
+	useToken        = "I_M_TOKEN"
+)
 
 type fakeClient struct {
 	client.Client
diff --git a/cli/command/secret/create_test.go b/cli/command/secret/create_test.go
index 5ca892877a..2dd65edace 100644
--- a/cli/command/secret/create_test.go
+++ b/cli/command/secret/create_test.go
@@ -24,10 +24,12 @@ func TestSecretCreateErrors(t *testing.T) {
 		secretCreateFunc func(swarm.SecretSpec) (types.SecretCreateResponse, error)
 		expectedError    string
 	}{
-		{args: []string{"too", "many", "arguments"},
+		{
+			args:          []string{"too", "many", "arguments"},
 			expectedError: "requires at least 1 and at most 2 arguments",
 		},
-		{args: []string{"create", "--driver", "driver", "-"},
+		{
+			args:          []string{"create", "--driver", "driver", "-"},
 			expectedError: "secret data must be empty",
 		},
 		{
diff --git a/cli/command/secret/formatter_test.go b/cli/command/secret/formatter_test.go
index e87d013e1b..3aec4c801c 100644
--- a/cli/command/secret/formatter_test.go
+++ b/cli/command/secret/formatter_test.go
@@ -26,29 +26,39 @@ func TestSecretContextFormatWrite(t *testing.T) {
 			`template parsing error: template: :1:2: executing "" at <nil>: nil is not a command`,
 		},
 		// Table format
-		{formatter.Context{Format: NewFormat("table", false)},
+		{
+			formatter.Context{Format: NewFormat("table", false)},
 			`ID        NAME        DRIVER    CREATED                  UPDATED
 1         passwords             Less than a second ago   Less than a second ago
 2         id_rsa                Less than a second ago   Less than a second ago
-`},
-		{formatter.Context{Format: NewFormat("table {{.Name}}", true)},
+`,
+		},
+		{
+			formatter.Context{Format: NewFormat("table {{.Name}}", true)},
 			`NAME
 passwords
 id_rsa
-`},
-		{formatter.Context{Format: NewFormat("{{.ID}}-{{.Name}}", false)},
+`,
+		},
+		{
+			formatter.Context{Format: NewFormat("{{.ID}}-{{.Name}}", false)},
 			`1-passwords
 2-id_rsa
-`},
+`,
+		},
 	}
 
 	secrets := []swarm.Secret{
-		{ID: "1",
+		{
+			ID:   "1",
 			Meta: swarm.Meta{CreatedAt: time.Now(), UpdatedAt: time.Now()},
-			Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "passwords"}}},
-		{ID: "2",
+			Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "passwords"}},
+		},
+		{
+			ID:   "2",
 			Meta: swarm.Meta{CreatedAt: time.Now(), UpdatedAt: time.Now()},
-			Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "id_rsa"}}},
+			Spec: swarm.SecretSpec{Annotations: swarm.Annotations{Name: "id_rsa"}},
+		},
 	}
 	for _, tc := range cases {
 		tc := tc
diff --git a/cli/command/service/formatter.go b/cli/command/service/formatter.go
index 5e99acc845..a5e91d2c59 100644
--- a/cli/command/service/formatter.go
+++ b/cli/command/service/formatter.go
@@ -273,6 +273,7 @@ func (ctx *serviceInspectContext) HasLogDriver() bool {
 func (ctx *serviceInspectContext) HasLogDriverName() bool {
 	return ctx.Service.Spec.TaskTemplate.LogDriver.Name != ""
 }
+
 func (ctx *serviceInspectContext) LogDriverName() string {
 	return ctx.Service.Spec.TaskTemplate.LogDriver.Name
 }
diff --git a/cli/command/service/formatter_test.go b/cli/command/service/formatter_test.go
index c15c9e4d96..574f57e30d 100644
--- a/cli/command/service/formatter_test.go
+++ b/cli/command/service/formatter_test.go
@@ -301,6 +301,7 @@ func TestServiceContextWriteJSON(t *testing.T) {
 		assert.Check(t, is.DeepEqual(expectedJSONs[i], m), msg)
 	}
 }
+
 func TestServiceContextWriteJSONField(t *testing.T) {
 	services := []swarm.Service{
 		{
diff --git a/cli/command/service/opts_test.go b/cli/command/service/opts_test.go
index 7d014a02e6..a51029e1f8 100644
--- a/cli/command/service/opts_test.go
+++ b/cli/command/service/opts_test.go
@@ -180,7 +180,6 @@ func TestResourceOptionsToResourceRequirements(t *testing.T) {
 		assert.NilError(t, err)
 		assert.Check(t, is.Len(r.Reservations.GenericResources, len(opt.resGenericResources)))
 	}
-
 }
 
 func TestToServiceNetwork(t *testing.T) {
diff --git a/cli/command/service/progress/progress_test.go b/cli/command/service/progress/progress_test.go
index 0ff83d2787..64cbde99cb 100644
--- a/cli/command/service/progress/progress_test.go
+++ b/cli/command/service/progress/progress_test.go
@@ -91,7 +91,8 @@ func TestReplicatedProgressUpdaterOneReplica(t *testing.T) {
 
 	// Task with DesiredState beyond Running is ignored
 	tasks = append(tasks,
-		swarm.Task{ID: "1",
+		swarm.Task{
+			ID:           "1",
 			NodeID:       "a",
 			DesiredState: swarm.TaskStateShutdown,
 			Status:       swarm.TaskStatus{State: swarm.TaskStateNew},
@@ -140,7 +141,8 @@ func TestReplicatedProgressUpdaterOneReplica(t *testing.T) {
 	// replacement task, not the old task.
 	tasks[0].DesiredState = swarm.TaskStateShutdown
 	tasks = append(tasks,
-		swarm.Task{ID: "2",
+		swarm.Task{
+			ID:           "2",
 			NodeID:       "b",
 			DesiredState: swarm.TaskStateRunning,
 			Status:       swarm.TaskStatus{State: swarm.TaskStateRunning},
@@ -154,7 +156,8 @@ func TestReplicatedProgressUpdaterOneReplica(t *testing.T) {
 	// Add a new task while the current one is still running, to simulate
 	// "start-then-stop" updates.
 	tasks = append(tasks,
-		swarm.Task{ID: "3",
+		swarm.Task{
+			ID:           "3",
 			NodeID:       "b",
 			DesiredState: swarm.TaskStateRunning,
 			Status:       swarm.TaskStatus{State: swarm.TaskStatePreparing},
@@ -254,7 +257,8 @@ func TestGlobalProgressUpdaterOneNode(t *testing.T) {
 
 	// Task with DesiredState beyond Running is ignored
 	tasks = append(tasks,
-		swarm.Task{ID: "1",
+		swarm.Task{
+			ID:           "1",
 			NodeID:       "a",
 			DesiredState: swarm.TaskStateShutdown,
 			Status:       swarm.TaskStatus{State: swarm.TaskStateNew},
@@ -304,7 +308,8 @@ func TestGlobalProgressUpdaterOneNode(t *testing.T) {
 	// replacement task, not the old task.
 	tasks[0].DesiredState = swarm.TaskStateShutdown
 	tasks = append(tasks,
-		swarm.Task{ID: "2",
+		swarm.Task{
+			ID:           "2",
 			NodeID:       "a",
 			DesiredState: swarm.TaskStateRunning,
 			Status:       swarm.TaskStatus{State: swarm.TaskStateRunning},
@@ -318,7 +323,8 @@ func TestGlobalProgressUpdaterOneNode(t *testing.T) {
 	// Add a new task while the current one is still running, to simulate
 	// "start-then-stop" updates.
 	tasks = append(tasks,
-		swarm.Task{ID: "3",
+		swarm.Task{
+			ID:           "3",
 			NodeID:       "a",
 			DesiredState: swarm.TaskStateRunning,
 			Status:       swarm.TaskStatus{State: swarm.TaskStatePreparing},
diff --git a/cli/command/service/remove.go b/cli/command/service/remove.go
index bdf1a593a8..c1b5863fed 100644
--- a/cli/command/service/remove.go
+++ b/cli/command/service/remove.go
@@ -12,7 +12,6 @@ import (
 )
 
 func newRemoveCommand(dockerCli command.Cli) *cobra.Command {
-
 	cmd := &cobra.Command{
 		Use:     "rm SERVICE [SERVICE...]",
 		Aliases: []string{"remove"},
diff --git a/cli/command/service/update.go b/cli/command/service/update.go
index aa59cb7d7e..ff6f2fcf95 100644
--- a/cli/command/service/update.go
+++ b/cli/command/service/update.go
@@ -999,7 +999,6 @@ func updateDNSConfig(flags *pflag.FlagSet, config **swarm.DNSConfig) error {
 	for _, nameserver := range nameservers {
 		if _, exists := toRemove[nameserver]; !exists {
 			newConfig.Nameservers = append(newConfig.Nameservers, nameserver)
-
 		}
 	}
 	// Sort so that result is predictable.
diff --git a/cli/command/service/update_test.go b/cli/command/service/update_test.go
index 117c2d80cc..2ddf8e8d62 100644
--- a/cli/command/service/update_test.go
+++ b/cli/command/service/update_test.go
@@ -507,15 +507,19 @@ type secretAPIClientMock struct {
 func (s secretAPIClientMock) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) {
 	return s.listResult, nil
 }
+
 func (s secretAPIClientMock) SecretCreate(ctx context.Context, secret swarm.SecretSpec) (types.SecretCreateResponse, error) {
 	return types.SecretCreateResponse{}, nil
 }
+
 func (s secretAPIClientMock) SecretRemove(ctx context.Context, id string) error {
 	return nil
 }
+
 func (s secretAPIClientMock) SecretInspectWithRaw(ctx context.Context, name string) (swarm.Secret, []byte, error) {
 	return swarm.Secret{}, []byte{}, nil
 }
+
 func (s secretAPIClientMock) SecretUpdate(ctx context.Context, id string, version swarm.Version, secret swarm.SecretSpec) error {
 	return nil
 }
diff --git a/cli/command/stack/config_test.go b/cli/command/stack/config_test.go
index 80b121f5a9..1fa2f04510 100644
--- a/cli/command/stack/config_test.go
+++ b/cli/command/stack/config_test.go
@@ -75,7 +75,6 @@ services:
 }
 
 func TestConfigMergeInterpolation(t *testing.T) {
-
 	for _, tt := range configMergeTests {
 		t.Run(tt.name, func(t *testing.T) {
 			firstConfig := []byte(tt.first)
@@ -102,5 +101,4 @@ func TestConfigMergeInterpolation(t *testing.T) {
 			assert.Equal(t, cfg, tt.merged)
 		})
 	}
-
 }
diff --git a/cli/command/stack/ps_test.go b/cli/command/stack/ps_test.go
index 8d44dbdb00..674ab9018d 100644
--- a/cli/command/stack/ps_test.go
+++ b/cli/command/stack/ps_test.go
@@ -22,7 +22,6 @@ func TestStackPsErrors(t *testing.T) {
 		taskListFunc  func(options types.TaskListOptions) ([]swarm.Task, error)
 		expectedError string
 	}{
-
 		{
 			args:          []string{},
 			expectedError: "requires exactly 1 argument",
diff --git a/cli/command/stack/remove_test.go b/cli/command/stack/remove_test.go
index 7b56ccc6b3..0c4bd2a8e3 100644
--- a/cli/command/stack/remove_test.go
+++ b/cli/command/stack/remove_test.go
@@ -110,7 +110,8 @@ func TestRemoveStackSkipEmpty(t *testing.T) {
 	cmd.SetArgs([]string{"foo", "bar"})
 
 	assert.NilError(t, cmd.Execute())
-	expectedList := []string{"Removing service bar_service1",
+	expectedList := []string{
+		"Removing service bar_service1",
 		"Removing service bar_service2",
 		"Removing secret bar_secret1",
 		"Removing config bar_config1",
diff --git a/cli/command/stack/swarm/deploy_composefile_test.go b/cli/command/stack/swarm/deploy_composefile_test.go
index ffe0f81f8a..86a5e09abd 100644
--- a/cli/command/stack/swarm/deploy_composefile_test.go
+++ b/cli/command/stack/swarm/deploy_composefile_test.go
@@ -19,7 +19,7 @@ func (n notFound) NotFound() bool {
 }
 
 func TestValidateExternalNetworks(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		inspectResponse types.NetworkResource
 		inspectError    error
 		expectedMsg     string
diff --git a/cli/command/stack/swarm/deploy_test.go b/cli/command/stack/swarm/deploy_test.go
index f5a44dcbf5..cf0bcba651 100644
--- a/cli/command/stack/swarm/deploy_test.go
+++ b/cli/command/stack/swarm/deploy_test.go
@@ -63,7 +63,7 @@ func TestServiceUpdateResolveImageChanged(t *testing.T) {
 		},
 	})
 
-	var testcases = []struct {
+	testcases := []struct {
 		image                 string
 		expectedQueryRegistry bool
 		expectedImage         string
diff --git a/cli/command/swarm/ca_test.go b/cli/command/swarm/ca_test.go
index 2758bfb121..29d2cd359a 100644
--- a/cli/command/swarm/ca_test.go
+++ b/cli/command/swarm/ca_test.go
@@ -216,7 +216,8 @@ func TestUpdateSwarmSpecCertAndKey(t *testing.T) {
 		"--detach",
 		"--ca-cert=" + certfile,
 		"--ca-key=" + keyfile,
-		"--cert-expiry=3m"})
+		"--cert-expiry=3m",
+	})
 	cmd.SetOut(cli.OutBuffer())
 	assert.NilError(t, cmd.Execute())
 
@@ -242,7 +243,8 @@ func TestUpdateSwarmSpecCertAndExternalCA(t *testing.T) {
 		"--rotate",
 		"--detach",
 		"--ca-cert=" + certfile,
-		"--external-ca=protocol=cfssl,url=https://some.external.ca.example.com"})
+		"--external-ca=protocol=cfssl,url=https://some.external.ca.example.com",
+	})
 	cmd.SetOut(cli.OutBuffer())
 	assert.NilError(t, cmd.Execute())
 
@@ -280,7 +282,8 @@ func TestUpdateSwarmSpecCertAndKeyAndExternalCA(t *testing.T) {
 		"--detach",
 		"--ca-cert=" + certfile,
 		"--ca-key=" + keyfile,
-		"--external-ca=protocol=cfssl,url=https://some.external.ca.example.com"})
+		"--external-ca=protocol=cfssl,url=https://some.external.ca.example.com",
+	})
 	cmd.SetOut(cli.OutBuffer())
 	assert.NilError(t, cmd.Execute())
 
diff --git a/cli/command/swarm/ipnet_slice.go b/cli/command/swarm/ipnet_slice.go
index 963966688a..537064f4a7 100644
--- a/cli/command/swarm/ipnet_slice.go
+++ b/cli/command/swarm/ipnet_slice.go
@@ -25,7 +25,6 @@ func newIPNetSliceValue(val []net.IPNet, p *[]net.IPNet) *ipNetSliceValue {
 // Set converts, and assigns, the comma-separated IPNet argument string representation as the []net.IPNet value of this flag.
 // If Set is called on a flag that already has a []net.IPNet assigned, the newly converted values will be appended.
 func (s *ipNetSliceValue) Set(val string) error {
-
 	// remove all quote characters
 	rmQuote := strings.NewReplacer(`"`, "", `'`, "", "`", "")
 
@@ -63,7 +62,6 @@ func (s *ipNetSliceValue) Type() string {
 
 // String defines a "native" format for this net.IPNet slice flag value.
 func (s *ipNetSliceValue) String() string {
-
 	ipNetStrSlice := make([]string, len(*s.value))
 	for i, n := range *s.value {
 		ipNetStrSlice[i] = n.String()
diff --git a/cli/command/swarm/ipnet_slice_test.go b/cli/command/swarm/ipnet_slice_test.go
index c57fcd016c..36275b9891 100644
--- a/cli/command/swarm/ipnet_slice_test.go
+++ b/cli/command/swarm/ipnet_slice_test.go
@@ -69,7 +69,6 @@ func TestIPNetCalledTwice(t *testing.T) {
 }
 
 func TestIPNetBadQuoting(t *testing.T) {
-
 	tests := []struct {
 		Want    []net.IPNet
 		FlagArg []string
@@ -126,7 +125,8 @@ func TestIPNetBadQuoting(t *testing.T) {
 			},
 			FlagArg: []string{
 				`"2e5e:66b2:6441:848:5b74:76ea:574c:3a7b/128,        2e5e:66b2:6441:848:5b74:76ea:574c:3a7b/128,2e5e:66b2:6441:848:5b74:76ea:574c:3a7b/128     "`,
-				" 2e5e:66b2:6441:848:5b74:76ea:574c:3a7b/128"},
+				" 2e5e:66b2:6441:848:5b74:76ea:574c:3a7b/128",
+			},
 		},
 	}
 
diff --git a/cli/command/system/events.go b/cli/command/system/events.go
index 1a29ee9a84..ddac0fa0a0 100644
--- a/cli/command/system/events.go
+++ b/cli/command/system/events.go
@@ -57,7 +57,8 @@ func runEvents(dockerCli command.Cli, options *eventsOptions) error {
 	if err != nil {
 		return cli.StatusError{
 			StatusCode: 64,
-			Status:     "Error parsing format: " + err.Error()}
+			Status:     "Error parsing format: " + err.Error(),
+		}
 	}
 	eventOptions := types.EventsOptions{
 		Since:   options.since,
diff --git a/cli/command/system/info.go b/cli/command/system/info.go
index 17a61dbdcc..4bd3e03565 100644
--- a/cli/command/system/info.go
+++ b/cli/command/system/info.go
@@ -514,8 +514,10 @@ func formatInfo(dockerCli command.Cli, info info, format string) error {
 
 	tmpl, err := templates.Parse(format)
 	if err != nil {
-		return cli.StatusError{StatusCode: 64,
-			Status: "template parsing error: " + err.Error()}
+		return cli.StatusError{
+			StatusCode: 64,
+			Status:     "template parsing error: " + err.Error(),
+		}
 	}
 	err = tmpl.Execute(dockerCli.Out(), info)
 	dockerCli.Out().Write([]byte{'\n'})
diff --git a/cli/command/system/info_test.go b/cli/command/system/info_test.go
index 080c0a2f18..199c93721d 100644
--- a/cli/command/system/info_test.go
+++ b/cli/command/system/info_test.go
@@ -315,7 +315,6 @@ func TestPrettyPrintInfo(t *testing.T) {
 			prettyGolden: "docker-info-with-labels-empty",
 		},
 		{
-
 			doc: "info with swarm",
 			dockerInfo: info{
 				Info: &infoWithSwarm,
diff --git a/cli/command/system/inspect.go b/cli/command/system/inspect.go
index e15d86a66d..bccc7dde44 100644
--- a/cli/command/system/inspect.go
+++ b/cli/command/system/inspect.go
@@ -111,7 +111,7 @@ func inspectSecret(ctx context.Context, dockerCli command.Cli) inspect.GetRefFun
 }
 
 func inspectAll(ctx context.Context, dockerCli command.Cli, getSize bool, typeConstraint string) inspect.GetRefFunc {
-	var inspectAutodetect = []struct {
+	inspectAutodetect := []struct {
 		objectType      string
 		isSizeSupported bool
 		isSwarmObject   bool
diff --git a/cli/command/trust/common_test.go b/cli/command/trust/common_test.go
index 502900187f..11a0bc86c3 100644
--- a/cli/command/trust/common_test.go
+++ b/cli/command/trust/common_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestMatchReleasedSignaturesSortOrder(t *testing.T) {
-	var releasesRole = data.DelegationRole{BaseRole: data.BaseRole{Name: trust.ReleasesRole}}
+	releasesRole := data.DelegationRole{BaseRole: data.BaseRole{Name: trust.ReleasesRole}}
 	targets := []client.TargetSignedStruct{
 		{Target: client.Target{Name: "target10-foo"}, Role: releasesRole},
 		{Target: client.Target{Name: "target1-foo"}, Role: releasesRole},
diff --git a/cli/command/trust/formatter_test.go b/cli/command/trust/formatter_test.go
index c8a507cf9f..2b3af092ca 100644
--- a/cli/command/trust/formatter_test.go
+++ b/cli/command/trust/formatter_test.go
@@ -23,7 +23,8 @@ func TestTrustTag(t *testing.T) {
 	}{
 		{
 			trustTagContext{
-				s: SignedTagInfo{Name: trustedTag,
+				s: SignedTagInfo{
+					Name:    trustedTag,
 					Digest:  digest,
 					Signers: nil,
 				},
@@ -33,7 +34,8 @@ func TestTrustTag(t *testing.T) {
 		},
 		{
 			trustTagContext{
-				s: SignedTagInfo{Name: trustedTag,
+				s: SignedTagInfo{
+					Name:    trustedTag,
 					Digest:  digest,
 					Signers: nil,
 				},
@@ -44,7 +46,8 @@ func TestTrustTag(t *testing.T) {
 		// Empty signers makes a row with empty string
 		{
 			trustTagContext{
-				s: SignedTagInfo{Name: trustedTag,
+				s: SignedTagInfo{
+					Name:    trustedTag,
 					Digest:  digest,
 					Signers: nil,
 				},
@@ -54,7 +57,8 @@ func TestTrustTag(t *testing.T) {
 		},
 		{
 			trustTagContext{
-				s: SignedTagInfo{Name: trustedTag,
+				s: SignedTagInfo{
+					Name:    trustedTag,
 					Digest:  digest,
 					Signers: []string{"alice", "bob", "claire"},
 				},
@@ -65,7 +69,8 @@ func TestTrustTag(t *testing.T) {
 		// alphabetic signing on Signers
 		{
 			trustTagContext{
-				s: SignedTagInfo{Name: trustedTag,
+				s: SignedTagInfo{
+					Name:    trustedTag,
 					Digest:  digest,
 					Signers: []string{"claire", "bob", "alice"},
 				},
@@ -85,7 +90,6 @@ func TestTrustTag(t *testing.T) {
 }
 
 func TestTrustTagContextWrite(t *testing.T) {
-
 	cases := []struct {
 		context  formatter.Context
 		expected string
@@ -140,7 +144,6 @@ tag3         bbbbbbbb
 // With no trust data, the TagWrite will print an empty table:
 // it's up to the caller to decide whether or not to print this versus an error
 func TestTrustTagContextEmptyWrite(t *testing.T) {
-
 	emptyCase := struct {
 		context  formatter.Context
 		expected string
diff --git a/cli/command/trust/helpers.go b/cli/command/trust/helpers.go
index b2819d2eda..3d2ba4acc3 100644
--- a/cli/command/trust/helpers.go
+++ b/cli/command/trust/helpers.go
@@ -8,8 +8,10 @@ import (
 	"github.com/theupdateframework/notary/tuf/data"
 )
 
-const releasedRoleName = "Repo Admin"
-const releasesRoleTUFName = "targets/releases"
+const (
+	releasedRoleName    = "Repo Admin"
+	releasesRoleTUFName = "targets/releases"
+)
 
 // isReleasedTarget checks if a role name is "released":
 // either targets/releases or targets TUF roles
diff --git a/cli/command/trust/revoke_test.go b/cli/command/trust/revoke_test.go
index 6fd83a8ba9..ca20189adb 100644
--- a/cli/command/trust/revoke_test.go
+++ b/cli/command/trust/revoke_test.go
@@ -139,7 +139,6 @@ func TestTrustRevokeCommand(t *testing.T) {
 			assert.Check(t, is.Contains(cli.OutBuffer().String(), tc.expectedMessage))
 		})
 	}
-
 }
 
 func TestGetSignableRolesForTargetAndRemoveError(t *testing.T) {
diff --git a/cli/command/trust/sign_test.go b/cli/command/trust/sign_test.go
index 99e2facd30..83863de953 100644
--- a/cli/command/trust/sign_test.go
+++ b/cli/command/trust/sign_test.go
@@ -225,7 +225,6 @@ func TestGetReleasedTargetHashAndSize(t *testing.T) {
 	oneReleasedTgt = append(oneReleasedTgt, client.TargetSignedStruct{Role: mockDelegationRoleWithName("targets/releases"), Target: releasedTgt})
 	hash, _, _ := getReleasedTargetHashAndSize(oneReleasedTgt, "unreleased")
 	assert.Check(t, is.DeepEqual(data.Hashes{notary.SHA256: []byte("released-hash")}, hash))
-
 }
 
 func TestCreateTarget(t *testing.T) {
@@ -280,5 +279,4 @@ func TestSignCommandLocalFlag(t *testing.T) {
 	cmd.SetArgs([]string{"--local", "reg-name.io/image:red"})
 	cmd.SetOut(io.Discard)
 	assert.ErrorContains(t, cmd.Execute(), "error contacting notary server: dial tcp: lookup reg-name.io")
-
 }
diff --git a/cli/command/trust/signer_remove_test.go b/cli/command/trust/signer_remove_test.go
index d8ad0bf04f..204c115c21 100644
--- a/cli/command/trust/signer_remove_test.go
+++ b/cli/command/trust/signer_remove_test.go
@@ -65,7 +65,6 @@ func TestTrustSignerRemoveErrors(t *testing.T) {
 		cmd.Execute()
 		assert.Check(t, is.Contains(cli.ErrBuffer().String(), tc.expectedError))
 	}
-
 }
 
 func TestRemoveSingleSigner(t *testing.T) {
@@ -89,6 +88,7 @@ func TestRemoveMultipleSigners(t *testing.T) {
 		"no signer test for repository signed-repo"))
 	assert.Check(t, is.Contains(cli.OutBuffer().String(), "Removing signer \"test\" from signed-repo...\n"))
 }
+
 func TestRemoveLastSignerWarning(t *testing.T) {
 	cli := test.NewFakeCli(&fakeClient{})
 	cli.SetNotaryClient(notaryfake.GetLoadedNotaryRepository)
diff --git a/cli/command/utils_test.go b/cli/command/utils_test.go
index 2af232d2e9..a74af2faa2 100644
--- a/cli/command/utils_test.go
+++ b/cli/command/utils_test.go
@@ -44,7 +44,7 @@ func TestValidateOutputPath(t *testing.T) {
 	file := filepath.Join(dir, "file")
 	err = os.WriteFile(file, []byte("hi"), 0644)
 	assert.NilError(t, err)
-	var testcases = []struct {
+	testcases := []struct {
 		path string
 		err  error
 	}{
diff --git a/cli/command/volume/list_test.go b/cli/command/volume/list_test.go
index 7a8006449f..dbed5a1606 100644
--- a/cli/command/volume/list_test.go
+++ b/cli/command/volume/list_test.go
@@ -146,7 +146,8 @@ func TestClusterVolumeList(t *testing.T) {
 								Availability: volume.AvailabilityActive,
 							},
 						},
-					}, {
+					},
+					{
 						Name:   "volume2",
 						Scope:  "global",
 						Driver: "driver1",
@@ -165,7 +166,8 @@ func TestClusterVolumeList(t *testing.T) {
 								VolumeID:      "driver1vol2",
 							},
 						},
-					}, {
+					},
+					{
 						Name:   "volume3",
 						Scope:  "global",
 						Driver: "driver2",
@@ -190,7 +192,8 @@ func TestClusterVolumeList(t *testing.T) {
 								VolumeID:      "driver1vol3",
 							},
 						},
-					}, {
+					},
+					{
 						Name:   "volume4",
 						Scope:  "global",
 						Driver: "driver2",
diff --git a/cli/compose/convert/volume.go b/cli/compose/convert/volume.go
index c2bebe0731..79f084f16a 100644
--- a/cli/compose/convert/volume.go
+++ b/cli/compose/convert/volume.go
@@ -147,7 +147,6 @@ func convertVolumeToMount(
 	stackVolumes volumes,
 	namespace Namespace,
 ) (mount.Mount, error) {
-
 	switch volume.Type {
 	case "volume", "":
 		return handleVolumeToMount(volume, stackVolumes, namespace)
diff --git a/cli/compose/interpolation/interpolation_test.go b/cli/compose/interpolation/interpolation_test.go
index 0e70d1bbbd..069d8d2549 100644
--- a/cli/compose/interpolation/interpolation_test.go
+++ b/cli/compose/interpolation/interpolation_test.go
@@ -100,7 +100,7 @@ func TestInterpolateWithCast(t *testing.T) {
 }
 
 func TestPathMatches(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		doc      string
 		path     Path
 		pattern  Path
diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
index 93f74bf886..203719f509 100644
--- a/cli/compose/loader/loader.go
+++ b/cli/compose/loader/loader.go
@@ -143,7 +143,7 @@ func loadSections(config map[string]interface{}, configDetails types.ConfigDetai
 		Version: schema.Version(config),
 	}
 
-	var loaders = []struct {
+	loaders := []struct {
 		key string
 		fnc func(config map[string]interface{}) error
 	}{
diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go
index 13ac877b8d..7a37b0d3cf 100644
--- a/cli/compose/loader/merge.go
+++ b/cli/compose/loader/merge.go
@@ -170,8 +170,10 @@ func toServiceVolumeConfigsSlice(dst reflect.Value, m map[interface{}]interface{
 	return nil
 }
 
-type tomapFn func(s interface{}) (map[interface{}]interface{}, error)
-type writeValueFromMapFn func(reflect.Value, map[interface{}]interface{}) error
+type (
+	tomapFn             func(s interface{}) (map[interface{}]interface{}, error)
+	writeValueFromMapFn func(reflect.Value, map[interface{}]interface{}) error
+)
 
 func safelyMerge(mergeFn func(dst, src reflect.Value) error) func(dst, src reflect.Value) error {
 	return func(dst, src reflect.Value) error {
diff --git a/cli/compose/loader/merge_test.go b/cli/compose/loader/merge_test.go
index 6f2262b072..4a97900b4c 100644
--- a/cli/compose/loader/merge_test.go
+++ b/cli/compose/loader/merge_test.go
@@ -938,7 +938,8 @@ func TestLoadMultipleConfigs(t *testing.T) {
 				},
 				CapAdd:      []string{"NET_ADMIN", "SYS_ADMIN"},
 				Environment: types.MappingWithEquals{},
-			}},
+			},
+		},
 		Networks: map[string]types.NetworkConfig{},
 		Volumes:  map[string]types.VolumeConfig{},
 		Secrets:  map[string]types.SecretConfig{},
@@ -1002,7 +1003,8 @@ func TestLoadMultipleNetworks(t *testing.T) {
 				Name:        "foo",
 				Image:       "baz",
 				Environment: types.MappingWithEquals{},
-			}},
+			},
+		},
 		Networks: map[string]types.NetworkConfig{
 			"hostnet": {
 				Name: "host",
diff --git a/cli/compose/template/template.go b/cli/compose/template/template.go
index 7ad50bc009..12927ddeda 100644
--- a/cli/compose/template/template.go
+++ b/cli/compose/template/template.go
@@ -6,8 +6,10 @@ import (
 	"strings"
 )
 
-var delimiter = "\\$"
-var substitution = "[_a-z][_a-z0-9]*(?::?[-?][^}]*)?"
+var (
+	delimiter    = "\\$"
+	substitution = "[_a-z][_a-z0-9]*(?::?[-?][^}]*)?"
+)
 
 var patternString = fmt.Sprintf(
 	"%s(?i:(?P<escaped>%s)|(?P<named>%s)|{(?P<braced>%s)}|(?P<invalid>))",
diff --git a/cli/connhelper/commandconn/commandconn.go b/cli/connhelper/commandconn/commandconn.go
index b9c8ae5f40..95b5d6933f 100644
--- a/cli/connhelper/commandconn/commandconn.go
+++ b/cli/connhelper/commandconn/commandconn.go
@@ -236,17 +236,21 @@ func (c *commandConn) Close() error {
 func (c *commandConn) LocalAddr() net.Addr {
 	return c.localAddr
 }
+
 func (c *commandConn) RemoteAddr() net.Addr {
 	return c.remoteAddr
 }
+
 func (c *commandConn) SetDeadline(t time.Time) error {
 	logrus.Debugf("unimplemented call: SetDeadline(%v)", t)
 	return nil
 }
+
 func (c *commandConn) SetReadDeadline(t time.Time) error {
 	logrus.Debugf("unimplemented call: SetReadDeadline(%v)", t)
 	return nil
 }
+
 func (c *commandConn) SetWriteDeadline(t time.Time) error {
 	logrus.Debugf("unimplemented call: SetWriteDeadline(%v)", t)
 	return nil
diff --git a/cli/manifest/store/store_test.go b/cli/manifest/store/store_test.go
index 5fc05a6031..cea0005f2f 100644
--- a/cli/manifest/store/store_test.go
+++ b/cli/manifest/store/store_test.go
@@ -58,7 +58,7 @@ func TestStoreSaveAndGet(t *testing.T) {
 	err := store.Save(listRef, ref("exists"), data)
 	assert.NilError(t, err)
 
-	var testcases = []struct {
+	testcases := []struct {
 		listRef     reference.Reference
 		manifestRef reference.Reference
 		expected    types.ImageManifest
diff --git a/cli/trust/trust.go b/cli/trust/trust.go
index d668aa4955..457f799fda 100644
--- a/cli/trust/trust.go
+++ b/cli/trust/trust.go
@@ -102,7 +102,7 @@ func GetNotaryRepository(in io.Reader, out io.Writer, userAgent string, repoInfo
 		return nil, err
 	}
 
-	var cfg = tlsconfig.ClientDefault()
+	cfg := tlsconfig.ClientDefault()
 	cfg.InsecureSkipVerify = !repoInfo.Index.Secure
 
 	// Get certificate base directory
@@ -287,7 +287,6 @@ func GetSignableRoles(repo client.Repository, target *client.Target) ([]data.Rol
 	}
 
 	return signableRoles, nil
-
 }
 
 // ImageRefAndAuth contains all reference information and the auth config for an image request
@@ -384,5 +383,4 @@ func (imgRefAuth *ImageRefAndAuth) Digest() digest.Digest {
 // Name returns the image name used to initialize the ImageRefAndAuth
 func (imgRefAuth *ImageRefAndAuth) Name() string {
 	return imgRefAuth.original
-
 }
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
index edbae37f15..cfb09a3109 100644
--- a/cmd/docker/docker.go
+++ b/cmd/docker/docker.go
@@ -40,7 +40,6 @@ func newDockerCommand(dockerCli *command.DockerCli) *cli.TopLevelCommand {
 				return command.ShowHelp(dockerCli.Err())(cmd, args)
 			}
 			return fmt.Errorf("docker: '%s' is not a docker command.\nSee 'docker --help'", args[0])
-
 		},
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			return isSupported(cmd, dockerCli)
diff --git a/e2e/cli-plugins/flags_test.go b/e2e/cli-plugins/flags_test.go
index f1565da8eb..2df9849039 100644
--- a/e2e/cli-plugins/flags_test.go
+++ b/e2e/cli-plugins/flags_test.go
@@ -255,5 +255,4 @@ func TestCliPluginsVersion(t *testing.T) {
 			})
 		})
 	}
-
 }
diff --git a/e2e/cli-plugins/util_test.go b/e2e/cli-plugins/util_test.go
index 73819598ba..c2a4406a46 100644
--- a/e2e/cli-plugins/util_test.go
+++ b/e2e/cli-plugins/util_test.go
@@ -26,5 +26,4 @@ func prepare(t *testing.T) (func(args ...string) icmd.Cmd, *configfile.ConfigFil
 	assert.NilError(t, err)
 
 	return run, cfgfile, cleanup
-
 }
diff --git a/internal/test/builders/task.go b/internal/test/builders/task.go
index 40efc3d93a..1d0c796b89 100644
--- a/internal/test/builders/task.go
+++ b/internal/test/builders/task.go
@@ -6,9 +6,7 @@ import (
 	"github.com/docker/docker/api/types/swarm"
 )
 
-var (
-	defaultTime = time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)
-)
+var defaultTime = time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)
 
 // Task creates a task with default values .
 // Any number of task function builder can be pass to augment it.
diff --git a/internal/test/notary/client.go b/internal/test/notary/client.go
index efaf8a7894..ef7e2824e5 100644
--- a/internal/test/notary/client.go
+++ b/internal/test/notary/client.go
@@ -271,7 +271,8 @@ func (e EmptyTargetsNotaryRepository) ListRoles() ([]client.RoleWithSignatures,
 	}
 	return []client.RoleWithSignatures{
 		{Role: rootRole},
-		{Role: targetsRole}}, nil
+		{Role: targetsRole},
+	}, nil
 }
 
 // GetDelegationRoles returns the keys and roles of the repository's delegations
@@ -306,6 +307,7 @@ var loadedReleasesRole = data.DelegationRole{
 		Threshold: 1,
 	},
 }
+
 var loadedAliceRole = data.DelegationRole{
 	BaseRole: data.BaseRole{
 		Name:      "targets/alice",
@@ -313,6 +315,7 @@ var loadedAliceRole = data.DelegationRole{
 		Threshold: 1,
 	},
 }
+
 var loadedBobRole = data.DelegationRole{
 	BaseRole: data.BaseRole{
 		Name:      "targets/bob",
@@ -320,6 +323,7 @@ var loadedBobRole = data.DelegationRole{
 		Threshold: 1,
 	},
 }
+
 var loadedDelegationRoles = []data.Role{
 	{
 		Name: loadedReleasesRole.Name,
@@ -343,6 +347,7 @@ var loadedDelegationRoles = []data.Role{
 		},
 	},
 }
+
 var loadedTargetsRole = data.DelegationRole{
 	BaseRole: data.BaseRole{
 		Name:      data.CanonicalTargetsRole,
@@ -359,14 +364,17 @@ var loadedRedTarget = client.Target{
 	Name:   "red",
 	Hashes: data.Hashes{"sha256": []byte("red-digest")},
 }
+
 var loadedBlueTarget = client.Target{
 	Name:   "blue",
 	Hashes: data.Hashes{"sha256": []byte("blue-digest")},
 }
+
 var loadedGreenTarget = client.Target{
 	Name:   "green",
 	Hashes: data.Hashes{"sha256": []byte("green-digest")},
 }
+
 var loadedTargets = []client.TargetSignedStruct{
 	// red is signed by all three delegations
 	{Target: loadedRedTarget, Role: loadedReleasesRole},
diff --git a/opts/capabilities_test.go b/opts/capabilities_test.go
index cb61b79396..32c50d06a1 100644
--- a/opts/capabilities_test.go
+++ b/opts/capabilities_test.go
@@ -113,7 +113,6 @@ func TestEffectiveCapAddCapDrop(t *testing.T) {
 			add, drop := EffectiveCapAddCapDrop(tc.in.add, tc.in.drop)
 			assert.DeepEqual(t, add, tc.out.add)
 			assert.DeepEqual(t, drop, tc.out.drop)
-
 		})
 	}
 }
diff --git a/opts/hosts_test.go b/opts/hosts_test.go
index 3356ca3c0a..9d38d164be 100644
--- a/opts/hosts_test.go
+++ b/opts/hosts_test.go
@@ -94,9 +94,7 @@ func TestParseDockerDaemonHost(t *testing.T) {
 }
 
 func TestParseTCP(t *testing.T) {
-	var (
-		defaultHTTPHost = "tcp://127.0.0.1:2376"
-	)
+	defaultHTTPHost := "tcp://127.0.0.1:2376"
 	invalids := map[string]string{
 		"tcp:a.b.c.d":          "",
 		"tcp:a.b.c.d/path":     "",
diff --git a/opts/mount_test.go b/opts/mount_test.go
index fd771290a1..2cdebf5aba 100644
--- a/opts/mount_test.go
+++ b/opts/mount_test.go
@@ -30,7 +30,6 @@ func TestMountOptString(t *testing.T) {
 }
 
 func TestMountRelative(t *testing.T) {
-
 	for _, testcase := range []struct {
 		name string
 		path string
diff --git a/opts/opts.go b/opts/opts.go
index f0bd8880d9..03550023b0 100644
--- a/opts/opts.go
+++ b/opts/opts.go
@@ -230,7 +230,7 @@ type ValidatorFctListType func(val string) ([]string, error)
 
 // ValidateIPAddress validates an Ip address.
 func ValidateIPAddress(val string) (string, error) {
-	var ip = net.ParseIP(strings.TrimSpace(val))
+	ip := net.ParseIP(strings.TrimSpace(val))
 	if ip != nil {
 		return ip.String(), nil
 	}
diff --git a/opts/opts_test.go b/opts/opts_test.go
index 4ef3e19b6f..2b1c443417 100644
--- a/opts/opts_test.go
+++ b/opts/opts_test.go
@@ -28,7 +28,6 @@ func TestValidateIPAddress(t *testing.T) {
 	if ret, err := ValidateIPAddress(`random invalid string`); err == nil || ret != "" {
 		t.Fatalf("ValidateIPAddress(`random invalid string`) got %s %s", ret, err)
 	}
-
 }
 
 func TestMapOpts(t *testing.T) {
@@ -88,7 +87,6 @@ func TestListOptsWithoutValidator(t *testing.T) {
 	if len(mapListOpts) != 1 {
 		t.Errorf("Expected [map[bar:{}]], got [%v]", mapListOpts)
 	}
-
 }
 
 func TestListOptsWithValidator(t *testing.T) {
diff --git a/opts/port_test.go b/opts/port_test.go
index b02fb95237..768264f3f8 100644
--- a/opts/port_test.go
+++ b/opts/port_test.go
@@ -361,7 +361,7 @@ func TestConvertPortToPortConfigWithIP(t *testing.T) {
 }
 
 func assertContains(t *testing.T, portConfigs []swarm.PortConfig, expected swarm.PortConfig) {
-	var contains = false
+	contains := false
 	for _, portConfig := range portConfigs {
 		if portConfig == expected {
 			contains = true