From 90e9a85acca029521ed3ab23c20f5d0e977b80c8 Mon Sep 17 00:00:00 2001 From: Anton Nikiforov Date: Thu, 29 Jun 2023 09:44:11 +0300 Subject: [PATCH] [#483] Update dependencies Signed-off-by: Anton Nikiforov --- cmd/frostfs-cli/internal/client/client.go | 6 +- go.mod | 69 +++++++++--------- go.sum | Bin 99899 -> 99007 bytes pkg/core/client/client.go | 2 +- pkg/network/cache/multi.go | 2 +- pkg/services/object/internal/client/client.go | 6 +- 6 files changed, 44 insertions(+), 41 deletions(-) diff --git a/cmd/frostfs-cli/internal/client/client.go b/cmd/frostfs-cli/internal/client/client.go index 0e0aadbb3..d0bbc9cff 100644 --- a/cmd/frostfs-cli/internal/client/client.go +++ b/cmd/frostfs-cli/internal/client/client.go @@ -396,7 +396,7 @@ func PutObject(ctx context.Context, prm PutObjectPrm) (*PutObjectRes, error) { return nil, fmt.Errorf("init object writing: %w", err) } - if wrt.WriteHeader(*prm.hdr) { + if wrt.WriteHeader(ctx, *prm.hdr) { if prm.headerCallback != nil { prm.headerCallback(prm.hdr) } @@ -426,7 +426,7 @@ func PutObject(ctx context.Context, prm PutObjectPrm) (*PutObjectRes, error) { for { n, err = prm.rdr.Read(buf) if n > 0 { - if !wrt.WritePayloadChunk(buf[:n]) { + if !wrt.WritePayloadChunk(ctx, buf[:n]) { break } @@ -442,7 +442,7 @@ func PutObject(ctx context.Context, prm PutObjectPrm) (*PutObjectRes, error) { } } - cliRes, err := wrt.Close() + cliRes, err := wrt.Close(ctx) if err != nil { // here err already carries both status and client errors return nil, fmt.Errorf("client failure: %w", err) } diff --git a/go.mod b/go.mod index aca1d2d6f..4be07aef7 100644 --- a/go.mod +++ b/go.mod @@ -4,40 +4,40 @@ go 1.19 require ( git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230602142716-68021b910acb - git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb + git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230627134746-36f3d39c406a git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6 - git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230623104802-aa8ffebc6328 + git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230628121302-5d62cef27e6c git.frostfs.info/TrueCloudLab/hrw v1.2.1 git.frostfs.info/TrueCloudLab/tzhash v1.8.0 github.com/cheggaaa/pb v1.0.29 github.com/chzyer/readline v1.5.1 github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/google/uuid v1.3.0 - github.com/hashicorp/golang-lru/v2 v2.0.2 - github.com/klauspost/compress v1.16.5 + github.com/hashicorp/golang-lru/v2 v2.0.4 + github.com/klauspost/compress v1.16.6 github.com/mitchellh/go-homedir v1.1.0 github.com/mr-tron/base58 v1.2.0 github.com/multiformats/go-multiaddr v0.9.0 - github.com/nats-io/nats.go v1.25.0 + github.com/nats-io/nats.go v1.27.1 github.com/nspcc-dev/neo-go v0.101.2-0.20230601131642-a0117042e8fc github.com/olekukonko/tablewriter v0.0.5 - github.com/panjf2000/ants/v2 v2.7.4 + github.com/panjf2000/ants/v2 v2.7.5 github.com/paulmach/orb v0.9.2 - github.com/prometheus/client_golang v1.15.1 + github.com/prometheus/client_golang v1.16.0 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.15.0 - github.com/stretchr/testify v1.8.3 + github.com/spf13/viper v1.16.0 + github.com/stretchr/testify v1.8.4 go.etcd.io/bbolt v1.3.7 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 go.uber.org/zap v1.24.0 - golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc - golang.org/x/sync v0.2.0 - golang.org/x/term v0.8.0 - google.golang.org/grpc v1.55.0 - google.golang.org/protobuf v1.30.0 + golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df + golang.org/x/sync v0.3.0 + golang.org/x/term v0.9.0 + google.golang.org/grpc v1.56.1 + google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -45,12 +45,13 @@ require ( git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 // indirect git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect - github.com/benbjohnson/clock v1.1.0 // indirect + github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/consensys/bavard v0.1.13 // indirect - github.com/consensys/gnark-crypto v0.9.1 // indirect + github.com/consensys/gnark-crypto v0.11.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect @@ -61,36 +62,36 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0-rc.0 // indirect - github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect + github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.5 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/holiman/uint256 v1.2.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/go-cid v0.4.1 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/minio/sha256-simd v1.0.0 // indirect + github.com/minio/sha256-simd v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mmcloughlin/addchain v0.4.0 // indirect github.com/multiformats/go-base32 v0.1.0 // indirect github.com/multiformats/go-base36 v0.2.0 // indirect github.com/multiformats/go-multibase v0.2.0 // indirect - github.com/multiformats/go-multihash v0.2.1 // indirect + github.com/multiformats/go-multihash v0.2.3 // indirect github.com/multiformats/go-varint v0.0.7 // indirect github.com/nats-io/nats-server/v2 v2.7.4 // indirect github.com/nats-io/nkeys v0.4.4 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 // indirect - github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20230601131642-a0117042e8fc // indirect + github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20230615193820-9185820289ce // indirect github.com/nspcc-dev/rfc6979 v0.2.0 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.43.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.11.0 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect @@ -99,22 +100,24 @@ require ( github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect github.com/twmb/murmur3 v1.1.8 // indirect - github.com/urfave/cli v1.22.13 // indirect - go.mongodb.org/mongo-driver v1.11.6 // indirect + github.com/urfave/cli v1.22.14 // indirect + go.mongodb.org/mongo-driver v1.12.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/sdk v1.16.0 // indirect - go.opentelemetry.io/proto/otlp v0.19.0 // indirect + go.opentelemetry.io/proto/otlp v0.20.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.9.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + golang.org/x/crypto v0.10.0 // indirect + golang.org/x/net v0.11.0 // indirect + golang.org/x/sys v0.9.0 // indirect + golang.org/x/text v0.10.0 // indirect + google.golang.org/genproto v0.0.0-20230628200519-e449d1ea0e82 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230628200519-e449d1ea0e82 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230628200519-e449d1ea0e82 // indirect gopkg.in/ini.v1 v1.67.0 // indirect lukechampine.com/blake3 v1.2.1 // indirect rsc.io/tmplfunc v0.0.3 // indirect diff --git a/go.sum b/go.sum index dfa8632aa1b0773da300effd7988e3d426c725c0..03e60464114b5feabac5869ee9251cc7f87ac204 100644 GIT binary patch delta 5167 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

y5S}FU`p8V|P zcike%q7(KSaZjHsew^_HpjRP{axKAf8xCvdQxL(v<88$W*DHcAJOUB>Pk-SF2%*kX zz1S@EkvNQ(T`7owv68!Gz_6xl5L&PA2&U*UbcC}lvl#Rj{>1H< z{GY7d!5|EJAVcX@qrG)hOsEVR6?QC)%=!Mw-}%Hl%3xn4nvSQd(W0YeZQy4{-V}p$ z$aRnoL3)OR$C$2yP8+2xMb6n6FTs zuBC{a%^k3bO6d0$ANlg-n?xyl;I&Xs)<7R{4nBkJjKX2bkmEYDrqgttZad3b1@mio zEnSy1d-|D&_mw~V+)+96E@-yR>+OU~dSIAN!dbGlWuD49Gn&tFvAZOg?jT;-y;;X{ zO3$BpxSV%~$dy%%$hU#Rj`HSm;jc_GGcbRsR}h#WxtSu>VBHyS)3GuuzWD6@`{3FC zzWsVRcTSNL3_cNZfETd`A zqDz-l((QA@RqLVp~9YLZPgs_wdu5xe8!@vmNcOD$MUeN^kDiR0wMj;mz!vLc!j zGN%1X*Brr{QB_hAuiYQ;)#8)SKk&!T|Jv;kR$wnE7X=}Sc#N&KO-k>vS{*gQxJIr5 z4_~@ln6Z~KQ4$ga6JW=)PyN~T;^Qy0if_Gm-~LlCUOu{zZ%2*Fz#T2As7qRYugfLE zVio3SxL%347?EDT%XND}klDmO``Z0Sw`S`$;yHfWqRUYtL?#?oZCuf=JPYLTMnwyJ%gnK9o)@fxRskUdjS2eFY+KAyL1 zl4=DrOhBtkUZCg!zs}P+pLMpB)X`8o@Aq?NyZ`xr`;E&OeJd^ec(z#$O<_F}>aARY z9l18ggtpQroT)CW6Ld}tQfggpYjhF5c5VNSSF?NgGSX$4m#IBbfyywthEt|>xDu=Y zu|*65P-GpMwmpW_hB4{uOH_;-vk6a5`&!(tOLd_f&ewl*tz3o)3`c1K;PeTw%9F$( z%iBRcBwoK$jhfT?#HYt|of^9J5zKUln^ens6hSd?RraS%Dc$tyW!?Pf+F1>P-hEV_ zZ@1i>VlX_;g~oQai0k~48UKqdCMsJ~mt?aVgx1it7mH29{)3;s9lHIPKyef&NCH0rCW!)o8Kh3p zyWhM7$-58V0WIHK-Yp1G29ZF)iGiC2qG=dG>bD*_`|=&o<{i6VzXFLEcFO^AELBFt zc3T}THp9`(=z6m@2SyDHn`9uc`7tP0mp-4?*4*x%d!Vc3eTwXm%TViVbq@rNk8!-* z`w$YPP6$gg%2UhKb%NNv@*p(a{q6^$e>eu^Emd~!G64)lSsI0r7=lo{ryqsnvtM`= z`oYnA5CWkI3qG^tT^^%IoWvp=@o@N@zhdK`GYF7^2)q$~2z6@{BqF!Y_?bANNP+J3D#uXT(B&h zkLlerDD=SDYY6l&SI=&6&@a9BzA{k+N}|XKOy`9D z>GD&u?1V;j6sIViA+*Ew1=MrC)$NefXvkqTM(nR#H)}a6QuR8C!i{aI7o$c=CugUA z1bVE6ms~_js!{}VVyG%b03D%d^J0_guD0{M-DR6pjZsn?r6+k`r3|lAX{(@-$4)O( zW&?{|V%6PCPe3<%|DUph^enq9>~bm}E-`Jeoz`sHLTzm3JLDSl1W;cn$tG9oc2wWJ zw1BRiJ?21nU1IPzABuv+j+|!Ll~4~Ce4ATRvPMk!UeD&=L)mg1NhWeS%DIgUr{cr%$&aq5Nk6ee~}C1>U@o)c^nh diff --git a/pkg/core/client/client.go b/pkg/core/client/client.go index bd186006e..422ca1a1a 100644 --- a/pkg/core/client/client.go +++ b/pkg/core/client/client.go @@ -12,7 +12,7 @@ import ( // node's client. type Client interface { ContainerAnnounceUsedSpace(context.Context, client.PrmAnnounceSpace) (*client.ResAnnounceSpace, error) - ObjectPutInit(context.Context, client.PrmObjectPutInit) (*client.ObjectWriter, error) + ObjectPutInit(context.Context, client.PrmObjectPutInit) (client.ObjectWriter, error) ObjectDelete(context.Context, client.PrmObjectDelete) (*client.ResObjectDelete, error) ObjectGetInit(context.Context, client.PrmObjectGet) (*client.ObjectReader, error) ObjectHead(context.Context, client.PrmObjectHead) (*client.ResObjectHead, error) diff --git a/pkg/network/cache/multi.go b/pkg/network/cache/multi.go index ba81df16c..b7f7dc20f 100644 --- a/pkg/network/cache/multi.go +++ b/pkg/network/cache/multi.go @@ -219,7 +219,7 @@ func (s *singleClient) invalidate() { s.Unlock() } -func (x *multiClient) ObjectPutInit(ctx context.Context, p client.PrmObjectPutInit) (res *client.ObjectWriter, err error) { +func (x *multiClient) ObjectPutInit(ctx context.Context, p client.PrmObjectPutInit) (res client.ObjectWriter, err error) { err = x.iterateClients(ctx, func(c clientcore.Client) error { res, err = c.ObjectPutInit(ctx, p) return err diff --git a/pkg/services/object/internal/client/client.go b/pkg/services/object/internal/client/client.go index 17bf6a40f..a54f6cd01 100644 --- a/pkg/services/object/internal/client/client.go +++ b/pkg/services/object/internal/client/client.go @@ -429,11 +429,11 @@ func PutObject(ctx context.Context, prm PutObjectPrm) (*PutObjectRes, error) { return nil, fmt.Errorf("init object writing on client: %w", err) } - if w.WriteHeader(*prm.obj) { - w.WritePayloadChunk(prm.obj.Payload()) + if w.WriteHeader(ctx, *prm.obj) { + w.WritePayloadChunk(ctx, prm.obj.Payload()) } - cliRes, err := w.Close() + cliRes, err := w.Close(ctx) if err == nil { err = apistatus.ErrFromStatus(cliRes.Status()) } else {