Skip to content

Commit f23c00d

Browse files
thaJeztahthaJeztah
committed
Various code-cleanup
remove unnescessary import aliases, brackets, and so on. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 0846a02 commit f23c00d

File tree

112 files changed

+168
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+168
-182
lines changed

‎api/common.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package api // import "github.com/docker/docker/api"
33
// Common constants for daemon and client.
44
const (
55
// DefaultVersion of Current REST API
6-
DefaultVersion string = "1.37"
6+
DefaultVersion = "1.37"
77

88
// NoBaseImageSpecifier is the symbol used by the FROM
99
// command to specify that no base image is to be used.
10-
NoBaseImageSpecifier string = "scratch"
10+
NoBaseImageSpecifier = "scratch"
1111
)

‎api/common_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
package api // import "github.com/docker/docker/api"
44

55
// MinVersion represents Minimum REST API version supported
6-
const MinVersion string = "1.12"
6+
const MinVersion = "1.12"

‎api/server/router/build/build_routes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/docker/docker/pkg/progress"
2424
"github.com/docker/docker/pkg/streamformatter"
2525
"github.com/docker/docker/pkg/system"
26-
units "github.com/docker/go-units"
26+
"github.com/docker/go-units"
2727
"github.com/pkg/errors"
2828
"github.com/sirupsen/logrus"
2929
)

‎api/server/server_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package server // import "github.com/docker/docker/api/server"
22

33
import (
4+
"context"
45
"net/http"
56
"net/http/httptest"
67
"strings"
78
"testing"
89

9-
"context"
10-
1110
"github.com/docker/docker/api"
1211
"github.com/docker/docker/api/server/httputils"
1312
"github.com/docker/docker/api/server/middleware"

‎api/types/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/docker/docker/api/types/container"
99
"github.com/docker/docker/api/types/filters"
10-
units "github.com/docker/go-units"
10+
"github.com/docker/go-units"
1111
)
1212

1313
// CheckpointCreateOptions holds parameters to create a checkpoint from a container

‎builder/builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919

2020
const (
2121
// DefaultDockerfileName is the Default filename with Docker commands, read by docker build
22-
DefaultDockerfileName string = "Dockerfile"
22+
DefaultDockerfileName = "Dockerfile"
2323
)
2424

2525
// Source defines a location that can be used as a source for the ADD/COPY

‎builder/dockerfile/buildargs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (b *BuildArgs) MergeReferencedArgs(other *BuildArgs) {
6969
// WarnOnUnusedBuildArgs checks if there are any leftover build-args that were
7070
// passed but not consumed during build. Print a warning, if there are any.
7171
func (b *BuildArgs) WarnOnUnusedBuildArgs(out io.Writer) {
72-
leftoverArgs := []string{}
72+
var leftoverArgs []string
7373
for arg := range b.argsFromOptions {
7474
_, isReferenced := b.referencedArgs[arg]
7575
_, isBuiltin := builtinAllowedBuildArgs[arg]

‎builder/dockerfile/builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ func BuildFromConfig(config *container.Config, changes []string, os string) (*co
387387
b.Stderr = ioutil.Discard
388388
b.disableCommit = true
389389

390-
commands := []instructions.Command{}
390+
var commands []instructions.Command
391391
for _, n := range dockerfile.AST.Children {
392392
cmd, err := instructions.ParseCommand(n)
393393
if err != nil {

‎builder/dockerfile/instructions/commands.go

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package instructions // import "github.com/docker/docker/builder/dockerfile/inst
22

33
import (
44
"errors"
5-
65
"strings"
76

87
"github.com/docker/docker/api/types/container"

‎builder/dockerfile/instructions/support_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type testCase struct {
1010
}
1111

1212
func initTestCases() []testCase {
13-
testCases := []testCase{}
13+
var testCases []testCase
1414

1515
testCases = append(testCases, testCase{
1616
name: "empty args",

‎builder/dockerfile/parser/parser.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@ func Parse(rwc io.Reader) (*Result, error) {
262262
}
263263

264264
if hasEmptyContinuationLine {
265-
warning := "[WARNING]: Empty continuation line found in:\n " + line
266-
warnings = append(warnings, warning)
265+
warnings = append(warnings, "[WARNING]: Empty continuation line found in:\n "+line)
267266
}
268267

269268
child, err := newNodeFromLine(line, d)

‎builder/dockerfile/shell/lex_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ func TestShellParser4Words(t *testing.T) {
7171
}
7272
defer file.Close()
7373

74+
var envs []string
7475
shlex := NewLex('\\')
75-
envs := []string{}
7676
scanner := bufio.NewScanner(file)
7777
lineNum := 0
7878
for scanner.Scan() {

‎builder/remotecontext/tarsum.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/docker/docker/pkg/containerfs"
88
iradix "github.com/hashicorp/go-immutable-radix"
9-
digest "github.com/opencontainers/go-digest"
9+
"github.com/opencontainers/go-digest"
1010
"github.com/pkg/errors"
1111
"github.com/tonistiigi/fsutil"
1212
)

‎cli/cobra.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func hasManagementSubCommands(cmd *cobra.Command) bool {
5151
}
5252

5353
func operationSubCommands(cmd *cobra.Command) []*cobra.Command {
54-
cmds := []*cobra.Command{}
54+
var cmds []*cobra.Command
5555
for _, sub := range cmd.Commands() {
5656
if sub.IsAvailableCommand() && !sub.HasSubCommands() {
5757
cmds = append(cmds, sub)
@@ -69,7 +69,7 @@ func wrappedFlagUsages(cmd *cobra.Command) string {
6969
}
7070

7171
func managementSubCommands(cmd *cobra.Command) []*cobra.Command {
72-
cmds := []*cobra.Command{}
72+
var cmds []*cobra.Command
7373
for _, sub := range cmd.Commands() {
7474
if sub.IsAvailableCommand() && sub.HasSubCommands() {
7575
cmds = append(cmds, sub)

‎client/container_wait_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package client // import "github.com/docker/docker/client"
22

33
import (
44
"bytes"
5+
"context"
56
"encoding/json"
67
"fmt"
78
"io/ioutil"
@@ -11,8 +12,6 @@ import (
1112
"testing"
1213
"time"
1314

14-
"context"
15-
1615
"github.com/docker/docker/api/types/container"
1716
)
1817

‎client/errors.go

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package client // import "github.com/docker/docker/client"
22

33
import (
44
"fmt"
5-
65
"net/http"
76

87
"github.com/docker/docker/api/types/versions"

‎client/image_save_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import (
77
"io/ioutil"
88
"net/http"
99
"reflect"
10-
"testing"
11-
1210
"strings"
11+
"testing"
1312
)
1413

1514
func TestImageSaveError(t *testing.T) {

‎client/node_remove.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package client // import "github.com/docker/docker/client"
22

33
import (
4-
"net/url"
5-
64
"context"
5+
"net/url"
76

87
"github.com/docker/docker/api/types"
98
)

‎client/node_remove_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
22

33
import (
44
"bytes"
5+
"context"
56
"fmt"
67
"io/ioutil"
78
"net/http"
89
"strings"
910
"testing"
1011

11-
"context"
12-
1312
"github.com/docker/docker/api/types"
1413
)
1514

‎client/plugin_remove_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ package client // import "github.com/docker/docker/client"
22

33
import (
44
"bytes"
5+
"context"
56
"fmt"
67
"io/ioutil"
78
"net/http"
89
"strings"
910
"testing"
1011

11-
"context"
12-
1312
"github.com/docker/docker/api/types"
1413
)
1514

‎client/request_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func TestSetHostHeader(t *testing.T) {
6161
}
6262
return &http.Response{
6363
StatusCode: http.StatusOK,
64-
Body: ioutil.NopCloser(bytes.NewReader(([]byte("")))),
64+
Body: ioutil.NopCloser(bytes.NewReader([]byte(""))),
6565
}, nil
6666
}),
6767

‎client/service_create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/docker/distribution/reference"
1010
"github.com/docker/docker/api/types"
1111
"github.com/docker/docker/api/types/swarm"
12-
digest "github.com/opencontainers/go-digest"
12+
"github.com/opencontainers/go-digest"
1313
"github.com/pkg/errors"
1414
)
1515

‎cmd/dockerd/config_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package main
55
import (
66
"github.com/docker/docker/daemon/config"
77
"github.com/docker/docker/opts"
8-
units "github.com/docker/go-units"
8+
"github.com/docker/go-units"
99
"github.com/spf13/pflag"
1010
)
1111

‎cmd/dockerd/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net"
55
"net/http"
66

7-
metrics "github.com/docker/go-metrics"
7+
"github.com/docker/go-metrics"
88
"github.com/sirupsen/logrus"
99
)
1010

‎container/view.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ func (v *memdbView) transform(container *Container) *Snapshot {
340340
}
341341

342342
if len(container.Args) > 0 {
343-
args := []string{}
343+
var args []string
344344
for _, arg := range container.Args {
345345
if strings.Contains(arg, " ") {
346346
args = append(args, fmt.Sprintf("'%s'", arg))

‎daemon/cluster/convert/container.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8-
container "github.com/docker/docker/api/types/container"
8+
"github.com/docker/docker/api/types/container"
99
mounttypes "github.com/docker/docker/api/types/mount"
1010
types "github.com/docker/docker/api/types/swarm"
1111
swarmapi "github.com/docker/swarmkit/api"

‎daemon/cluster/executor/container/container_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package container // import "github.com/docker/docker/daemon/cluster/executor/co
33
import (
44
"testing"
55

6-
container "github.com/docker/docker/api/types/container"
6+
"github.com/docker/docker/api/types/container"
77
swarmapi "github.com/docker/swarmkit/api"
88
"github.com/gotestyourself/gotestyourself/assert"
99
)

‎daemon/config/config_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
containertypes "github.com/docker/docker/api/types/container"
99
"github.com/docker/docker/opts"
10-
units "github.com/docker/go-units"
10+
"github.com/docker/go-units"
1111
)
1212

1313
const (

‎daemon/config/config_unix_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77

88
"github.com/docker/docker/opts"
9-
units "github.com/docker/go-units"
9+
"github.com/docker/go-units"
1010
"github.com/gotestyourself/gotestyourself/assert"
1111
is "github.com/gotestyourself/gotestyourself/assert/cmp"
1212
"github.com/gotestyourself/gotestyourself/fs"

‎daemon/daemon_unix.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
lntypes "github.com/docker/libnetwork/types"
4444
"github.com/opencontainers/runc/libcontainer/cgroups"
4545
rsystem "github.com/opencontainers/runc/libcontainer/system"
46-
specs "github.com/opencontainers/runtime-spec/specs-go"
46+
"github.com/opencontainers/runtime-spec/specs-go"
4747
"github.com/opencontainers/selinux/go-selinux/label"
4848
"github.com/pkg/errors"
4949
"github.com/sirupsen/logrus"
@@ -67,8 +67,8 @@ const (
6767
// It's not kernel limit, we want this 4M limit to supply a reasonable functional container
6868
linuxMinMemory = 4194304
6969
// constants for remapped root settings
70-
defaultIDSpecifier string = "default"
71-
defaultRemappedID string = "dockremap"
70+
defaultIDSpecifier = "default"
71+
defaultRemappedID = "dockremap"
7272

7373
// constant for cgroup drivers
7474
cgroupFsDriver = "cgroupfs"

‎daemon/exec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/docker/docker/pkg/pools"
1717
"github.com/docker/docker/pkg/signal"
1818
"github.com/docker/docker/pkg/term"
19-
specs "github.com/opencontainers/runtime-spec/specs-go"
19+
"github.com/opencontainers/runtime-spec/specs-go"
2020
"github.com/pkg/errors"
2121
"github.com/sirupsen/logrus"
2222
)

‎daemon/graphdriver/aufs/dirs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func loadIds(root string) ([]string, error) {
1515
if err != nil {
1616
return nil, err
1717
}
18-
out := []string{}
18+
var out []string
1919
for _, d := range dirs {
2020
if !d.IsDir() {
2121
out = append(out, d.Name())
@@ -36,7 +36,7 @@ func getParentIDs(root, id string) ([]string, error) {
3636
}
3737
defer f.Close()
3838

39-
out := []string{}
39+
var out []string
4040
s := bufio.NewScanner(f)
4141

4242
for s.Scan() {

‎daemon/graphdriver/devmapper/deviceset.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/docker/docker/pkg/mount"
2828
"github.com/docker/docker/pkg/parsers"
2929
"github.com/docker/docker/pkg/parsers/kernel"
30-
units "github.com/docker/go-units"
30+
"github.com/docker/go-units"
3131
"github.com/opencontainers/selinux/go-selinux/label"
3232
"github.com/pkg/errors"
3333
"github.com/sirupsen/logrus"
@@ -50,8 +50,8 @@ var (
5050
lvmSetupConfigForce bool
5151
)
5252

53-
const deviceSetMetaFile string = "deviceset-metadata"
54-
const transactionMetaFile string = "transaction-metadata"
53+
const deviceSetMetaFile = "deviceset-metadata"
54+
const transactionMetaFile = "transaction-metadata"
5555

5656
type transaction struct {
5757
OpenTransactionID uint64 `json:"open_transaction_id"`

‎daemon/graphdriver/devmapper/driver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/docker/docker/pkg/idtools"
1616
"github.com/docker/docker/pkg/locker"
1717
"github.com/docker/docker/pkg/mount"
18-
units "github.com/docker/go-units"
18+
"github.com/docker/go-units"
1919
"github.com/pkg/errors"
2020
"github.com/sirupsen/logrus"
2121
"golang.org/x/sys/unix"

‎daemon/graphdriver/graphtest/graphtest_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/docker/docker/daemon/graphdriver"
1616
"github.com/docker/docker/daemon/graphdriver/quota"
1717
"github.com/docker/docker/pkg/stringid"
18-
units "github.com/docker/go-units"
18+
"github.com/docker/go-units"
1919
"github.com/gotestyourself/gotestyourself/assert"
2020
is "github.com/gotestyourself/gotestyourself/assert/cmp"
2121
"golang.org/x/sys/unix"

‎daemon/graphdriver/graphtest/testutil.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func changeManyFiles(drv graphdriver.Driver, layer string, count int, seed int64
148148
}
149149
defer drv.Put(layer)
150150

151-
changes := []archive.Change{}
151+
var changes []archive.Change
152152
for i := 0; i < count; i += 100 {
153153
archiveRoot := fmt.Sprintf("/directory-%d", i)
154154
if err := root.MkdirAll(root.Join(root.Path(), archiveRoot), 0755); err != nil {

0 commit comments

Comments
 (0)