Bump Go and golang linter

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
2024-06-30 16:46:13 +01:00 · 2024-06-30 16:46:13 +01:00 · 5316d3bda2
commit 5316d3bda2
parent 5f804a9df7
15 changed files with 11 additions and 12 deletions
--- a/.golangci.yml
+++ b/.golangci.yml
@ -6,7 +6,7 @@ linters:
    - goimports
    - revive
    - ineffassign
-    - vet
+    - govet
    - unused
    - misspell
    - bodyclose
@ -22,7 +22,7 @@ linters-settings:
      - name: unused-parameter
        disabled: true

-run:
+issues:
  deadline: 2m
-  skip-dirs:
+  exlude-dirs:
    - vendor
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.8
+ARG GO_VERSION=1.22.4
 ARG ALPINE_VERSION=3.19
 ARG XX_VERSION=1.2.1

--- a/dockerfiles/docs.Dockerfile
+++ b/dockerfiles/docs.Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.8
+ARG GO_VERSION=1.22.4
 ARG ALPINE_VERSION=3.19

 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
--- a/dockerfiles/git.Dockerfile
+++ b/dockerfiles/git.Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.8
+ARG GO_VERSION=1.22.4
 ARG ALPINE_VERSION=3.19

 FROM alpine:${ALPINE_VERSION} AS base
--- a/dockerfiles/lint.Dockerfile
+++ b/dockerfiles/lint.Dockerfile
@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.8
+ARG GO_VERSION=1.22.4
 ARG ALPINE_VERSION=3.19
-ARG GOLANGCI_LINT_VERSION=v1.55.2
+ARG GOLANGCI_LINT_VERSION=v1.59.1
 ARG BUILDTAGS=""

 FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
--- a/dockerfiles/vendor.Dockerfile
+++ b/dockerfiles/vendor.Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.8
+ARG GO_VERSION=1.22.4
 ARG ALPINE_VERSION=3.19
 ARG MODOUTDATED_VERSION=v0.8.0

--- a/go.mod
+++ b/go.mod
@ -1,6 +1,6 @@
 module github.com/distribution/distribution/v3

-go 1.21.8
+go 1.22.4

 require (
 	cloud.google.com/go/storage v1.30.1
@ -41,8 +41,6 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )

-require github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
-
 require (
 	cloud.google.com/go v0.110.7 // indirect
 	cloud.google.com/go/compute v1.23.0 // indirect
@ -59,6 +57,7 @@ require (
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/s2a-go v0.1.4 // indirect
--- a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_intermediate_cert.der
--- a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_leaf_cert.der
--- a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/client_root_cert.der
--- a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_intermediate_cert.der
--- a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_leaf_cert.der
--- a/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/certverifier/testdata/server_root_cert.der
--- a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/client_cert.der
--- a/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der
+++ b/vendor/github.com/google/s2a-go/internal/v2/remotesigner/testdata/server_cert.der