Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4543 from thaJeztah/24.0_backport_bump_golangci_lint 

[24.0 backport] update golangci-lint to v1.54.2
This commit is contained in:
Bjorn Neergaard 2023-09-13 10:05:27 -06:00 committed by GitHub
parent ed223bc820 989b340a6c
commit d848d49be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.golangci.yml
View File

@ -32,12 +32,11 @@ run:
linters-settings: linters-settings:
depguard: depguard:
list-type: blacklist rules:
include-go-root: true main:
packages: deny:
# The io/ioutil package has been deprecated. - pkg: io/ioutil
# https://go.dev/doc/go1.16#ioutil desc: The io/ioutil package has been deprecated, see https://go.dev/doc/go1.16#ioutil
- io/ioutil
gocyclo: gocyclo:
min-complexity: 16 min-complexity: 16
govet: govet:

2
cli/command/service/opts.go
View File

@ -1001,7 +1001,7 @@ const (
flagTTY = "tty" flagTTY = "tty"
flagUpdateDelay = "update-delay" flagUpdateDelay = "update-delay"
flagUpdateFailureAction = "update-failure-action" flagUpdateFailureAction = "update-failure-action"
flagUpdateMaxFailureRatio = "update-max-failure-ratio" flagUpdateMaxFailureRatio = "update-max-failure-ratio" // #nosec G101 -- ignoring: Potential hardcoded credentials (gosec)
flagUpdateMonitor = "update-monitor" flagUpdateMonitor = "update-monitor"
flagUpdateOrder = "update-order" flagUpdateOrder = "update-order"
flagUpdateParallelism = "update-parallelism" flagUpdateParallelism = "update-parallelism"

2
dockerfiles/Dockerfile.lint
View File

@ -2,7 +2,7 @@
ARG GO_VERSION=1.20.7 ARG GO_VERSION=1.20.7
ARG ALPINE_VERSION=3.17 ARG ALPINE_VERSION=3.17
ARG GOLANGCI_LINT_VERSION=v1.52.2 ARG GOLANGCI_LINT_VERSION=v1.54.2
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint

4
e2e/internal/fixtures/fixtures.go
View File

@ -17,11 +17,11 @@ const (
// AlpineImage is an image in the test registry // AlpineImage is an image in the test registry
AlpineImage = "registry:5000/alpine:frozen" AlpineImage = "registry:5000/alpine:frozen"
// AlpineSha is the sha of the alpine image // AlpineSha is the sha of the alpine image
AlpineSha = "e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501" AlpineSha = "e2e16842c9b54d985bf1ef9242a313f36b856181f188de21313820e177002501" // #nosec G101 -- ignoring: Potential hardcoded credentials (gosec)
// BusyboxImage is an image in the test registry // BusyboxImage is an image in the test registry
BusyboxImage = "registry:5000/busybox:frozen" BusyboxImage = "registry:5000/busybox:frozen"
// BusyboxSha is the sha of the busybox image // BusyboxSha is the sha of the busybox image
BusyboxSha = "030fcb92e1487b18c974784dcc110a93147c9fc402188370fbfd17efabffc6af" BusyboxSha = "030fcb92e1487b18c974784dcc110a93147c9fc402188370fbfd17efabffc6af" // #nosec G101 -- ignoring: Potential hardcoded credentials (gosec)
) )
// SetupConfigFile creates a config.json file for testing // SetupConfigFile creates a config.json file for testing