From 4dc7770eabdb8235d5236ff155903fc8cb4cca31 Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:09:58 +0400 Subject: [PATCH 1/9] *: Set Go 1.22 as minimum Closes #927. Signed-off-by: Evgenii Baidakov --- .docker/Dockerfile | 2 +- .github/workflows/builds.yml | 2 +- .github/workflows/s3-tests.yml | 2 +- .github/workflows/system-tests.yml | 2 +- .github/workflows/tests.yml | 4 ++-- CHANGELOG.md | 1 + go.mod | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 46a7a35e..8bb6f88f 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-alpine as builder +FROM golang:1.23-alpine as builder ARG BUILD=now ARG REPO=github.com/nspcc-dev/neofs-s3-gw diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 62055d59..7dbfd7d2 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -54,7 +54,7 @@ jobs: uses: actions/setup-go@v5 with: cache: true - go-version: '1.22' + go-version: '1.23' - name: Get tree-service client run: make sync-tree diff --git a/.github/workflows/s3-tests.yml b/.github/workflows/s3-tests.yml index ba0a64f8..7a71ce85 100644 --- a/.github/workflows/s3-tests.yml +++ b/.github/workflows/s3-tests.yml @@ -102,7 +102,7 @@ jobs: uses: actions/setup-go@v5 with: cache: true - go-version: '1.22' + go-version: '1.23' - run: go version - name: Set up Python diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index f28dab5e..02e77994 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -63,7 +63,7 @@ jobs: uses: actions/setup-go@v5 with: cache: true - go-version: '1.22' + go-version: '1.23' - run: go version - name: Set up Python diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fa071ff8..3eab2779 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,7 +46,7 @@ jobs: uses: actions/setup-go@v5 with: cache: true - go-version: '1.22' + go-version: '1.23' - name: Get tree-service client run: make sync-tree @@ -66,7 +66,7 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - go_versions: [ '1.21', '1.22' ] + go_versions: [ '1.22', '1.23' ] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index f2f845be..89ef2b28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This document outlines major changes between releases. ### Added ### Changed +- Go 1.22+ is required to build now (#927) ### Fixed diff --git a/go.mod b/go.mod index 1aabf812..226f3edb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/nspcc-dev/neofs-s3-gw -go 1.21 +go 1.22 require ( github.com/aws/aws-sdk-go v1.55.5 From 9a4d789967c989b3e7f4884ef29be54fb6a8c4e0 Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:26:34 +0400 Subject: [PATCH 2/9] *: Update for loop ranging Signed-off-by: Evgenii Baidakov --- api/auth/center_test.go | 8 ++++---- api/cache/objectslist_test.go | 2 +- api/handler/encryption_test.go | 4 ++-- api/handler/object_list_test.go | 4 ++-- api/handler/s3encoder.go | 6 +++--- api/handler/tagging_test.go | 4 ++-- api/s3errors/errors_test.go | 4 ++-- creds/accessbox/bearer_token_test.go | 2 +- internal/neofs/neofs_test.go | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/auth/center_test.go b/api/auth/center_test.go index 9bda580b..8f07eb8f 100644 --- a/api/auth/center_test.go +++ b/api/auth/center_test.go @@ -111,7 +111,7 @@ func TestSignature(t *testing.T) { // TestAwsEncodedChunkReader checks example from https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-streaming.html func TestAwsEncodedChunkReader(t *testing.T) { chunkOnePayload := make([]byte, 65536) - for i := 0; i < 65536; i++ { + for i := range 65536 { chunkOnePayload[i] = 'a' } @@ -125,7 +125,7 @@ func TestAwsEncodedChunkReader(t *testing.T) { require.NoError(t, err) chunkTwoPayload := make([]byte, 1024) - for i := 0; i < 1024; i++ { + for i := range 1024 { chunkTwoPayload[i] = 'a' } @@ -318,7 +318,7 @@ func TestAwsEncodedChunkReader(t *testing.T) { t.Run("err chunk header too long", func(t *testing.T) { streamSigner := v4.NewChunkSigner("us-east-1", "s3", seedSignature, ts, awsCreds) chunkThreeBody := make([]byte, 4097) - for i := 0; i < len(chunkThreeBody); i++ { + for i := range chunkThreeBody { chunkThreeBody[i] = 'a' } @@ -360,7 +360,7 @@ func TestAwsEncodedWithRequest(t *testing.T) { chunkSize := 65536 payload := make([]byte, totalPayloadLength) - for i := 0; i < totalPayloadLength; i++ { + for i := range totalPayloadLength { payload[i] = 'a' } diff --git a/api/cache/objectslist_test.go b/api/cache/objectslist_test.go index 040eb18b..69fd8196 100644 --- a/api/cache/objectslist_test.go +++ b/api/cache/objectslist_test.go @@ -29,7 +29,7 @@ func TestObjectsListCache(t *testing.T) { cidKey, cidKey2 = cidtest.ID(), cidtest.ID() ) - for i := 0; i < listSize; i++ { + for range listSize { versions = append(versions, &data.NodeVersion{BaseNodeVersion: data.BaseNodeVersion{OID: oidtest.ID()}}) } diff --git a/api/handler/encryption_test.go b/api/handler/encryption_test.go index a523cb75..07d16cc1 100644 --- a/api/handler/encryption_test.go +++ b/api/handler/encryption_test.go @@ -52,7 +52,7 @@ func TestGetEncryptedRange(t *testing.T) { createTestBucket(tc, bktName) var sb strings.Builder - for i := 0; i < 1<<16+11; i++ { + for i := range 1<<16 + 11 { switch i { case 0: sb.Write([]byte("b")) @@ -120,7 +120,7 @@ func equalDataSlices(t *testing.T, expected, actual []byte) { return } - for i := 0; i < len(expected); i++ { + for i := range len(expected) { if expected[i] != actual[i] { require.Equalf(t, expected[i], actual[i], "differ start with '%d' position, length: %d", i, len(expected)) } diff --git a/api/handler/object_list_test.go b/api/handler/object_list_test.go index e4b0c897..ab915dac 100644 --- a/api/handler/object_list_test.go +++ b/api/handler/object_list_test.go @@ -154,12 +154,12 @@ func validateListV2(t *testing.T, tc *handlerContext, bktName, prefix, delimiter require.Equal(t, last, len(response.NextContinuationToken) == 0) require.Len(t, response.Contents, len(checkObjects)) - for i := 0; i < len(checkObjects); i++ { + for i := range checkObjects { require.Equal(t, checkObjects[i], response.Contents[i].Key) } require.Len(t, response.CommonPrefixes, len(checkPrefixes)) - for i := 0; i < len(checkPrefixes); i++ { + for i := range checkPrefixes { require.Equal(t, checkPrefixes[i], response.CommonPrefixes[i].Prefix) } diff --git a/api/handler/s3encoder.go b/api/handler/s3encoder.go index 45fda4da..1dc1cedc 100644 --- a/api/handler/s3encoder.go +++ b/api/handler/s3encoder.go @@ -32,7 +32,7 @@ func shouldEscape(c byte) bool { // while considering some S3 exceptions. func s3URLEncode(s string, mode encoding) string { spaceCount, hexCount := 0, 0 - for i := 0; i < len(s); i++ { + for i := range s { c := s[i] if shouldEscape(c) { if c == ' ' && mode == encodeQueryComponent { @@ -59,7 +59,7 @@ func s3URLEncode(s string, mode encoding) string { if hexCount == 0 { copy(t, s) - for i := 0; i < len(s); i++ { + for i := range s { if s[i] == ' ' { t[i] = '+' } @@ -68,7 +68,7 @@ func s3URLEncode(s string, mode encoding) string { } j := 0 - for i := 0; i < len(s); i++ { + for i := range s { switch c := s[i]; { case c == ' ' && mode == encodeQueryComponent: t[j] = '+' diff --git a/api/handler/tagging_test.go b/api/handler/tagging_test.go index 98b39a79..65e95915 100644 --- a/api/handler/tagging_test.go +++ b/api/handler/tagging_test.go @@ -9,11 +9,11 @@ import ( func TestTagsValidity(t *testing.T) { sbKey := strings.Builder{} - for i := 0; i < keyTagMaxLength; i++ { + for range keyTagMaxLength { sbKey.WriteByte('a') } sbValue := strings.Builder{} - for i := 0; i < valueTagMaxLength; i++ { + for range valueTagMaxLength { sbValue.WriteByte('a') } diff --git a/api/s3errors/errors_test.go b/api/s3errors/errors_test.go index 06ec019d..c3495376 100644 --- a/api/s3errors/errors_test.go +++ b/api/s3errors/errors_test.go @@ -8,7 +8,7 @@ import ( func BenchmarkErrCode(b *testing.B) { err := GetAPIError(ErrNoSuchKey) - for i := 0; i < b.N; i++ { + for range b.N { if IsS3Error(err, ErrNoSuchKey) { _ = err } @@ -18,7 +18,7 @@ func BenchmarkErrCode(b *testing.B) { func BenchmarkErrorsIs(b *testing.B) { err := GetAPIError(ErrNoSuchKey) - for i := 0; i < b.N; i++ { + for range b.N { if errors.Is(err, GetAPIError(ErrNoSuchKey)) { _ = err } diff --git a/creds/accessbox/bearer_token_test.go b/creds/accessbox/bearer_token_test.go index 375eb8b0..7c5572d0 100644 --- a/creds/accessbox/bearer_token_test.go +++ b/creds/accessbox/bearer_token_test.go @@ -127,7 +127,7 @@ func TestAccessboxMultipleKeys(t *testing.T) { gates := make([]*GateData, 0, count) privateKeys := make([]*keys.PrivateKey, 0, count) { // generate keys - for i := 0; i < count; i++ { + for range count { cred, err := keys.NewPrivateKey() require.NoError(t, err) diff --git a/internal/neofs/neofs_test.go b/internal/neofs/neofs_test.go index 10c534d2..387dbfe9 100644 --- a/internal/neofs/neofs_test.go +++ b/internal/neofs/neofs_test.go @@ -100,7 +100,7 @@ func Benchmark(b *testing.B) { b.ResetTimer() b.StartTimer() - for i := 0; i < b.N; i++ { + for range b.N { b.StopTimer() createParams.Payload = bytes.NewReader(payload) createParams.CreationTime = time.Now() @@ -182,7 +182,7 @@ func TestConcurrencyAndConsistency(t *testing.T) { wg := sync.WaitGroup{} wg.Add(gorutines) - for i := 0; i < gorutines; i++ { + for range gorutines { go func() { uploadDownload(ctx, t, neo, p, signer, createParams, &wg) }() @@ -250,7 +250,7 @@ func TestObjectNonce(t *testing.T) { attrTS = object.NewAttribute(object.AttributeTimestamp, strconv.FormatInt(ts, 10)) ) - for i := 0; i < 10; i++ { + for range 10 { var ( obj object.Object nonce = make([]byte, objectNonceSize) From aa2a6d7f8b91f0b42c23915395f08482403eb096 Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:38:30 +0400 Subject: [PATCH 3/9] *: Use slices package instead of append in some cases Signed-off-by: Evgenii Baidakov --- api/auth/center_test.go | 3 ++- api/handler/acl.go | 8 ++++---- api/handler/encryption_test.go | 3 ++- api/layer/tree_mock.go | 4 ++-- api/reqinfo.go | 3 ++- creds/accessbox/accessbox.go | 3 ++- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/api/auth/center_test.go b/api/auth/center_test.go index 8f07eb8f..c6b745e5 100644 --- a/api/auth/center_test.go +++ b/api/auth/center_test.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "net/http" + "slices" "strconv" "strings" "testing" @@ -156,7 +157,7 @@ func TestAwsEncodedChunkReader(t *testing.T) { require.NoError(t, err) - require.Equal(t, append(chunkOnePayload, chunkTwoPayload...), payload.Bytes()) + require.Equal(t, slices.Concat(chunkOnePayload, chunkTwoPayload), payload.Bytes()) }) t.Run("err invalid chunk signature", func(t *testing.T) { diff --git a/api/handler/acl.go b/api/handler/acl.go index 014180ab..bbc7b2ba 100644 --- a/api/handler/acl.go +++ b/api/handler/acl.go @@ -792,7 +792,7 @@ func mergeAst(parent, child *ast) (*ast, bool) { } if newOps != nil { - parentResource.Operations = append(newOps, parentResource.Operations...) + parentResource.Operations = slices.Concat(newOps, parentResource.Operations) } } @@ -841,7 +841,7 @@ func getAstOps(resource *astResource, childOp *astOperation) []*astOperation { func removeAstOp(resource *astResource, group bool, op eacl.Operation, action eacl.Action) { for i, astOp := range resource.Operations { if astOp.IsGroupGrantee() == group && astOp.Op == op && astOp.Action == action { - resource.Operations = append(resource.Operations[:i], resource.Operations[i+1:]...) + resource.Operations = slices.Delete(resource.Operations, i, i+1) return } } @@ -866,7 +866,7 @@ func removeUsers(resource *astResource, astOperation *astOperation, users []user } } if len(filteredUsers) == 0 { // remove ast resource - resource.Operations = append(resource.Operations[:ind], resource.Operations[ind+1:]...) + resource.Operations = slices.Delete(resource.Operations, ind, ind+1) } else { astOp.Users = filteredUsers } @@ -1186,7 +1186,7 @@ func aclToAst(acl *AccessControlPolicy, resInfo *resourceInfo) (*ast, error) { resource := &astResource{resourceInfo: *resInfo} - ops := append(readOps, writeOps...) + ops := slices.Concat(readOps, writeOps) // Expect to have at least 1 full control grant for owner which is set in // parseACLHeaders(). If there is no other grants, then user sets private diff --git a/api/handler/encryption_test.go b/api/handler/encryption_test.go index 07d16cc1..df1663d1 100644 --- a/api/handler/encryption_test.go +++ b/api/handler/encryption_test.go @@ -8,6 +8,7 @@ import ( "io" "net/http" "net/url" + "slices" "strconv" "strings" "testing" @@ -249,7 +250,7 @@ func TestMultipartEncrypted(t *testing.T) { res, _ := getEncryptedObject(t, hc, bktName, objName) require.Equal(t, len(part1)+len(part2), len(res)) - require.Equal(t, append(part1, part2...), res) + require.Equal(t, slices.Concat(part1, part2), res) part2Range := getEncryptedObjectRange(t, hc, bktName, objName, len(part1), len(part1)+len(part2)-1) require.Equal(t, part2[0:], part2Range) diff --git a/api/layer/tree_mock.go b/api/layer/tree_mock.go index 87f6fe99..cbd7b38a 100644 --- a/api/layer/tree_mock.go +++ b/api/layer/tree_mock.go @@ -251,7 +251,7 @@ func (t *TreeServiceMock) RemoveVersion(_ context.Context, bktInfo *data.BucketI for key, versions := range cnrVersionsMap { for i, node := range versions { if node.ID == nodeID { - cnrVersionsMap[key] = append(versions[:i], versions[i+1:]...) + cnrVersionsMap[key] = slices.Delete(versions, i, i+1) return nil } } @@ -468,7 +468,7 @@ LOOP: for i, multipart := range multiparts { if multipart.ID == multipartNodeID { uploadID = multipart.UploadID - cnrMultipartsMap[key] = append(multiparts[:i], multiparts[i+1:]...) + cnrMultipartsMap[key] = slices.Delete(multiparts, i, i+1) break LOOP } } diff --git a/api/reqinfo.go b/api/reqinfo.go index e66b36bc..3f96b925 100644 --- a/api/reqinfo.go +++ b/api/reqinfo.go @@ -6,6 +6,7 @@ import ( "net/http" "net/url" "regexp" + "slices" "strings" "sync" @@ -182,7 +183,7 @@ func (r *ReqInfo) GetTags() []KeyVal { } r.RLock() defer r.RUnlock() - return append([]KeyVal(nil), r.tags...) + return slices.Clone(r.tags) } // SetReqInfo sets ReqInfo in the context. diff --git a/creds/accessbox/accessbox.go b/creds/accessbox/accessbox.go index 23fd7f7c..7c77548b 100644 --- a/creds/accessbox/accessbox.go +++ b/creds/accessbox/accessbox.go @@ -10,6 +10,7 @@ import ( "errors" "fmt" "io" + "slices" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neofs-sdk-go/bearer" @@ -290,7 +291,7 @@ func encrypt(owner *keys.PrivateKey, sender *keys.PublicKey, data []byte) ([]byt return nil, fmt.Errorf("generate random nonce: %w", err) } - return append(hkdfSalt, enc.Seal(nonce, nonce, data, nil)...), nil + return slices.Concat(hkdfSalt, enc.Seal(nonce, nonce, data, nil)), nil } func decrypt(owner *keys.PrivateKey, sender *keys.PublicKey, data []byte) ([]byte, error) { From 1c54695b3d83e474bdf8c2d680dc9fb64a79ca88 Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:46:49 +0400 Subject: [PATCH 4/9] go.mod: Update github.com/minio/sio to v0.4.1 Signed-off-by: Evgenii Baidakov --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89ef2b28..cfdfec5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This document outlines major changes between releases. ### Fixed ### Updated +- github.com/minio/sio from v0.4.0 to v0.4.1 (#927) ## [0.31.0] - 2024-08-20 diff --git a/go.mod b/go.mod index 226f3edb..d5bd6faf 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/bluele/gcache v0.0.2 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 - github.com/minio/sio v0.4.0 + github.com/minio/sio v0.4.1 github.com/nats-io/nats.go v1.34.0 github.com/nspcc-dev/neo-go v0.106.3 github.com/nspcc-dev/neofs-contract v0.20.0 diff --git a/go.sum b/go.sum index 4f765dfd..d6b6ad99 100644 --- a/go.sum +++ b/go.sum @@ -103,8 +103,8 @@ 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/sio v0.4.0 h1:u4SWVEm5lXSqU42ZWawV0D9I5AZ5YMmo2RXpEQ/kRhc= -github.com/minio/sio v0.4.0/go.mod h1:oBSjJeGbBdRMZZwna07sX9EFzZy+ywu5aofRiV1g79I= +github.com/minio/sio v0.4.1 h1:EMe3YBC1nf+sRQia65Rutxi+Z554XPV0dt8BIBA+a/0= +github.com/minio/sio v0.4.1/go.mod h1:oBSjJeGbBdRMZZwna07sX9EFzZy+ywu5aofRiV1g79I= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY= From 225e03c3f07e809a0df07013dd2dc6ca0145914e Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:48:53 +0400 Subject: [PATCH 5/9] go.mod: Update github.com/nats-io/nats.go to v1.37.0 Signed-off-by: Evgenii Baidakov --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfdfec5c..83432bbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This document outlines major changes between releases. ### Updated - github.com/minio/sio from v0.4.0 to v0.4.1 (#927) +- github.com/nats-io/nats.go from v1.34.0 to v1.37.0 (#927) ## [0.31.0] - 2024-08-20 diff --git a/go.mod b/go.mod index d5bd6faf..20e8d688 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/minio/sio v0.4.1 - github.com/nats-io/nats.go v1.34.0 + github.com/nats-io/nats.go v1.37.0 github.com/nspcc-dev/neo-go v0.106.3 github.com/nspcc-dev/neofs-contract v0.20.0 github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20240807160341-3528eb5bb1cc diff --git a/go.sum b/go.sum index d6b6ad99..40e2a7f3 100644 --- a/go.sum +++ b/go.sum @@ -121,8 +121,8 @@ github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nats-io/nats.go v1.34.0 h1:fnxnPCNiwIG5w08rlMcEKTUw4AV/nKyGCOJE8TdhSPk= -github.com/nats-io/nats.go v1.34.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= +github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= +github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= From bad30dea13a92c7e9845b68bf202f72a3d0319f6 Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:49:46 +0400 Subject: [PATCH 6/9] go.mod: Update github.com/nspcc-dev/tzhash to v1.8.2 Signed-off-by: Evgenii Baidakov --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83432bbe..435fc026 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This document outlines major changes between releases. ### Updated - github.com/minio/sio from v0.4.0 to v0.4.1 (#927) - github.com/nats-io/nats.go from v1.34.0 to v1.37.0 (#927) +- github.com/nspcc-dev/tzhash from v1.8.1 to v1.8.2 (#927) ## [0.31.0] - 2024-08-20 diff --git a/go.mod b/go.mod index 20e8d688..255cc09b 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/nspcc-dev/neo-go v0.106.3 github.com/nspcc-dev/neofs-contract v0.20.0 github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20240807160341-3528eb5bb1cc - github.com/nspcc-dev/tzhash v1.8.1 + github.com/nspcc-dev/tzhash v1.8.2 github.com/panjf2000/ants/v2 v2.10.0 github.com/prometheus/client_golang v1.20.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 40e2a7f3..ceb9d3eb 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20240807160341-3528eb5bb1cc h1: github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20240807160341-3528eb5bb1cc/go.mod h1:ewV84r1NACvoBfbKQKzRLUun+Xn5+z9JVqsuCVgv9xI= github.com/nspcc-dev/rfc6979 v0.2.1 h1:8wWxkamHWFmO790GsewSoKUSJjVnL1fmdRpokU/RgRM= github.com/nspcc-dev/rfc6979 v0.2.1/go.mod h1:Tk7h5kyUWkhjyO3zUgFFhy1v2vQv3BvQEntakdtqrWc= -github.com/nspcc-dev/tzhash v1.8.1 h1:Y+BmqGAk1m7mzFhysxZ/he8/srZCoE7YnR3M1GfxP2k= -github.com/nspcc-dev/tzhash v1.8.1/go.mod h1:2ME6GHaF66gcJj/HWGrz1YRseksKgSa/7z686eUeJw4= +github.com/nspcc-dev/tzhash v1.8.2 h1:ebRCbPoEuoqrhC6sSZmrT/jI3h1SzCWakxxV6gp5QAg= +github.com/nspcc-dev/tzhash v1.8.2/go.mod h1:SFwvvB1KyKm45vdWpcOCFpklkUEsXtddnHsk+zq298g= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= From 1668bed7937761ff60ce4d3c16ca90ea7770a8a7 Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:50:35 +0400 Subject: [PATCH 7/9] go.mod: Update github.com/prometheus/client_golang to v1.20.2 Signed-off-by: Evgenii Baidakov --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 435fc026..82c8bb39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This document outlines major changes between releases. - github.com/minio/sio from v0.4.0 to v0.4.1 (#927) - github.com/nats-io/nats.go from v1.34.0 to v1.37.0 (#927) - github.com/nspcc-dev/tzhash from v1.8.1 to v1.8.2 (#927) +- github.com/prometheus/client_golang from v1.20.0 to v1.20.2 (#927) ## [0.31.0] - 2024-08-20 diff --git a/go.mod b/go.mod index 255cc09b..2692d2cc 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20240807160341-3528eb5bb1cc github.com/nspcc-dev/tzhash v1.8.2 github.com/panjf2000/ants/v2 v2.10.0 - github.com/prometheus/client_golang v1.20.0 + github.com/prometheus/client_golang v1.20.2 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index ceb9d3eb..4568e55d 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/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.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= -github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= 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= From d6792d378540bf437251d8113e6aa6715312bd2c Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:55:00 +0400 Subject: [PATCH 8/9] go.mod: github.com/urfave/cli/v2 to v2.27.4 Signed-off-by: Evgenii Baidakov --- CHANGELOG.md | 1 + go.mod | 15 +++++++-------- go.sum | 36 ++++++++++++++---------------------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82c8bb39..06adea3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ This document outlines major changes between releases. - github.com/nats-io/nats.go from v1.34.0 to v1.37.0 (#927) - github.com/nspcc-dev/tzhash from v1.8.1 to v1.8.2 (#927) - github.com/prometheus/client_golang from v1.20.0 to v1.20.2 (#927) +- github.com/urfave/cli/v2 from v2.27.2 to v2.27.4 (#927) ## [0.31.0] - 2024-08-20 diff --git a/go.mod b/go.mod index 2692d2cc..6f0522e5 100644 --- a/go.mod +++ b/go.mod @@ -18,10 +18,10 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - github.com/urfave/cli/v2 v2.27.2 + github.com/urfave/cli/v2 v2.27.4 go.uber.org/zap v1.27.0 golang.org/x/crypto v0.26.0 - google.golang.org/grpc v1.62.1 + google.golang.org/grpc v1.66.0 google.golang.org/protobuf v1.34.2 ) @@ -37,18 +37,18 @@ require ( github.com/nspcc-dev/go-ordered-json v0.0.0-20240301084351-0246b013f8b2 // indirect github.com/nspcc-dev/hrw/v2 v2.0.1 // indirect github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240305074711-35bc78d84dc4 // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect github.com/twmb/murmur3 v1.1.8 // indirect - github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect + github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect go.etcd.io/bbolt v1.3.9 // indirect - golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect + golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect golang.org/x/sync v0.8.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect ) require ( @@ -58,7 +58,6 @@ require ( github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -76,7 +75,7 @@ require ( github.com/spf13/cast v1.7.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.24.0 // indirect golang.org/x/term v0.23.0 golang.org/x/text v0.17.0 // indirect diff --git a/go.sum b/go.sum index 4568e55d..db8856da 100644 --- a/go.sum +++ b/go.sum @@ -63,15 +63,11 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -162,8 +158,8 @@ github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8= github.com/panjf2000/ants/v2 v2.10.0 h1:zhRg1pQUtkyRiOFo2Sbqwjp0GfBNo9cUY2/Grpx1p+8= github.com/panjf2000/ants/v2 v2.10.0/go.mod h1:7ZxyxsqE4vvW0M7LSD8aI3cKwgFhBHbxnlN8mDqHa1I= -github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= -github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -208,11 +204,9 @@ github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= 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.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -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/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= @@ -227,10 +221,10 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/twmb/murmur3 v1.1.8 h1:8Yt9taO/WN3l08xErzjeschgZU2QSrwm1kclYq+0aRg= github.com/twmb/murmur3 v1.1.8/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= -github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI= -github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM= -github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= -github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= +github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8= +github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ= +github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= +github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= @@ -245,16 +239,16 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA= +golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= @@ -284,18 +278,16 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c h1:lfpJ/2rWPa/kJgxyyXM8PrNnfCzcmxJ265mADgwmvLI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= +google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 0e2ceddd978921d30161d386f0d62bd1773088a2 Mon Sep 17 00:00:00 2001 From: Evgenii Baidakov Date: Tue, 3 Sep 2024 11:56:35 +0400 Subject: [PATCH 9/9] linter: Fix staticcheck SA1019: grpc.Dial is deprecated: use NewClient instead. Will be supported throughout 1.x. Signed-off-by: Evgenii Baidakov --- internal/neofs/tree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/neofs/tree.go b/internal/neofs/tree.go index a6e39cfc..7da5f395 100644 --- a/internal/neofs/tree.go +++ b/internal/neofs/tree.go @@ -98,7 +98,7 @@ const ( // NewTreeClient creates instance of TreeClient using provided address and create grpc connection. func NewTreeClient(ctx context.Context, addr string, key *keys.PrivateKey) (*TreeClient, error) { - conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { return nil, fmt.Errorf("did not connect: %v", err) }