Update golangci-lint to v1.20.0

dhui · dhui · commit bbe4ec3cde7e · 2019-10-12T15:14:27.000-07:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  deadline: 2m
+  timeout: 2m
 linters:
   enable:
     #- golint
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ before_install:
   - sudo apt-get update
   - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
   # Install golangci-lint
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.20.0
   - echo "TRAVIS_GO_VERSION=${TRAVIS_GO_VERSION}"
 
 install:
diff --git a/testing/docker.go b/testing/docker.go
@@ -199,7 +199,7 @@ func (d *DockerContainer) Logs() (io.ReadCloser, error) {
 	})
 }
 
-func (d *DockerContainer) portMapping(selectFirst bool, cPort int) (containerPort uint, hostIP string, hostPort uint, err error) {
+func (d *DockerContainer) portMapping(selectFirst bool, cPort int) (containerPort uint, hostIP string, hostPort uint, err error) { // nolint:unparam
 	if !d.containerInspected {
 		if err := d.Inspect(); err != nil {
 			d.t.Fatal(err)

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ func (d *DockerContainer) Logs() (io.ReadCloser, error) {`
`199`	`199`	`})`
`200`	`200`	`}`
`201`	`201`
`202`		`-func (d *DockerContainer) portMapping(selectFirst bool, cPort int) (containerPort uint, hostIP string, hostPort uint, err error) {`
	`202`	`+func (d *DockerContainer) portMapping(selectFirst bool, cPort int) (containerPort uint, hostIP string, hostPort uint, err error) { // nolint:unparam`
`203`	`203`	`if !d.containerInspected {`
`204`	`204`	`if err := d.Inspect(); err != nil {`
`205`	`205`	`d.t.Fatal(err)`