From d07356546acf4410bdc5676f854f303a55645869 Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Thu, 20 Feb 2025 17:15:16 +0100 Subject: [PATCH 1/8] go: update supported versions --- README.md | 2 +- go.mod | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index aa23be3..2106119 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,6 @@ If not, a convenience wrapper for the storage is returned. ## API Stability -We support the last two stable Go versions, currently 1.22 and 1.23. +We support the last two stable Go versions, currently 1.23 and 1.24. From a API consumer point of view, we do not plan any backward incompatible changes before a v1.0. diff --git a/go.mod b/go.mod index efbb4b0..da57884 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/PowerDNS/simpleblob -go 1.22 +go 1.23 -toolchain go1.23.2 +toolchain go1.24.0 require ( github.com/PowerDNS/go-tlsconfig v0.0.0-20221101135152-0956853b28df From 5c3bf1bd4b8df009d9df15d4b0669186610aeabd Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Thu, 20 Feb 2025 17:19:11 +0100 Subject: [PATCH 2/8] upgrade golangci-lint --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 8c48c66..f120dcf 100755 --- a/test.sh +++ b/test.sh @@ -6,7 +6,7 @@ go test -count=1 "$@" ./... # Run linters # Configure linters in .golangci.yml -expected_version=1.61.0 +expected_version=1.64.5 expected_version_full=v"$expected_version" golangci_lint_bin=./bin/golangci-lint if ! "$golangci_lint_bin" version | grep -wq "version $expected_version"; then From 83d912e17aceee4e89076556a265c3aefd529dd5 Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Thu, 20 Feb 2025 17:20:24 +0100 Subject: [PATCH 3/8] github workflow: use supported go versions --- .github/workflows/go.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 9dcc22c..b10ac40 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.23', '1.22' ] + go: [ '1.24', '1.23' ] name: Go ${{ matrix.go }} tests steps: From e45d26e05e53c7b3d1d05365339dcecd5dfa83a6 Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Wed, 26 Mar 2025 15:59:59 +0100 Subject: [PATCH 4/8] go: upgrade toolchain and all dependencies --- backends/s3/credentials.go | 7 ++++++ go.mod | 25 ++++++++++--------- go.sum | 51 +++++++++++++++++++------------------- 3 files changed, 46 insertions(+), 37 deletions(-) diff --git a/backends/s3/credentials.go b/backends/s3/credentials.go index 3e7abc8..aa31394 100644 --- a/backends/s3/credentials.go +++ b/backends/s3/credentials.go @@ -29,6 +29,13 @@ type FileSecretsCredentials struct { // Retrieve implements credentials.Provider. // It reads files pointed to by p.AccessKeyFilename and p.SecretKeyFilename. func (c *FileSecretsCredentials) Retrieve() (credentials.Value, error) { + return c.RetrieveWithCredContext(nil) +} + +// RetrieveWithCredContext implements credentials.Provider. +// It reads files pointed to by p.AccessKeyFilename and p.SecretKeyFilename. +// The [*credentials.CredContext] argument is ignored. +func (c *FileSecretsCredentials) RetrieveWithCredContext(*credentials.CredContext) (credentials.Value, error) { keyId, err := os.ReadFile(c.AccessKeyFile) if err != nil { return credentials.Value{}, err diff --git a/go.mod b/go.mod index da57884..f5a7caa 100644 --- a/go.mod +++ b/go.mod @@ -2,14 +2,14 @@ module github.com/PowerDNS/simpleblob go 1.23 -toolchain go1.24.0 +toolchain go1.24.1 require ( github.com/PowerDNS/go-tlsconfig v0.0.0-20221101135152-0956853b28df github.com/go-logr/logr v1.4.2 - github.com/minio/minio-go/v7 v7.0.78 - github.com/prometheus/client_golang v1.20.4 - github.com/stretchr/testify v1.9.0 + github.com/minio/minio-go/v7 v7.0.88 + github.com/prometheus/client_golang v1.21.1 + github.com/stretchr/testify v1.10.0 github.com/testcontainers/testcontainers-go v0.35.0 github.com/testcontainers/testcontainers-go/modules/minio v0.35.0 gopkg.in/yaml.v2 v2.4.0 @@ -36,13 +36,14 @@ require ( github.com/go-ini/ini v1.67.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/goccy/go-json v0.10.3 // indirect + github.com/goccy/go-json v0.10.5 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/klauspost/compress v1.17.11 // indirect - github.com/klauspost/cpuid/v2 v2.2.8 // indirect + github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.7 // indirect + github.com/minio/crc64nvme v1.0.1 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/patternmatcher v0.6.0 // indirect @@ -57,7 +58,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rs/xid v1.6.0 // indirect github.com/shirou/gopsutil/v3 v3.23.12 // indirect @@ -70,10 +71,10 @@ require ( go.opentelemetry.io/otel v1.24.0 // indirect go.opentelemetry.io/otel/metric v1.24.0 // indirect go.opentelemetry.io/otel/trace v1.24.0 // indirect - golang.org/x/crypto v0.31.0 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/text v0.21.0 // indirect - google.golang.org/protobuf v1.34.2 // indirect + golang.org/x/crypto v0.33.0 // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/text v0.22.0 // indirect + google.golang.org/protobuf v1.36.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 62c8fc2..10ff32d 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= -github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= +github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -65,8 +65,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= -github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= +github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -75,10 +75,12 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +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.78 h1:LqW2zy52fxnI4gg8C2oZviTaKHcBV36scS+RzJnxUFs= -github.com/minio/minio-go/v7 v7.0.78/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0= +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/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= @@ -103,12 +105,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk= +github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -132,8 +134,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -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= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/testcontainers/testcontainers-go v0.35.0 h1:uADsZpTKFAtp8SLK+hMwSaa+X+JiERHtd4sQAFmXeMo= github.com/testcontainers/testcontainers-go v0.35.0/go.mod h1:oEVBj5zrfJTrgjwONs1SsRbnBtH9OKl+IGl3UMcr2B4= github.com/testcontainers/testcontainers-go/modules/minio v0.35.0 h1:oJMrfB0hIABClRsJrVJ43zTEsCVk0JTN7RdTz9r+tk4= @@ -165,16 +167,16 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +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.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -185,18 +187,17 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -214,8 +215,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA= google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 7df513fe93c5746b1b518ca41399ab8ddaf7ce12 Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Wed, 26 Mar 2025 16:01:29 +0100 Subject: [PATCH 5/8] go: upgrade golangci-lint, disable lll, enable gofmt, govet --- .golangci.toml | 21 +++++++++++++++++++++ .golangci.yml | 13 ------------- test.sh | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 .golangci.toml delete mode 100644 .golangci.yml diff --git a/.golangci.toml b/.golangci.toml new file mode 100644 index 0000000..cc1ae05 --- /dev/null +++ b/.golangci.toml @@ -0,0 +1,21 @@ +version = "2" + +[linters] +enable = [ "gocritic", "govet" ] + +[linters.exclusions] +generated = "lax" +presets = [ + "comments", + "common-false-positives", + "legacy", + "std-error-handling" +] +paths = [ "third_party$", "builtin$", "examples$" ] + +[formatters] +enable = [ "goimports", "gofmt" ] + +[formatters.exclusions] +generated = "lax" +paths = [ "third_party$", "builtin$", "examples$" ] diff --git a/.golangci.yml b/.golangci.yml deleted file mode 100644 index ec804fa..0000000 --- a/.golangci.yml +++ /dev/null @@ -1,13 +0,0 @@ -# See https://github.com/golangci/golangci-lint/blob/master/.golangci.yml for more examples - -linters: - enabled: - # In addition to default standard linters (see: golangci-lint help linters) - # Try extra ones line this: golangci-lint run --disable-all --enable=lll - - goimports - - gocritic - - golint - - lll - - - diff --git a/test.sh b/test.sh index f120dcf..b1894b3 100755 --- a/test.sh +++ b/test.sh @@ -6,7 +6,7 @@ go test -count=1 "$@" ./... # Run linters # Configure linters in .golangci.yml -expected_version=1.64.5 +expected_version=2.0.2 expected_version_full=v"$expected_version" golangci_lint_bin=./bin/golangci-lint if ! "$golangci_lint_bin" version | grep -wq "version $expected_version"; then From 05f7f7eed67e4b399411fb9d1fea52d02c2acc06 Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Thu, 27 Mar 2025 17:17:52 +0100 Subject: [PATCH 6/8] add linters to golangci config --- .golangci.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.golangci.toml b/.golangci.toml index cc1ae05..d6dd5fa 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -1,7 +1,12 @@ version = "2" [linters] -enable = [ "gocritic", "govet" ] +enable = [ + "whitespace", + "gocritic", + "bodyclose", + "intrange", +] [linters.exclusions] generated = "lax" From cbee1b434acd5cd3e1a6ac71112f0e07688897cf Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Thu, 27 Mar 2025 17:18:31 +0100 Subject: [PATCH 7/8] add gosec linter --- .golangci.toml | 1 + backends/s3/credentials_test.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.golangci.toml b/.golangci.toml index d6dd5fa..f80d7d0 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -3,6 +3,7 @@ version = "2" [linters] enable = [ "whitespace", + "gosec", "gocritic", "bodyclose", "intrange", diff --git a/backends/s3/credentials_test.go b/backends/s3/credentials_test.go index 28d1786..f4d9c08 100644 --- a/backends/s3/credentials_test.go +++ b/backends/s3/credentials_test.go @@ -169,11 +169,11 @@ func secretsPaths(dir string) (access, secret string) { // in dir. func writeSecrets(t testing.TB, dir, adminUser, password string) { access, secret := secretsPaths(dir) - err := os.WriteFile(access, []byte(adminUser), 0666) + err := os.WriteFile(access, []byte(adminUser), 0600) if err != nil { t.Fatal(err) } - err = os.WriteFile(secret, []byte(password), 0666) + err = os.WriteFile(secret, []byte(password), 0600) if err != nil { t.Fatal(err) } From 89420baa479fece61f8125c0fd5833bb8eef478c Mon Sep 17 00:00:00 2001 From: Rodrigue Geis Date: Thu, 27 Mar 2025 17:22:53 +0100 Subject: [PATCH 8/8] add misspell linter --- .golangci.toml | 1 + backends/s3/credentials_test.go | 2 +- backends/s3/stream.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.golangci.toml b/.golangci.toml index f80d7d0..8c7cfd4 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -7,6 +7,7 @@ enable = [ "gocritic", "bodyclose", "intrange", + "misspell", ] [linters.exclusions] diff --git a/backends/s3/credentials_test.go b/backends/s3/credentials_test.go index f4d9c08..e5a066b 100644 --- a/backends/s3/credentials_test.go +++ b/backends/s3/credentials_test.go @@ -22,7 +22,7 @@ func TestFileSecretsCredentials(t *testing.T) { access, secret := secretsPaths(tempDir) - // Instanciate provider (what we're testing). + // Instantiate provider (what we're testing). provider := &s3.FileSecretsCredentials{ AccessKeyFile: access, SecretKeyFile: secret, diff --git a/backends/s3/stream.go b/backends/s3/stream.go index 0abab6a..1e61b14 100644 --- a/backends/s3/stream.go +++ b/backends/s3/stream.go @@ -64,7 +64,7 @@ type writerWrapper struct { } func (w *writerWrapper) Write(p []byte) (int, error) { - // Not checking the status of ctx explicitely because it will be propagated + // Not checking the status of ctx explicitly because it will be propagated // from the reader goroutine. return w.pw.Write(p) }