From 3a00fd51e400c8bb1acacad45f3f1ea79e6eef77 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Thu, 15 Feb 2024 15:03:22 +0300 Subject: [PATCH 1/3] [#202] go.mod: Update api-go version Signed-off-by: Dmitrii Stepanov --- go.mod | 4 ++-- go.sum | Bin 72928 -> 72928 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 3ede75c..0f566af 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.frostfs.info/TrueCloudLab/frostfs-sdk-go go 1.20 require ( - git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230802075510-964c3edb3f44 + git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240215114728-2a124b95bc02 git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 git.frostfs.info/TrueCloudLab/hrw v1.2.1 @@ -17,6 +17,7 @@ require ( go.uber.org/zap v1.24.0 google.golang.org/grpc v1.55.0 google.golang.org/protobuf v1.30.0 + gopkg.in/yaml.v3 v3.0.1 ) require ( @@ -42,5 +43,4 @@ require ( 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 - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 2f9e78f72ffbcd63b5e11841f5467f0ee8b46d8d..e7f5d23208cab217fa403da36a3023a328e0b412 100644 GIT binary patch delta 199 zcmaE`ljXrqmJOZU0cLuJx(0ei21X_ZMuw(_h9>4l7P>}>hDIhymZnL`21W`QhE~Cj z`JsLV-iF>z$&r?R90WPWL+fn#K@b5&keR7!e=OP*u4d5DLbXR2XXPP(bFp=U*Ca%r)7R9dJP Q$b8M_exB|9JdA+?0LZjEBme*a delta 199 zcmaE`ljXrqmJOZU0j7F}x(0ei21dpP76wKJ=BB2G2D+AJCdtOBDM`j@CMF6QhE`=} zUWHCB`e9X36~=+V6-kK^d790WPX9SmsgOFzjH>oNtH`rv15s0sztVbabCE0PL@|mL3U<9T1A+tab9|s RC(wM&=6;^-{XC3;0su76JW~Jw -- 2.45.2 From aa41f71dcc9880269eeb9a6ff3a23feb4e9c0af3 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Thu, 15 Feb 2024 15:10:56 +0300 Subject: [PATCH 2/3] [#202] eacl: Drop storage group test Signed-off-by: Dmitrii Stepanov --- eacl/record_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/eacl/record_test.go b/eacl/record_test.go index 0bdc37f..a1738fc 100644 --- a/eacl/record_test.go +++ b/eacl/record_test.go @@ -225,14 +225,6 @@ func TestReservedRecords(t *testing.T) { key: v2acl.FilterObjectType, value: "TOMBSTONE", }, - { - f: func(r *Record) { - require.True(t, typ.FromString("STORAGE_GROUP")) - r.AddObjectTypeFilter(MatchStringEqual, *typ) - }, - key: v2acl.FilterObjectType, - value: "STORAGE_GROUP", - }, } for n, testCase := range testSuit { -- 2.45.2 From a86170f53af79b48315e43b7d34794ee92cf4b61 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Thu, 15 Feb 2024 15:12:22 +0300 Subject: [PATCH 3/3] [#202] object: Reset marshal data on `CutPayload` Signed-off-by: Dmitrii Stepanov --- object/object.go | 1 + 1 file changed, 1 insertion(+) diff --git a/object/object.go b/object/object.go index 2685a24..fde26ae 100644 --- a/object/object.go +++ b/object/object.go @@ -571,6 +571,7 @@ func (o *Object) CutPayload() *Object { ov2 := new(object.Object) *ov2 = *(*object.Object)(o) ov2.SetPayload(nil) + ov2.SetMarshalData(nil) return (*Object)(ov2) } -- 2.45.2