From f1c66d79c98bc2bf01eb44d66ab01e4e343bf314 Mon Sep 17 00:00:00 2001 From: Aofei Sheng Date: Sat, 15 Mar 2025 11:22:38 +0800 Subject: [PATCH] refactor: bump minimum required Go version to 1.23.0 (#112) We always keep the minimum Go version requirement in sync with `golang.org/x/mod` to ensure we don't fall too far behind on new Go features. Signed-off-by: Aofei Sheng --- .github/workflows/test.yaml | 1 - go.mod | 8 ++++---- go.sum | 12 ++++++------ goproxy.go | 2 +- goproxy_test.go | 5 +++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 55719ec..00043c2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,7 +12,6 @@ jobs: strategy: matrix: go: - - 1.22.x - 1.23.x - 1.24.x steps: diff --git a/go.mod b/go.mod index b4aa50c..f6dac71 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/goproxy/goproxy -go 1.22.0 +go 1.23.0 require ( - github.com/minio/minio-go/v7 v7.0.86 - github.com/spf13/cobra v1.9.0 - golang.org/x/mod v0.23.0 + github.com/minio/minio-go/v7 v7.0.88 + github.com/spf13/cobra v1.9.1 + golang.org/x/mod v0.24.0 ) require ( diff --git a/go.sum b/go.sum index fc4691b..27afa37 100644 --- a/go.sum +++ b/go.sum @@ -20,23 +20,23 @@ github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.86 h1:DcgQ0AUjLJzRH6y/HrxiZ8CXarA70PAIufXHodP4s+k= -github.com/minio/minio-go/v7 v7.0.86/go.mod h1:VbfO4hYwUu3Of9WqGLBZ8vl3Hxnxo4ngxK4hzQDf4x4= +github.com/minio/minio-go/v7 v7.0.88 h1:v8MoIJjwYxOkehp+eiLIuvXk87P2raUtoU5klrAAshs= +github.com/minio/minio-go/v7 v7.0.88/go.mod h1:33+O8h0tO7pCeCWwBVa07RhVVfB/3vS4kEX7rwYKmIg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.9.0 h1:Py5fIuq/lJsRYxcxfOtsJqpmwJWCMOUy2tMJYV8TNHE= -github.com/spf13/cobra v1.9.0/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= -golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= -golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= +golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= diff --git a/goproxy.go b/goproxy.go index 9c897a8..8df52be 100644 --- a/goproxy.go +++ b/goproxy.go @@ -70,7 +70,7 @@ type Goproxy struct { // Logger is used to log messages that occur during proxying. It is // currently used only for error messages. // - // If Logger is nil, [slog.Default] is used. + // If Logger is nil, [slog.Default] with group name "goproxy" is used. Logger *slog.Logger initOnce sync.Once diff --git a/goproxy_test.go b/goproxy_test.go index 7f936ec..556db00 100644 --- a/goproxy_test.go +++ b/goproxy_test.go @@ -15,6 +15,7 @@ import ( "os" "path" "path/filepath" + "slices" "strconv" "strings" "sync" @@ -1341,8 +1342,8 @@ func TestCleanPath(t *testing.T) { } func getenv(env []string, key string) string { - for i := len(env) - 1; i >= 0; i-- { - if k, v, ok := strings.Cut(env[i], "="); ok { + for _, e := range slices.Backward(env) { + if k, v, ok := strings.Cut(e, "="); ok { if k == key { return v }