[#123] Resolve funlen linter issue

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>

.forgejo/workflows/dco.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.21'
+          go-version: '1.23'
 
       - name: Run commit format checker
         uses: https://git.frostfs.info/TrueCloudLab/dco-go@v3

.forgejo/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.23'
           cache: true
 
       - name: golangci-lint
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.19', '1.20' ]
+        go_versions: [ '1.22', '1.23' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.23'
           cache: true
 
       - name: Run tests

.golangci.yml

@@ -50,7 +50,7 @@ linters:
     - bidichk
     - durationcheck
     - exhaustive
-    - exportloopref
+    - copyloopvar
     - gofmt
     - goimports
     - misspell

.pre-commit-config.yaml

@@ -37,6 +37,6 @@ repos:
          language: system
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.56.2
+    rev: v1.60.3
     hooks:
     - id: golangci-lint

CHANGELOG.md

@@ -47,4 +47,4 @@ Initial public release.
 This project is a fork of [NeoFS](https://github.com/nspcc-dev/neofs-api-go) from version v2.14.0.
 To see CHANGELOG for older versions, refer to https://github.com/nspcc-dev/neofs-api-go/blob/master/CHANGELOG.md.
 
-[Unreleased]: https://github.com/TrueCloudLab/compare/v2.15.0...master
+[Unreleased]: https://git.frostfs.info/TrueCloudLab/frostfs-api-go/compare/v2.16.0...master

CONTRIBUTING.md

@@ -3,8 +3,8 @@
 First, thank you for contributing! We love and encourage pull requests from
 everyone. Please follow the guidelines:
 
-- Check the open [issues](https://github.com/TrueCloudLab/frostfs-api-go/issues) and
-  [pull requests](https://github.com/TrueCloudLab/frostfs-api-go/pulls) for existing
+- Check the open [issues](https://git.frostfs.info/TrueCloudLab/frostfs-api-go/issues) and
+  [pull requests](https://git.frostfs.info/TrueCloudLab/frostfs-api-go/pulls) for existing
   discussions.
 
 - Open an issue first, to discuss a new feature or enhancement.
@@ -26,18 +26,18 @@ send a pull request. We encourage pull requests to discuss code changes. Here
 are the steps in details:
 
 ### Set up your GitHub Repository
-Fork [FrostFS node upstream](https://github.com/TrueCloudLab/frostfs-api-go/fork) source
+Fork [FrostFS node upstream](https://git.frostfs.info/TrueCloudLab/frostfs-api-go/fork) source
 repository to your own personal repository. Copy the URL of your fork (you will
 need it for the `git clone` command below).
 
 ```sh
-$ git clone https://github.com/TrueCloudLab/frostfs-api-go
+$ git clone https://git.frostfs.info/TrueCloudLab/frostfs-api-go
 ```
 
 ### Set up git remote as ``upstream``
 ```sh
 $ cd frostfs-api-go
-$ git remote add upstream https://github.com/TrueCloudLab/frostfs-api-go
+$ git remote add upstream https://git.frostfs.info/TrueCloudLab/frostfs-api-go
 $ git fetch upstream
 $ git merge upstream/master
 ...

Makefile

@@ -79,6 +79,7 @@ $(BIN)/protogen:
 
 protoc-test: protoc $(BIN)/protogen
 	@$(PROTOC_DIR)/bin/protoc \
+			--go_out=. --go_opt=paths=source_relative \
 			--plugin=protoc-gen-go-frostfs=$(abspath $(BIN)/protogen) \
 			--go-frostfs_opt=Mutil/proto/test/test.proto=git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto/test/custom \
 			--go-frostfs_opt=module=git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 \

README.md

@@ -6,22 +6,20 @@
 </p>
 
 ---
-![Tests](https://github.com/TrueCloudLab/frostfs-api-go/workflows/frostfs-api-go%20tests/badge.svg)
-[![codecov](https://codecov.io/gh/TrueCloudLab/frostfs-api-go/branch/master/graph/badge.svg)](https://codecov.io/gh/TrueCloudLab/frostfs-api-go)
-[![Report](https://goreportcard.com/badge/github.com/TrueCloudLab/frostfs-api-go)](https://goreportcard.com/report/github.com/TrueCloudLab/frostfs-api-go)
-[![GitHub release](https://img.shields.io/github/release/TrueCloudLab/frostfs-api-go.svg)](https://github.com/TrueCloudLab/frostfs-api-go)
-![GitHub license](https://img.shields.io/github/license/TrueCloudLab/frostfs-api-go.svg?style=popout)
+![Tests](https://git.frostfs.info/TrueCloudLab/frostfs-api-go/badges/workflows/tests.yml/badge.svg)
+[![Report](https://goreportcard.com/badge/git.frostfs.info/TrueCloudLab/frostfs-api-go)](https://goreportcard.com/report/git.frostfs.info/TrueCloudLab/frostfs-api-go)
+[![Release](https://git.frostfs.info/TrueCloudLab/frostfs-api-go/badges/release.svg)](https://git.frostfs.info/TrueCloudLab/frostfs-api-go)
 
 # Overview
 
-Go implementation of recent [FrostFS API](https://github.com/TrueCloudLab/frostfs-api)
-versions. For a more high-level SDK see [FrostFS SDK](https://github.com/TrueCloudLab/frostfs-sdk-go).
+Go implementation of recent [FrostFS API](https://git.frostfs.info/TrueCloudLab/frostfs-api)
+versions. For a more high-level SDK see [FrostFS SDK](https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go).
 
 ## Frostfs-Api compatibility
 
 |frostfs-api-go version|supported frostfs-api versions|
 |:------------------:|:--------------------------:|
-|v2.14.x|[v2.14.0](https://github.com/TrueCloudLab/frostfs-api/releases/tag/v2.14.0)|
+|v2.14.x|[v2.14.0](https://git.frostfs.info/TrueCloudLab/frostfs-api/releases/tag/v2.14.0)|
 
 ## Contributing
 

acl/bench_test.go

@@ -32,7 +32,7 @@ func BenchmarkTable_ToGRPCMessage(b *testing.B) {
 
 	b.Run("to grpc message", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			raw := tb.ToGRPCMessage()
 			if len(tb.GetRecords()) != len(raw.(*aclGrpc.EACLTable).Records) {
 				b.FailNow()
@@ -41,7 +41,7 @@ func BenchmarkTable_ToGRPCMessage(b *testing.B) {
 	})
 	b.Run("from grpc message", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			tb := new(acl.Table)
 			if tb.FromGRPCMessage(raw) != nil {
 				b.FailNow()

acl/convert.go

@@ -187,28 +187,26 @@ func (f *HeaderFilter) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func HeaderFiltersToGRPC(fs []HeaderFilter) (res []*acl.EACLRecord_Filter) {
+func HeaderFiltersToGRPC(fs []HeaderFilter) (res []acl.EACLRecord_Filter) {
 	if fs != nil {
-		res = make([]*acl.EACLRecord_Filter, 0, len(fs))
+		res = make([]acl.EACLRecord_Filter, 0, len(fs))
 
 		for i := range fs {
-			res = append(res, fs[i].ToGRPCMessage().(*acl.EACLRecord_Filter))
+			res = append(res, *fs[i].ToGRPCMessage().(*acl.EACLRecord_Filter))
 		}
 	}
 
 	return
 }
 
-func HeaderFiltersFromGRPC(fs []*acl.EACLRecord_Filter) (res []HeaderFilter, err error) {
+func HeaderFiltersFromGRPC(fs []acl.EACLRecord_Filter) (res []HeaderFilter, err error) {
 	if fs != nil {
 		res = make([]HeaderFilter, len(fs))
 
 		for i := range fs {
-			if fs[i] != nil {
-				err = res[i].FromGRPCMessage(fs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&fs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -241,28 +239,26 @@ func (t *Target) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func TargetsToGRPC(ts []Target) (res []*acl.EACLRecord_Target) {
+func TargetsToGRPC(ts []Target) (res []acl.EACLRecord_Target) {
 	if ts != nil {
-		res = make([]*acl.EACLRecord_Target, 0, len(ts))
+		res = make([]acl.EACLRecord_Target, 0, len(ts))
 
 		for i := range ts {
-			res = append(res, ts[i].ToGRPCMessage().(*acl.EACLRecord_Target))
+			res = append(res, *ts[i].ToGRPCMessage().(*acl.EACLRecord_Target))
 		}
 	}
 
 	return
 }
 
-func TargetsFromGRPC(fs []*acl.EACLRecord_Target) (res []Target, err error) {
+func TargetsFromGRPC(fs []acl.EACLRecord_Target) (res []Target, err error) {
 	if fs != nil {
 		res = make([]Target, len(fs))
 
 		for i := range fs {
-			if fs[i] != nil {
-				err = res[i].FromGRPCMessage(fs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&fs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -309,28 +305,26 @@ func (r *Record) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func RecordsToGRPC(ts []Record) (res []*acl.EACLRecord) {
+func RecordsToGRPC(ts []Record) (res []acl.EACLRecord) {
 	if ts != nil {
-		res = make([]*acl.EACLRecord, 0, len(ts))
+		res = make([]acl.EACLRecord, 0, len(ts))
 
 		for i := range ts {
-			res = append(res, ts[i].ToGRPCMessage().(*acl.EACLRecord))
+			res = append(res, *ts[i].ToGRPCMessage().(*acl.EACLRecord))
 		}
 	}
 
 	return
 }
 
-func RecordsFromGRPC(fs []*acl.EACLRecord) (res []Record, err error) {
+func RecordsFromGRPC(fs []acl.EACLRecord) (res []Record, err error) {
 	if fs != nil {
 		res = make([]Record, len(fs))
 
 		for i := range fs {
-			if fs[i] != nil {
-				err = res[i].FromGRPCMessage(fs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&fs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -429,9 +423,9 @@ func (c *APEOverride) ToGRPCMessage() grpc.Message {
 		m.SetTarget(c.target.ToGRPCMessage().(*apeGRPC.ChainTarget))
 
 		if len(c.chains) > 0 {
-			apeChains := make([]*apeGRPC.Chain, len(c.chains))
+			apeChains := make([]apeGRPC.Chain, len(c.chains))
 			for i := range c.chains {
-				apeChains[i] = c.chains[i].ToGRPCMessage().(*apeGRPC.Chain)
+				apeChains[i] = *c.chains[i].ToGRPCMessage().(*apeGRPC.Chain)
 			}
 			m.SetChains(apeChains)
 		}
@@ -459,7 +453,7 @@ func (c *APEOverride) FromGRPCMessage(m grpc.Message) error {
 		c.chains = make([]*ape.Chain, len(apeChains))
 		for i := range apeChains {
 			c.chains[i] = new(ape.Chain)
-			if err := c.chains[i].FromGRPCMessage(apeChains[i]); err != nil {
+			if err := c.chains[i].FromGRPCMessage(&apeChains[i]); err != nil {
 				return err
 			}
 		}

acl/types.go

@@ -330,10 +330,18 @@ func (bt *BearerTokenBody) SetEACL(v *Table) {
 }
 
 func (t *APEOverride) GetTarget() *ape.ChainTarget {
+	if t == nil {
+		return nil
+	}
+
 	return t.target
 }
 
 func (t *APEOverride) GetChains() []*ape.Chain {
+	if t == nil {
+		return nil
+	}
+
 	return t.chains
 }
 

ape/types.go

@@ -53,6 +53,10 @@ func (c *Chain) SetKind(kind chainKind) {
 }
 
 func (c *Chain) GetKind() chainKind {
+	if c == nil {
+		return nil
+	}
+
 	return c.kind
 }
 
@@ -67,5 +71,9 @@ func (c *ChainRaw) SetRaw(raw []byte) {
 }
 
 func (c *ChainRaw) GetRaw() []byte {
+	if c == nil {
+		return nil
+	}
+
 	return c.Raw
 }

apemanager/convert.go

@@ -296,9 +296,9 @@ func (respBody *ListChainsResponseBody) ToGRPCMessage() grpc.Message {
 	if respBody != nil {
 		respBodygrpc = new(apemanager.ListChainsResponse_Body)
 
-		chainsgrpc := make([]*apeGRPC.Chain, 0, len(respBody.GetChains()))
+		chainsgrpc := make([]apeGRPC.Chain, 0, len(respBody.GetChains()))
 		for _, chain := range respBody.GetChains() {
-			chainsgrpc = append(chainsgrpc, chain.ToGRPCMessage().(*apeGRPC.Chain))
+			chainsgrpc = append(chainsgrpc, *chain.ToGRPCMessage().(*apeGRPC.Chain))
 		}
 
 		respBodygrpc.SetChains(chainsgrpc)
@@ -317,7 +317,7 @@ func (respBody *ListChainsResponseBody) FromGRPCMessage(m grpc.Message) error {
 
 	for _, chaingrpc := range respBodygrpc.GetChains() {
 		chain := new(ape.Chain)
-		if err := chain.FromGRPCMessage(chaingrpc); err != nil {
+		if err := chain.FromGRPCMessage(&chaingrpc); err != nil {
 			return err
 		}
 		chains = append(chains, chain)

apemanager/types.go

@@ -16,6 +16,10 @@ func (r *AddChainRequest) SetBody(body *AddChainRequestBody) {
 }
 
 func (r *AddChainRequest) GetBody() *AddChainRequestBody {
+	if r == nil {
+		return nil
+	}
+
 	return r.body
 }
 
@@ -30,6 +34,10 @@ func (rb *AddChainRequestBody) SetTarget(target *ape.ChainTarget) {
 }
 
 func (rb *AddChainRequestBody) GetTarget() *ape.ChainTarget {
+	if rb == nil {
+		return nil
+	}
+
 	return rb.target
 }
 
@@ -38,6 +46,10 @@ func (rb *AddChainRequestBody) SetChain(chain *ape.Chain) {
 }
 
 func (rb *AddChainRequestBody) GetChain() *ape.Chain {
+	if rb == nil {
+		return nil
+	}
+
 	return rb.chain
 }
 
@@ -52,6 +64,10 @@ func (r *AddChainResponse) SetBody(body *AddChainResponseBody) {
 }
 
 func (r *AddChainResponse) GetBody() *AddChainResponseBody {
+	if r == nil {
+		return nil
+	}
+
 	return r.body
 }
 
@@ -64,6 +80,10 @@ func (rb *AddChainResponseBody) SetChainID(chainID []byte) {
 }
 
 func (rb *AddChainResponseBody) GetChainID() []byte {
+	if rb == nil {
+		return nil
+	}
+
 	return rb.chainID
 }
 
@@ -78,6 +98,10 @@ func (r *RemoveChainRequest) SetBody(body *RemoveChainRequestBody) {
 }
 
 func (r *RemoveChainRequest) GetBody() *RemoveChainRequestBody {
+	if r == nil {
+		return nil
+	}
+
 	return r.body
 }
 
@@ -92,6 +116,10 @@ func (rb *RemoveChainRequestBody) SetTarget(target *ape.ChainTarget) {
 }
 
 func (rb *RemoveChainRequestBody) GetTarget() *ape.ChainTarget {
+	if rb == nil {
+		return nil
+	}
+
 	return rb.target
 }
 
@@ -100,6 +128,10 @@ func (rb *RemoveChainRequestBody) SetChainID(chainID []byte) {
 }
 
 func (rb *RemoveChainRequestBody) GetChainID() []byte {
+	if rb == nil {
+		return nil
+	}
+
 	return rb.chainID
 }
 
@@ -116,6 +148,10 @@ func (r *RemoveChainResponse) SetBody(body *RemoveChainResponseBody) {
 }
 
 func (r *RemoveChainResponse) GetBody() *RemoveChainResponseBody {
+	if r == nil {
+		return nil
+	}
+
 	return r.body
 }
 
@@ -130,6 +166,10 @@ func (r *ListChainsRequest) SetBody(body *ListChainsRequestBody) {
 }
 
 func (r *ListChainsRequest) GetBody() *ListChainsRequestBody {
+	if r == nil {
+		return nil
+	}
+
 	return r.body
 }
 
@@ -142,6 +182,10 @@ func (rb *ListChainsRequestBody) SetTarget(target *ape.ChainTarget) {
 }
 
 func (rb *ListChainsRequestBody) GetTarget() *ape.ChainTarget {
+	if rb == nil {
+		return nil
+	}
+
 	return rb.target
 }
 
@@ -156,6 +200,10 @@ func (r *ListChainsResponse) SetBody(body *ListChainsResponseBody) {
 }
 
 func (r *ListChainsResponse) GetBody() *ListChainsResponseBody {
+	if r == nil {
+		return nil
+	}
+
 	return r.body
 }
 
@@ -170,5 +218,9 @@ func (r *ListChainsResponseBody) SetChains(chains []*ape.Chain) {
 }
 
 func (r *ListChainsResponseBody) GetChains() []*ape.Chain {
+	if r == nil {
+		return nil
+	}
+
 	return r.chains
 }

container/convert.go

@@ -1,8 +1,6 @@
 package container
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
-	aclGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl/grpc"
 	container "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container/grpc"
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
 	netmapGRPC "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap/grpc"
@@ -39,28 +37,26 @@ func (a *Attribute) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func AttributesToGRPC(xs []Attribute) (res []*container.Container_Attribute) {
+func AttributesToGRPC(xs []Attribute) (res []container.Container_Attribute) {
 	if xs != nil {
-		res = make([]*container.Container_Attribute, 0, len(xs))
+		res = make([]container.Container_Attribute, 0, len(xs))
 
 		for i := range xs {
-			res = append(res, xs[i].ToGRPCMessage().(*container.Container_Attribute))
+			res = append(res, *xs[i].ToGRPCMessage().(*container.Container_Attribute))
 		}
 	}
 
 	return
 }
 
-func AttributesFromGRPC(xs []*container.Container_Attribute) (res []Attribute, err error) {
+func AttributesFromGRPC(xs []container.Container_Attribute) (res []Attribute, err error) {
 	if xs != nil {
 		res = make([]Attribute, len(xs))
 
 		for i := range xs {
-			if xs[i] != nil {
-				err = res[i].FromGRPCMessage(xs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&xs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -766,175 +762,3 @@ func (r *ListResponse) FromGRPCMessage(m grpc.Message) error {
 
 	return r.ResponseHeaders.FromMessage(v)
 }
-
-func (r *GetExtendedACLRequestBody) ToGRPCMessage() grpc.Message {
-	var m *container.GetExtendedACLRequest_Body
-
-	if r != nil {
-		m = new(container.GetExtendedACLRequest_Body)
-
-		m.SetContainerId(r.cid.ToGRPCMessage().(*refsGRPC.ContainerID))
-	}
-
-	return m
-}
-
-func (r *GetExtendedACLRequestBody) FromGRPCMessage(m grpc.Message) error {
-	v, ok := m.(*container.GetExtendedACLRequest_Body)
-	if !ok {
-		return message.NewUnexpectedMessageType(m, v)
-	}
-
-	var err error
-
-	cid := v.GetContainerId()
-	if cid == nil {
-		r.cid = nil
-	} else {
-		if r.cid == nil {
-			r.cid = new(refs.ContainerID)
-		}
-
-		err = r.cid.FromGRPCMessage(cid)
-	}
-
-	return err
-}
-
-func (r *GetExtendedACLRequest) ToGRPCMessage() grpc.Message {
-	var m *container.GetExtendedACLRequest
-
-	if r != nil {
-		m = new(container.GetExtendedACLRequest)
-
-		m.SetBody(r.body.ToGRPCMessage().(*container.GetExtendedACLRequest_Body))
-		r.RequestHeaders.ToMessage(m)
-	}
-
-	return m
-}
-
-func (r *GetExtendedACLRequest) FromGRPCMessage(m grpc.Message) error {
-	v, ok := m.(*container.GetExtendedACLRequest)
-	if !ok {
-		return message.NewUnexpectedMessageType(m, v)
-	}
-
-	var err error
-
-	body := v.GetBody()
-	if body == nil {
-		r.body = nil
-	} else {
-		if r.body == nil {
-			r.body = new(GetExtendedACLRequestBody)
-		}
-
-		err = r.body.FromGRPCMessage(body)
-		if err != nil {
-			return err
-		}
-	}
-
-	return r.RequestHeaders.FromMessage(v)
-}
-
-func (r *GetExtendedACLResponseBody) ToGRPCMessage() grpc.Message {
-	var m *container.GetExtendedACLResponse_Body
-
-	if r != nil {
-		m = new(container.GetExtendedACLResponse_Body)
-
-		m.SetEacl(r.eacl.ToGRPCMessage().(*aclGRPC.EACLTable))
-		m.SetSignature(toSignatureRFC6979(r.sig))
-		m.SetSessionToken(r.token.ToGRPCMessage().(*sessionGRPC.SessionToken))
-	}
-
-	return m
-}
-
-func (r *GetExtendedACLResponseBody) FromGRPCMessage(m grpc.Message) error {
-	v, ok := m.(*container.GetExtendedACLResponse_Body)
-	if !ok {
-		return message.NewUnexpectedMessageType(m, v)
-	}
-
-	var err error
-
-	eacl := v.GetEacl()
-	if eacl == nil {
-		r.eacl = nil
-	} else {
-		if r.eacl == nil {
-			r.eacl = new(acl.Table)
-		}
-
-		err = r.eacl.FromGRPCMessage(eacl)
-		if err != nil {
-			return err
-		}
-	}
-
-	sig := v.GetSignature()
-	if sig == nil {
-		r.sig = nil
-	} else {
-		if r.sig == nil {
-			r.sig = new(refs.Signature)
-		}
-
-		r.sig.SetKey(sig.GetKey())
-		r.sig.SetSign(sig.GetSign())
-	}
-
-	token := v.GetSessionToken()
-	if token == nil {
-		r.token = nil
-	} else {
-		if r.token == nil {
-			r.token = new(session.Token)
-		}
-
-		err = r.token.FromGRPCMessage(token)
-	}
-
-	return err
-}
-
-func (r *GetExtendedACLResponse) ToGRPCMessage() grpc.Message {
-	var m *container.GetExtendedACLResponse
-
-	if r != nil {
-		m = new(container.GetExtendedACLResponse)
-
-		m.SetBody(r.body.ToGRPCMessage().(*container.GetExtendedACLResponse_Body))
-		r.ResponseHeaders.ToMessage(m)
-	}
-
-	return m
-}
-
-func (r *GetExtendedACLResponse) FromGRPCMessage(m grpc.Message) error {
-	v, ok := m.(*container.GetExtendedACLResponse)
-	if !ok {
-		return message.NewUnexpectedMessageType(m, v)
-	}
-
-	var err error
-
-	body := v.GetBody()
-	if body == nil {
-		r.body = nil
-	} else {
-		if r.body == nil {
-			r.body = new(GetExtendedACLResponseBody)
-		}
-
-		err = r.body.FromGRPCMessage(body)
-		if err != nil {
-			return err
-		}
-	}
-
-	return r.ResponseHeaders.FromMessage(v)
-}

container/grpc/service_frostfs_fuzz.go

@@ -157,41 +157,3 @@ func DoFuzzJSONListResponse(data []byte) int {
 	}
 	return 1
 }
-func DoFuzzProtoGetExtendedACLRequest(data []byte) int {
-	msg := new(GetExtendedACLRequest)
-	if err := msg.UnmarshalProtobuf(data); err != nil {
-		return 0
-	}
-	_ = msg.MarshalProtobuf(nil)
-	return 1
-}
-func DoFuzzJSONGetExtendedACLRequest(data []byte) int {
-	msg := new(GetExtendedACLRequest)
-	if err := msg.UnmarshalJSON(data); err != nil {
-		return 0
-	}
-	_, err := msg.MarshalJSON()
-	if err != nil {
-		panic(err)
-	}
-	return 1
-}
-func DoFuzzProtoGetExtendedACLResponse(data []byte) int {
-	msg := new(GetExtendedACLResponse)
-	if err := msg.UnmarshalProtobuf(data); err != nil {
-		return 0
-	}
-	_ = msg.MarshalProtobuf(nil)
-	return 1
-}
-func DoFuzzJSONGetExtendedACLResponse(data []byte) int {
-	msg := new(GetExtendedACLResponse)
-	if err := msg.UnmarshalJSON(data); err != nil {
-		return 0
-	}
-	_, err := msg.MarshalJSON()
-	if err != nil {
-		panic(err)
-	}
-	return 1
-}

container/grpc/service_frostfs_test.go

@@ -89,23 +89,3 @@ func FuzzJSONListResponse(f *testing.F) {
 		DoFuzzJSONListResponse(data)
 	})
 }
-func FuzzProtoGetExtendedACLRequest(f *testing.F) {
-	f.Fuzz(func(t *testing.T, data []byte) {
-		DoFuzzProtoGetExtendedACLRequest(data)
-	})
-}
-func FuzzJSONGetExtendedACLRequest(f *testing.F) {
-	f.Fuzz(func(t *testing.T, data []byte) {
-		DoFuzzJSONGetExtendedACLRequest(data)
-	})
-}
-func FuzzProtoGetExtendedACLResponse(f *testing.F) {
-	f.Fuzz(func(t *testing.T, data []byte) {
-		DoFuzzProtoGetExtendedACLResponse(data)
-	})
-}
-func FuzzJSONGetExtendedACLResponse(f *testing.F) {
-	f.Fuzz(func(t *testing.T, data []byte) {
-		DoFuzzJSONGetExtendedACLResponse(data)
-	})
-}

container/marshal.go

@@ -34,12 +34,6 @@ const (
 	listReqBodyOwnerField = 1
 
 	listRespBodyIDsField = 1
-
-	getEACLReqBodyIDField = 1
-
-	getEACLRespBodyTableField     = 1
-	getEACLRespBodySignatureField = 2
-	getEACLRespBodyTokenField     = 3
 )
 
 func (a *Attribute) StableMarshal(buf []byte) []byte {
@@ -349,65 +343,3 @@ func (r *ListResponseBody) StableSize() (size int) {
 func (r *ListResponseBody) Unmarshal(data []byte) error {
 	return message.Unmarshal(r, data, new(container.ListResponse_Body))
 }
-
-func (r *GetExtendedACLRequestBody) StableMarshal(buf []byte) []byte {
-	if r == nil {
-		return []byte{}
-	}
-
-	if buf == nil {
-		buf = make([]byte, r.StableSize())
-	}
-
-	protoutil.NestedStructureMarshal(getEACLReqBodyIDField, buf, r.cid)
-
-	return buf
-}
-
-func (r *GetExtendedACLRequestBody) StableSize() (size int) {
-	if r == nil {
-		return 0
-	}
-
-	size += protoutil.NestedStructureSize(getEACLReqBodyIDField, r.cid)
-
-	return size
-}
-
-func (r *GetExtendedACLRequestBody) Unmarshal(data []byte) error {
-	return message.Unmarshal(r, data, new(container.GetExtendedACLRequest_Body))
-}
-
-func (r *GetExtendedACLResponseBody) StableMarshal(buf []byte) []byte {
-	if r == nil {
-		return []byte{}
-	}
-
-	if buf == nil {
-		buf = make([]byte, r.StableSize())
-	}
-
-	var offset int
-
-	offset += protoutil.NestedStructureMarshal(getEACLRespBodyTableField, buf[offset:], r.eacl)
-	offset += protoutil.NestedStructureMarshal(getEACLRespBodySignatureField, buf[offset:], r.sig)
-	protoutil.NestedStructureMarshal(getEACLRespBodyTokenField, buf[offset:], r.token)
-
-	return buf
-}
-
-func (r *GetExtendedACLResponseBody) StableSize() (size int) {
-	if r == nil {
-		return 0
-	}
-
-	size += protoutil.NestedStructureSize(getEACLRespBodyTableField, r.eacl)
-	size += protoutil.NestedStructureSize(getEACLRespBodySignatureField, r.sig)
-	size += protoutil.NestedStructureSize(getEACLRespBodyTokenField, r.token)
-
-	return size
-}
-
-func (r *GetExtendedACLResponseBody) Unmarshal(data []byte) error {
-	return message.Unmarshal(r, data, new(container.GetExtendedACLResponse_Body))
-}

container/message_test.go

@@ -32,9 +32,5 @@ func TestMessageConvert(t *testing.T) {
 		func(empty bool) message.Message { return containertest.GenerateGetRequest(empty) },
 		func(empty bool) message.Message { return containertest.GenerateGetResponseBody(empty) },
 		func(empty bool) message.Message { return containertest.GenerateGetResponse(empty) },
-		func(empty bool) message.Message { return containertest.GenerateGetExtendedACLRequestBody(empty) },
-		func(empty bool) message.Message { return containertest.GenerateGetExtendedACLRequest(empty) },
-		func(empty bool) message.Message { return containertest.GenerateGetExtendedACLResponseBody(empty) },
-		func(empty bool) message.Message { return containertest.GenerateGetExtendedACLResponse(empty) },
 	)
 }

container/test/generate.go

@@ -1,7 +1,8 @@
 package containertest
 
 import (
-	acltest "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl/test"
+	"crypto/rand"
+
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
 	netmaptest "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap/test"
 	refstest "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs/test"
@@ -36,8 +37,11 @@ func GenerateContainer(empty bool) *container.Container {
 	m := new(container.Container)
 
 	if !empty {
+		nonce := make([]byte, 16)
+		_, _ = rand.Read(nonce)
+
 		m.SetBasicACL(12)
-		m.SetNonce([]byte{1, 2, 3})
+		m.SetNonce(nonce)
 		m.SetOwnerID(refstest.GenerateOwnerID(false))
 		m.SetAttributes(GenerateAttributes(false))
 		m.SetPlacementPolicy(netmaptest.GeneratePlacementPolicy(false))
@@ -234,52 +238,3 @@ func GenerateListResponse(empty bool) *container.ListResponse {
 
 	return m
 }
-
-func GenerateGetExtendedACLRequestBody(empty bool) *container.GetExtendedACLRequestBody {
-	m := new(container.GetExtendedACLRequestBody)
-
-	if !empty {
-		m.SetContainerID(refstest.GenerateContainerID(false))
-	}
-
-	return m
-}
-
-func GenerateGetExtendedACLRequest(empty bool) *container.GetExtendedACLRequest {
-	m := new(container.GetExtendedACLRequest)
-
-	if !empty {
-		m.SetBody(GenerateGetExtendedACLRequestBody(false))
-	}
-
-	m.SetMetaHeader(sessiontest.GenerateRequestMetaHeader(empty))
-	m.SetVerificationHeader(sessiontest.GenerateRequestVerificationHeader(empty))
-
-	return m
-}
-
-func GenerateGetExtendedACLResponseBody(empty bool) *container.GetExtendedACLResponseBody {
-	m := new(container.GetExtendedACLResponseBody)
-
-	if !empty {
-		m.SetEACL(acltest.GenerateTable(false))
-	}
-
-	m.SetSignature(refstest.GenerateSignature(empty))
-	m.SetSessionToken(sessiontest.GenerateSessionToken(empty))
-
-	return m
-}
-
-func GenerateGetExtendedACLResponse(empty bool) *container.GetExtendedACLResponse {
-	m := new(container.GetExtendedACLResponse)
-
-	if !empty {
-		m.SetBody(GenerateGetExtendedACLResponseBody(false))
-	}
-
-	m.SetMetaHeader(sessiontest.GenerateResponseMetaHeader(empty))
-	m.SetVerificationHeader(sessiontest.GenerateResponseVerificationHeader(empty))
-
-	return m
-}

container/types.go

@@ -1,7 +1,6 @@
 package container
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
@@ -110,30 +109,6 @@ type ListResponse struct {
 	session.ResponseHeaders
 }
 
-type GetExtendedACLRequestBody struct {
-	cid *refs.ContainerID
-}
-
-type GetExtendedACLRequest struct {
-	body *GetExtendedACLRequestBody
-
-	session.RequestHeaders
-}
-
-type GetExtendedACLResponseBody struct {
-	eacl *acl.Table
-
-	sig *refs.Signature
-
-	token *session.Token
-}
-
-type GetExtendedACLResponse struct {
-	body *GetExtendedACLResponseBody
-
-	session.ResponseHeaders
-}
-
 func (a *Attribute) GetKey() string {
 	if a != nil {
 		return a.key
@@ -469,81 +444,3 @@ func (r *ListResponse) GetBody() *ListResponseBody {
 func (r *ListResponse) SetBody(v *ListResponseBody) {
 	r.body = v
 }
-
-func (r *GetExtendedACLRequestBody) GetContainerID() *refs.ContainerID {
-	if r != nil {
-		return r.cid
-	}
-
-	return nil
-}
-
-func (r *GetExtendedACLRequestBody) SetContainerID(v *refs.ContainerID) {
-	r.cid = v
-}
-
-func (r *GetExtendedACLRequest) GetBody() *GetExtendedACLRequestBody {
-	if r != nil {
-		return r.body
-	}
-
-	return nil
-}
-
-func (r *GetExtendedACLRequest) SetBody(v *GetExtendedACLRequestBody) {
-	r.body = v
-}
-
-func (r *GetExtendedACLResponseBody) GetEACL() *acl.Table {
-	if r != nil {
-		return r.eacl
-	}
-
-	return nil
-}
-
-func (r *GetExtendedACLResponseBody) SetEACL(v *acl.Table) {
-	r.eacl = v
-}
-
-func (r *GetExtendedACLResponseBody) GetSignature() *refs.Signature {
-	if r != nil {
-		return r.sig
-	}
-
-	return nil
-}
-
-func (r *GetExtendedACLResponseBody) SetSignature(v *refs.Signature) {
-	// TODO: (neofs-api-go#381) avoid this hack (e.g. create refs.SignatureRFC6979 type)
-	v.SetScheme(0)
-	r.sig = v
-}
-
-// GetSessionToken returns token of the session within which requested
-// eACL table was set.
-func (r *GetExtendedACLResponseBody) GetSessionToken() *session.Token {
-	if r != nil {
-		return r.token
-	}
-
-	return nil
-}
-
-// SetSessionToken sets token of the session within which requested
-// eACL table was set.
-func (r *GetExtendedACLResponseBody) SetSessionToken(v *session.Token) {
-	r.token = v
-}
-
-func (r *GetExtendedACLResponse) GetBody() *GetExtendedACLResponseBody {
-	if r != nil {
-		return r.body
-	}
-
-	return nil
-}
-
-func (r *GetExtendedACLResponse) SetBody(v *GetExtendedACLResponseBody) {
-	r.body = v
-}

go.mod

@@ -1,15 +1,15 @@
 module git.frostfs.info/TrueCloudLab/frostfs-api-go/v2
 
-go 1.20
+go 1.22
 
 require (
 	git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0
 	github.com/VictoriaMetrics/easyproto v0.1.4
 	github.com/mailru/easyjson v0.7.7
 	github.com/stretchr/testify v1.8.3
-	golang.org/x/sync v0.6.0
-	google.golang.org/grpc v1.63.2
-	google.golang.org/protobuf v1.33.0
+	golang.org/x/sync v0.7.0
+	google.golang.org/grpc v1.66.2
+	google.golang.org/protobuf v1.34.1
 )
 
 require (
@@ -19,10 +19,10 @@ require (
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -8,6 +8,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -25,20 +26,20 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
-google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
-google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+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/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
+google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
+google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

netmap/convert.go

@@ -45,28 +45,26 @@ func (f *Filter) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func FiltersToGRPC(fs []Filter) (res []*netmap.Filter) {
+func FiltersToGRPC(fs []Filter) (res []netmap.Filter) {
 	if fs != nil {
-		res = make([]*netmap.Filter, 0, len(fs))
+		res = make([]netmap.Filter, 0, len(fs))
 
 		for i := range fs {
-			res = append(res, fs[i].ToGRPCMessage().(*netmap.Filter))
+			res = append(res, *fs[i].ToGRPCMessage().(*netmap.Filter))
 		}
 	}
 
 	return
 }
 
-func FiltersFromGRPC(fs []*netmap.Filter) (res []Filter, err error) {
+func FiltersFromGRPC(fs []netmap.Filter) (res []Filter, err error) {
 	if fs != nil {
 		res = make([]Filter, len(fs))
 
 		for i := range fs {
-			if fs[i] != nil {
-				err = res[i].FromGRPCMessage(fs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&fs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -105,28 +103,26 @@ func (s *Selector) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func SelectorsToGRPC(ss []Selector) (res []*netmap.Selector) {
+func SelectorsToGRPC(ss []Selector) (res []netmap.Selector) {
 	if ss != nil {
-		res = make([]*netmap.Selector, 0, len(ss))
+		res = make([]netmap.Selector, 0, len(ss))
 
 		for i := range ss {
-			res = append(res, ss[i].ToGRPCMessage().(*netmap.Selector))
+			res = append(res, *ss[i].ToGRPCMessage().(*netmap.Selector))
 		}
 	}
 
 	return
 }
 
-func SelectorsFromGRPC(ss []*netmap.Selector) (res []Selector, err error) {
+func SelectorsFromGRPC(ss []netmap.Selector) (res []Selector, err error) {
 	if ss != nil {
 		res = make([]Selector, len(ss))
 
 		for i := range ss {
-			if ss[i] != nil {
-				err = res[i].FromGRPCMessage(ss[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&ss[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -163,28 +159,26 @@ func (r *Replica) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func ReplicasToGRPC(rs []Replica) (res []*netmap.Replica) {
+func ReplicasToGRPC(rs []Replica) (res []netmap.Replica) {
 	if rs != nil {
-		res = make([]*netmap.Replica, 0, len(rs))
+		res = make([]netmap.Replica, 0, len(rs))
 
 		for i := range rs {
-			res = append(res, rs[i].ToGRPCMessage().(*netmap.Replica))
+			res = append(res, *rs[i].ToGRPCMessage().(*netmap.Replica))
 		}
 	}
 
 	return
 }
 
-func ReplicasFromGRPC(rs []*netmap.Replica) (res []Replica, err error) {
+func ReplicasFromGRPC(rs []netmap.Replica) (res []Replica, err error) {
 	if rs != nil {
 		res = make([]Replica, len(rs))
 
 		for i := range rs {
-			if rs[i] != nil {
-				err = res[i].FromGRPCMessage(rs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&rs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -289,28 +283,26 @@ func (a *Attribute) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func AttributesToGRPC(as []Attribute) (res []*netmap.NodeInfo_Attribute) {
+func AttributesToGRPC(as []Attribute) (res []netmap.NodeInfo_Attribute) {
 	if as != nil {
-		res = make([]*netmap.NodeInfo_Attribute, 0, len(as))
+		res = make([]netmap.NodeInfo_Attribute, 0, len(as))
 
 		for i := range as {
-			res = append(res, as[i].ToGRPCMessage().(*netmap.NodeInfo_Attribute))
+			res = append(res, *as[i].ToGRPCMessage().(*netmap.NodeInfo_Attribute))
 		}
 	}
 
 	return
 }
 
-func AttributesFromGRPC(as []*netmap.NodeInfo_Attribute) (res []Attribute, err error) {
+func AttributesFromGRPC(as []netmap.NodeInfo_Attribute) (res []Attribute, err error) {
 	if as != nil {
 		res = make([]Attribute, len(as))
 
 		for i := range as {
-			if as[i] != nil {
-				err = res[i].FromGRPCMessage(as[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&as[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -528,13 +520,13 @@ func (x *NetworkConfig) ToGRPCMessage() grpc.Message {
 	if x != nil {
 		m = new(netmap.NetworkConfig)
 
-		var ps []*netmap.NetworkConfig_Parameter
+		var ps []netmap.NetworkConfig_Parameter
 
 		if ln := len(x.ps); ln > 0 {
-			ps = make([]*netmap.NetworkConfig_Parameter, 0, ln)
+			ps = make([]netmap.NetworkConfig_Parameter, 0, ln)
 
-			for i := 0; i < ln; i++ {
-				ps = append(ps, x.ps[i].ToGRPCMessage().(*netmap.NetworkConfig_Parameter))
+			for i := range ln {
+				ps = append(ps, *x.ps[i].ToGRPCMessage().(*netmap.NetworkConfig_Parameter))
 			}
 		}
 
@@ -560,11 +552,9 @@ func (x *NetworkConfig) FromGRPCMessage(m grpc.Message) error {
 
 		ps = make([]NetworkParameter, ln)
 
-		for i := 0; i < ln; i++ {
-			if psV2[i] != nil {
-				if err := ps[i].FromGRPCMessage(psV2[i]); err != nil {
-					return err
-				}
+		for i := range ln {
+			if err := ps[i].FromGRPCMessage(&psV2[i]); err != nil {
+				return err
 			}
 		}
 	}
@@ -756,10 +746,10 @@ func (x *NetMap) ToGRPCMessage() grpc.Message {
 		m.SetEpoch(x.epoch)
 
 		if x.nodes != nil {
-			nodes := make([]*netmap.NodeInfo, len(x.nodes))
+			nodes := make([]netmap.NodeInfo, len(x.nodes))
 
 			for i := range x.nodes {
-				nodes[i] = x.nodes[i].ToGRPCMessage().(*netmap.NodeInfo)
+				nodes[i] = *x.nodes[i].ToGRPCMessage().(*netmap.NodeInfo)
 			}
 
 			m.SetNodes(nodes)
@@ -784,7 +774,7 @@ func (x *NetMap) FromGRPCMessage(m grpc.Message) error {
 		x.nodes = make([]NodeInfo, len(nodes))
 
 		for i := range nodes {
-			err = x.nodes[i].FromGRPCMessage(nodes[i])
+			err = x.nodes[i].FromGRPCMessage(&nodes[i])
 			if err != nil {
 				return err
 			}

netmap/types.go

@@ -335,6 +335,10 @@ func (p *PlacementPolicy) SetContainerBackupFactor(backupFactor uint32) {
 }
 
 func (p *PlacementPolicy) GetReplicas() []Replica {
+	if p == nil {
+		return nil
+	}
+
 	return p.replicas
 }
 

object/bench_test.go

@@ -26,7 +26,7 @@ func BenchmarkAttributesMarshal(b *testing.B) {
 
 	b.Run("marshal", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			res := AttributesToGRPC(attrs)
 			if len(res) != len(raw) {
 				b.FailNow()
@@ -35,7 +35,7 @@ func BenchmarkAttributesMarshal(b *testing.B) {
 	})
 	b.Run("unmarshal", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			res, err := AttributesFromGRPC(raw)
 			if err != nil || len(res) != len(raw) {
 				b.FailNow()

object/convert.go

@@ -142,28 +142,26 @@ func (a *Attribute) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func AttributesToGRPC(xs []Attribute) (res []*object.Header_Attribute) {
+func AttributesToGRPC(xs []Attribute) (res []object.Header_Attribute) {
 	if xs != nil {
-		res = make([]*object.Header_Attribute, 0, len(xs))
+		res = make([]object.Header_Attribute, 0, len(xs))
 
 		for i := range xs {
-			res = append(res, xs[i].ToGRPCMessage().(*object.Header_Attribute))
+			res = append(res, *xs[i].ToGRPCMessage().(*object.Header_Attribute))
 		}
 	}
 
 	return
 }
 
-func AttributesFromGRPC(xs []*object.Header_Attribute) (res []Attribute, err error) {
+func AttributesFromGRPC(xs []object.Header_Attribute) (res []Attribute, err error) {
 	if xs != nil {
 		res = make([]Attribute, len(xs))
 
 		for i := range xs {
-			if xs[i] != nil {
-				err = res[i].FromGRPCMessage(xs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&xs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -683,9 +681,9 @@ func (s *ECInfo) ToGRPCMessage() grpc.Message {
 		m = new(object.ECInfo)
 
 		if s.Chunks != nil {
-			chunks := make([]*object.ECInfo_Chunk, len(s.Chunks))
+			chunks := make([]object.ECInfo_Chunk, len(s.Chunks))
 			for i := range chunks {
-				chunks[i] = s.Chunks[i].ToGRPCMessage().(*object.ECInfo_Chunk)
+				chunks[i] = *s.Chunks[i].ToGRPCMessage().(*object.ECInfo_Chunk)
 			}
 			m.Chunks = chunks
 		}
@@ -706,7 +704,7 @@ func (s *ECInfo) FromGRPCMessage(m grpc.Message) error {
 	} else {
 		s.Chunks = make([]ECChunk, len(chunks))
 		for i := range chunks {
-			if err := s.Chunks[i].FromGRPCMessage(chunks[i]); err != nil {
+			if err := s.Chunks[i].FromGRPCMessage(&chunks[i]); err != nil {
 				return err
 			}
 		}
@@ -1626,28 +1624,26 @@ func (f *SearchFilter) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func SearchFiltersToGRPC(fs []SearchFilter) (res []*object.SearchRequest_Body_Filter) {
+func SearchFiltersToGRPC(fs []SearchFilter) (res []object.SearchRequest_Body_Filter) {
 	if fs != nil {
-		res = make([]*object.SearchRequest_Body_Filter, 0, len(fs))
+		res = make([]object.SearchRequest_Body_Filter, 0, len(fs))
 
 		for i := range fs {
-			res = append(res, fs[i].ToGRPCMessage().(*object.SearchRequest_Body_Filter))
+			res = append(res, *fs[i].ToGRPCMessage().(*object.SearchRequest_Body_Filter))
 		}
 	}
 
 	return
 }
 
-func SearchFiltersFromGRPC(fs []*object.SearchRequest_Body_Filter) (res []SearchFilter, err error) {
+func SearchFiltersFromGRPC(fs []object.SearchRequest_Body_Filter) (res []SearchFilter, err error) {
 	if fs != nil {
 		res = make([]SearchFilter, len(fs))
 
 		for i := range fs {
-			if fs[i] != nil {
-				err = res[i].FromGRPCMessage(fs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&fs[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -1827,28 +1823,26 @@ func (r *Range) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func RangesToGRPC(rs []Range) (res []*object.Range) {
+func RangesToGRPC(rs []Range) (res []object.Range) {
 	if rs != nil {
-		res = make([]*object.Range, 0, len(rs))
+		res = make([]object.Range, 0, len(rs))
 
 		for i := range rs {
-			res = append(res, rs[i].ToGRPCMessage().(*object.Range))
+			res = append(res, *rs[i].ToGRPCMessage().(*object.Range))
 		}
 	}
 
 	return
 }
 
-func RangesFromGRPC(rs []*object.Range) (res []Range, err error) {
+func RangesFromGRPC(rs []object.Range) (res []Range, err error) {
 	if rs != nil {
 		res = make([]Range, len(rs))
 
 		for i := range rs {
-			if rs[i] != nil {
-				err = res[i].FromGRPCMessage(rs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&rs[i])
+			if err != nil {
+				return
 			}
 		}
 	}

object/lock.go

@@ -89,13 +89,13 @@ func (x *Lock) ToGRPCMessage() grpc.Message {
 	if x != nil {
 		m = new(lock.Lock)
 
-		var members []*refsGRPC.ObjectID
+		var members []refsGRPC.ObjectID
 
 		if x.members != nil {
-			members = make([]*refsGRPC.ObjectID, len(x.members))
+			members = make([]refsGRPC.ObjectID, len(x.members))
 
 			for i := range x.members {
-				members[i] = x.members[i].ToGRPCMessage().(*refsGRPC.ObjectID)
+				members[i] = *x.members[i].ToGRPCMessage().(*refsGRPC.ObjectID)
 			}
 		}
 
@@ -119,7 +119,7 @@ func (x *Lock) FromGRPCMessage(m grpc.Message) error {
 		var err error
 
 		for i := range x.members {
-			err = x.members[i].FromGRPCMessage(members[i])
+			err = x.members[i].FromGRPCMessage(&members[i])
 			if err != nil {
 				return err
 			}

object/test/generate.go

@@ -1,6 +1,7 @@
 package objecttest
 
 import (
+	crand "crypto/rand"
 	"math/rand"
 	"time"
 
@@ -59,7 +60,10 @@ func generateSplitHeader(empty, withPar bool) *object.SplitHeader {
 	m := new(object.SplitHeader)
 
 	if !empty {
-		m.SetSplitID([]byte{1, 3, 5})
+		id := make([]byte, 16)
+		_, _ = crand.Read(id)
+
+		m.SetSplitID(id)
 		m.SetParent(refstest.GenerateObjectID(false))
 		m.SetPrevious(refstest.GenerateObjectID(false))
 		m.SetChildren(refstest.GenerateObjectIDs(false))
@@ -91,7 +95,10 @@ func GenerateECHeader(empty bool) *object.ECHeader {
 
 	if !empty {
 		ech.Parent = refstest.GenerateObjectID(empty)
-		ech.ParentSplitID = []byte{1, 2, 3}
+
+		ech.ParentSplitID = make([]byte, 16)
+		_, _ = crand.Read(ech.ParentSplitID)
+
 		ech.ParentSplitParentID = refstest.GenerateObjectID(empty)
 		ech.ParentAttributes = GenerateAttributes(empty)
 		ech.Index = 0
@@ -150,7 +157,10 @@ func GenerateSplitInfo(empty bool) *object.SplitInfo {
 	m := new(object.SplitInfo)
 
 	if !empty {
-		m.SetSplitID([]byte("splitID"))
+		id := make([]byte, 16)
+		_, _ = crand.Read(id)
+
+		m.SetSplitID(id)
 		m.SetLastPart(refstest.GenerateObjectID(false))
 		m.SetLink(refstest.GenerateObjectID(false))
 	}
@@ -627,7 +637,10 @@ func GenerateGetRangeHashResponseBody(empty bool) *object.GetRangeHashResponseBo
 
 	if !empty {
 		m.SetType(678)
-		m.SetHashList([][]byte{{1}, {2}})
+		m.SetHashList([][]byte{
+			refstest.GenerateChecksum(false).GetSum(),
+			refstest.GenerateChecksum(false).GetSum(),
+		})
 	}
 
 	return m

object/types.go

@@ -1615,6 +1615,18 @@ func (r *PatchResponse) SetBody(v *PatchResponseBody) {
 	r.Body = v
 }
 
+func (r *PatchResponseBody) GetObjectID() *refs.ObjectID {
+	if r != nil {
+		return r.ObjectID
+	}
+
+	return nil
+}
+
+func (r *PatchResponseBody) SetObjectID(objectID *refs.ObjectID) {
+	r.ObjectID = objectID
+}
+
 func (r *PatchRequestBodyPatch) GetChunk() []byte {
 	if r != nil {
 		return r.Chunk

refs/bench_test.go

@@ -24,7 +24,7 @@ func benchmarkObjectIDSlice(b *testing.B, size int) {
 
 	b.Run("to grpc message", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			raw := ObjectIDListToGRPCMessage(ids)
 			if len(raw) != len(ids) {
 				b.FailNow()
@@ -33,7 +33,7 @@ func benchmarkObjectIDSlice(b *testing.B, size int) {
 	})
 	b.Run("from grpc message", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			ids, err := ObjectIDListFromGRPCMessage(raw)
 			if err != nil || len(raw) != len(ids) {
 				b.FailNow()
@@ -42,7 +42,7 @@ func benchmarkObjectIDSlice(b *testing.B, size int) {
 	})
 	b.Run("marshal", func(b *testing.B) {
 		b.ReportAllocs()
-		for i := 0; i < b.N; i++ {
+		for range b.N {
 			buf := make([]byte, ObjectIDNestedListSize(1, ids))
 			n := ObjectIDNestedListMarshal(1, buf, ids)
 			if n != len(buf) {

refs/convert.go

@@ -52,28 +52,26 @@ func (c *ContainerID) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func ContainerIDsToGRPCMessage(ids []ContainerID) (res []*refs.ContainerID) {
+func ContainerIDsToGRPCMessage(ids []ContainerID) (res []refs.ContainerID) {
 	if ids != nil {
-		res = make([]*refs.ContainerID, 0, len(ids))
+		res = make([]refs.ContainerID, 0, len(ids))
 
 		for i := range ids {
-			res = append(res, ids[i].ToGRPCMessage().(*refs.ContainerID))
+			res = append(res, *ids[i].ToGRPCMessage().(*refs.ContainerID))
 		}
 	}
 
 	return
 }
 
-func ContainerIDsFromGRPCMessage(idsV2 []*refs.ContainerID) (res []ContainerID, err error) {
+func ContainerIDsFromGRPCMessage(idsV2 []refs.ContainerID) (res []ContainerID, err error) {
 	if idsV2 != nil {
 		res = make([]ContainerID, len(idsV2))
 
 		for i := range idsV2 {
-			if idsV2[i] != nil {
-				err = res[i].FromGRPCMessage(idsV2[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&idsV2[i])
+			if err != nil {
+				return
 			}
 		}
 	}
@@ -104,28 +102,26 @@ func (o *ObjectID) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func ObjectIDListToGRPCMessage(ids []ObjectID) (res []*refs.ObjectID) {
+func ObjectIDListToGRPCMessage(ids []ObjectID) (res []refs.ObjectID) {
 	if ids != nil {
-		res = make([]*refs.ObjectID, 0, len(ids))
+		res = make([]refs.ObjectID, 0, len(ids))
 
 		for i := range ids {
-			res = append(res, ids[i].ToGRPCMessage().(*refs.ObjectID))
+			res = append(res, *ids[i].ToGRPCMessage().(*refs.ObjectID))
 		}
 	}
 
 	return
 }
 
-func ObjectIDListFromGRPCMessage(idsV2 []*refs.ObjectID) (res []ObjectID, err error) {
+func ObjectIDListFromGRPCMessage(idsV2 []refs.ObjectID) (res []ObjectID, err error) {
 	if idsV2 != nil {
 		res = make([]ObjectID, len(idsV2))
 
 		for i := range idsV2 {
-			if idsV2[i] != nil {
-				err = res[i].FromGRPCMessage(idsV2[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&idsV2[i])
+			if err != nil {
+				return
 			}
 		}
 	}

refs/test/generate.go

@@ -1,7 +1,8 @@
 package refstest
 
 import (
-	"math/rand"
+	crand "crypto/rand"
+	"crypto/sha256"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
 )
@@ -21,7 +22,10 @@ func GenerateOwnerID(empty bool) *refs.OwnerID {
 	m := new(refs.OwnerID)
 
 	if !empty {
-		m.SetValue([]byte{1, 2, 3})
+		id := make([]byte, 25)
+		_, _ = crand.Read(id)
+
+		m.SetValue(id)
 	}
 
 	return m
@@ -42,7 +46,10 @@ func GenerateObjectID(empty bool) *refs.ObjectID {
 	m := new(refs.ObjectID)
 
 	if !empty {
-		m.SetValue([]byte{1, 2, 3})
+		id := make([]byte, sha256.Size)
+		_, _ = crand.Read(id)
+
+		m.SetValue(id)
 	}
 
 	return m
@@ -65,7 +72,10 @@ func GenerateContainerID(empty bool) *refs.ContainerID {
 	m := new(refs.ContainerID)
 
 	if !empty {
-		m.SetValue([]byte{1, 2, 3})
+		id := make([]byte, sha256.Size)
+		_, _ = crand.Read(id)
+
+		m.SetValue(id)
 	}
 
 	return m
@@ -88,9 +98,15 @@ func GenerateSignature(empty bool) *refs.Signature {
 	m := new(refs.Signature)
 
 	if !empty {
-		m.SetKey([]byte{1})
-		m.SetSign([]byte{2})
-		m.SetScheme(refs.SignatureScheme(rand.Int31() % 3))
+		key := make([]byte, 33)
+		_, _ = crand.Read(key)
+
+		sign := make([]byte, 65)
+		_, _ = crand.Read(sign)
+
+		m.SetScheme(refs.ECDSA_SHA512)
+		m.SetKey(key)
+		m.SetSign(sign)
 	}
 
 	return m
@@ -100,8 +116,11 @@ func GenerateChecksum(empty bool) *refs.Checksum {
 	m := new(refs.Checksum)
 
 	if !empty {
-		m.SetType(1)
-		m.SetSum([]byte{1, 2, 3})
+		cs := make([]byte, sha256.Size)
+		_, _ = crand.Read(cs)
+
+		m.SetType(refs.SHA256)
+		m.SetSum(cs)
 	}
 
 	return m

rpc/client/call_options.go

@@ -2,13 +2,16 @@ package client
 
 import (
 	"context"
+
+	"google.golang.org/grpc"
 )
 
 // CallOption is a messaging session option within Protobuf RPC.
 type CallOption func(*callParameters)
 
 type callParameters struct {
-	ctx context.Context // nolint:containedctx
+	ctx    context.Context // nolint:containedctx
+	dialer func(context.Context, grpc.ClientConnInterface) error
 }
 
 func defaultCallParameters() *callParameters {
@@ -27,3 +30,11 @@ func WithContext(ctx context.Context) CallOption {
 		prm.ctx = ctx
 	}
 }
+
+// WithDialer returns option to specify grpc dialer. If passed, it will be
+// called after the connection is successfully created.
+func WithDialer(dialer func(context.Context, grpc.ClientConnInterface) error) CallOption {
+	return func(prm *callParameters) {
+		prm.dialer = dialer
+	}
+}

rpc/client/connect.go

@@ -12,7 +12,7 @@ import (
 
 var errInvalidEndpoint = errors.New("invalid endpoint options")
 
-func (c *Client) openGRPCConn(ctx context.Context) error {
+func (c *Client) openGRPCConn(ctx context.Context, dialer func(ctx context.Context, cc grpcstd.ClientConnInterface) error) error {
 	if c.conn != nil {
 		return nil
 	}
@@ -21,15 +21,21 @@ func (c *Client) openGRPCConn(ctx context.Context) error {
 		return errInvalidEndpoint
 	}
 
-	dialCtx, cancel := context.WithTimeout(ctx, c.dialTimeout)
 	var err error
 
-	c.conn, err = grpcstd.DialContext(dialCtx, c.addr, c.grpcDialOpts...)
-
-	cancel()
-
+	c.conn, err = grpcstd.NewClient(c.addr, c.grpcDialOpts...)
 	if err != nil {
-		return fmt.Errorf("gRPC dial: %w", err)
+		return fmt.Errorf("gRPC new client: %w", err)
+	}
+
+	if dialer != nil {
+		ctx, cancel := context.WithTimeout(ctx, c.dialTimeout)
+		defer cancel()
+
+		if err := dialer(ctx, c.conn); err != nil {
+			_ = c.conn.Close()
+			return fmt.Errorf("gRPC dial: %w", err)
+		}
 	}
 
 	return nil

rpc/client/init.go

@@ -46,7 +46,7 @@ func (c *Client) Init(info common.CallMethodInfo, opts ...CallOption) (MessageRe
 		opt(prm)
 	}
 
-	if err := c.openGRPCConn(prm.ctx); err != nil {
+	if err := c.openGRPCConn(prm.ctx, prm.dialer); err != nil {
 		return nil, err
 	}
 

rpc/client/options.go

@@ -37,7 +37,6 @@ func (c *cfg) initDefault() {
 	c.dialTimeout = defaultDialTimeout
 	c.rwTimeout = defaultRWTimeout
 	c.grpcDialOpts = []grpc.DialOption{
-		grpc.WithBlock(),
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 	}
 }

rpc/container.go

@@ -80,19 +80,3 @@ func ListContainers(
 
 	return resp, nil
 }
-
-// GetEACL executes ContainerService.GetExtendedACL RPC.
-func GetEACL(
-	cli *client.Client,
-	req *container.GetExtendedACLRequest,
-	opts ...client.CallOption,
-) (*container.GetExtendedACLResponse, error) {
-	resp := new(container.GetExtendedACLResponse)
-
-	err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceContainer, rpcContainerGetEACL), req, resp, opts...)
-	if err != nil {
-		return nil, err
-	}
-
-	return resp, nil
-}

rpc/message/test/message.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/message"
+	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/proto/encoding"
 	"github.com/stretchr/testify/require"
 )
 
@@ -68,6 +69,58 @@ func TestRPCMessage(t *testing.T, msgGens ...func(empty bool) message.Message) {
 					require.Equal(t, bm, bm2)
 				})
 			}
+			t.Run("compatibility", func(t *testing.T) {
+				testCompatibility(t, msgGen)
+			})
 		})
 	}
 }
+
+func testCompatibility(t *testing.T, msgGen func(empty bool) message.Message) {
+	compareBinary := func(t *testing.T, msg message.Message) {
+		am, ok := msg.(binaryMessage)
+		if !ok {
+			t.Skip()
+		}
+
+		a := am.StableMarshal(nil)
+		b := msg.ToGRPCMessage().(encoding.ProtoMarshaler).MarshalProtobuf(nil)
+		if len(a) == 0 {
+			require.Empty(t, b)
+		} else {
+			require.Equal(t, a, b)
+		}
+	}
+	compareJSON := func(t *testing.T, msg message.Message) {
+		am, ok := msg.(jsonMessage)
+		if !ok {
+			t.Skip()
+		}
+
+		a, err := am.MarshalJSON()
+		require.NoError(t, err)
+
+		b, err := json.Marshal(msg.ToGRPCMessage())
+		require.NoError(t, err)
+
+		require.JSONEq(t, string(a), string(b))
+	}
+	t.Run("empty", func(t *testing.T) {
+		msg := msgGen(true)
+		t.Run(fmt.Sprintf("Binary_%T", msg), func(t *testing.T) {
+			compareBinary(t, msg)
+		})
+		t.Run(fmt.Sprintf("JSON_%T", msg), func(t *testing.T) {
+			compareJSON(t, msg)
+		})
+	})
+	t.Run("not empty", func(t *testing.T) {
+		msg := msgGen(false)
+		t.Run(fmt.Sprintf("Binary_%T", msg), func(t *testing.T) {
+			compareBinary(t, msg)
+		})
+		t.Run(fmt.Sprintf("JSON_%T", msg), func(t *testing.T) {
+			compareJSON(t, msg)
+		})
+	})
+}

session/convert.go

@@ -207,28 +207,26 @@ func (x *XHeader) FromGRPCMessage(m grpc.Message) error {
 	return nil
 }
 
-func XHeadersToGRPC(xs []XHeader) (res []*session.XHeader) {
+func XHeadersToGRPC(xs []XHeader) (res []session.XHeader) {
 	if xs != nil {
-		res = make([]*session.XHeader, 0, len(xs))
+		res = make([]session.XHeader, 0, len(xs))
 
 		for i := range xs {
-			res = append(res, xs[i].ToGRPCMessage().(*session.XHeader))
+			res = append(res, *xs[i].ToGRPCMessage().(*session.XHeader))
 		}
 	}
 
 	return
 }
 
-func XHeadersFromGRPC(xs []*session.XHeader) (res []XHeader, err error) {
+func XHeadersFromGRPC(xs []session.XHeader) (res []XHeader, err error) {
 	if xs != nil {
 		res = make([]XHeader, len(xs))
 
 		for i := range xs {
-			if xs[i] != nil {
-				err = res[i].FromGRPCMessage(xs[i])
-				if err != nil {
-					return
-				}
+			err = res[i].FromGRPCMessage(&xs[i])
+			if err != nil {
+				return
 			}
 		}
 	}

session/test/generate.go

@@ -1,6 +1,7 @@
 package sessiontest
 
 import (
+	crand "crypto/rand"
 	"math/rand"
 	"time"
 
@@ -38,7 +39,10 @@ func GenerateCreateResponseBody(empty bool) *session.CreateResponseBody {
 	m := new(session.CreateResponseBody)
 
 	if !empty {
-		m.SetID([]byte{1, 2, 3})
+		id := make([]byte, 16)
+		_, _ = crand.Read(id)
+
+		m.SetID(id)
 		m.SetSessionKey([]byte{4, 5, 6})
 	}
 
@@ -164,7 +168,10 @@ func GenerateSessionTokenBody(empty bool) *session.TokenBody {
 	m := new(session.TokenBody)
 
 	if !empty {
-		m.SetID([]byte{1})
+		id := make([]byte, 16)
+		_, _ = crand.Read(id)
+
+		m.SetID(id)
 		m.SetSessionKey([]byte{2})
 		m.SetOwnerID(refstest.GenerateOwnerID(false))
 		m.SetLifetime(GenerateTokenLifetime(false))

signature/body.go

@@ -46,10 +46,6 @@ func serviceMessageBody(req any) stableMarshaler {
 		return v.GetBody()
 	case *container.ListResponse:
 		return v.GetBody()
-	case *container.GetExtendedACLRequest:
-		return v.GetBody()
-	case *container.GetExtendedACLResponse:
-		return v.GetBody()
 
 		/* Object */
 	case *object.PutRequest:

signature/sign_test.go

@@ -77,7 +77,7 @@ func BenchmarkSignRequest(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		b.StopTimer()
 		dec := new(accounting.Decimal)
 		dec.SetValue(100)
@@ -103,7 +103,7 @@ func BenchmarkVerifyRequest(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
 
-	for i := 0; i < b.N; i++ {
+	for range b.N {
 		b.StopTimer()
 		dec := new(accounting.Decimal)
 		dec.SetValue(100)

status/convert.go

@@ -48,13 +48,13 @@ func (x *Status) ToGRPCMessage() grpc.Message {
 		m.SetCode(CodeToGRPC(x.code))
 		m.SetMessage(x.msg)
 
-		var ds []*status.Status_Detail
+		var ds []status.Status_Detail
 
 		if ln := len(x.details); ln > 0 {
-			ds = make([]*status.Status_Detail, 0, ln)
+			ds = make([]status.Status_Detail, 0, ln)
 
-			for i := 0; i < ln; i++ {
-				ds = append(ds, x.details[i].ToGRPCMessage().(*status.Status_Detail))
+			for i := range ln {
+				ds = append(ds, *x.details[i].ToGRPCMessage().(*status.Status_Detail))
 			}
 		}
 
@@ -80,11 +80,9 @@ func (x *Status) FromGRPCMessage(m grpc.Message) error {
 
 		ds = make([]Detail, ln)
 
-		for i := 0; i < ln; i++ {
-			if dsV2[i] != nil {
-				if err := ds[i].FromGRPCMessage(dsV2[i]); err != nil {
-					return err
-				}
+		for i := range ln {
+			if err := ds[i].FromGRPCMessage(&dsV2[i]); err != nil {
+				return err
 			}
 		}
 	}

status/status.go

@@ -63,6 +63,8 @@ const (
 	SignatureVerificationFail
 	// NodeUnderMaintenance is a local Code value for NODE_UNDER_MAINTENANCE status.
 	NodeUnderMaintenance
+	// InvalidArgument is a local Code value for INVALID_ARGUMENT status.
+	InvalidArgument
 )
 
 const (

tombstone/test/generate.go

@@ -1,6 +1,8 @@
 package tombstonetest
 
 import (
+	"crypto/rand"
+
 	refstest "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs/test"
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/tombstone"
 )
@@ -9,8 +11,11 @@ func GenerateTombstone(empty bool) *tombstone.Tombstone {
 	m := new(tombstone.Tombstone)
 
 	if !empty {
+		id := make([]byte, 16)
+		_, _ = rand.Read(id)
+
 		m.SetExpirationEpoch(89)
-		m.SetSplitID([]byte{3, 2, 1})
+		m.SetSplitID(id)
 		m.SetMembers(refstest.GenerateObjectIDs(false))
 	}
 

util/proto/marshal_test.go

@@ -26,11 +26,34 @@ func nonZero[T protoInt]() T {
 
 func TestStableMarshalSingle(t *testing.T) {
 	t.Run("empty", func(t *testing.T) {
-		input := &generated.Primitives{}
-		require.Zero(t, input.StableSize())
+		t.Run("proto", func(t *testing.T) {
+			input := &generated.Primitives{}
+			require.Zero(t, input.StableSize())
 
-		r := input.MarshalProtobuf(nil)
-		require.Empty(t, r)
+			r := input.MarshalProtobuf(nil)
+			require.Empty(t, r)
+		})
+		t.Run("json", func(t *testing.T) {
+			input := &generated.Primitives{}
+			r, err := input.MarshalJSON()
+			require.NoError(t, err)
+			require.NotEmpty(t, r)
+
+			var actual test.Primitives
+			require.NoError(t, protojson.Unmarshal(r, &actual))
+
+			t.Run("protojson compatibility", func(t *testing.T) {
+				data, err := protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(&actual)
+				require.NoError(t, err)
+				require.JSONEq(t, string(data), string(r))
+			})
+
+			var actualFrostfs generated.Primitives
+			require.NoError(t, actualFrostfs.UnmarshalJSON(r))
+			require.Equal(t, input, &actualFrostfs)
+
+			primitivesEqual(t, input, &actual)
+		})
 	})
 
 	marshalCases := []struct {
@@ -49,6 +72,8 @@ func TestStableMarshalSingle(t *testing.T) {
 		{name: "fixed32", input: &generated.Primitives{FieldK: nonZero[uint32]()}},
 		{name: "enum, positive", input: &generated.Primitives{FieldH: generated.Primitives_POSITIVE}},
 		{name: "enum, negative", input: &generated.Primitives{FieldH: generated.Primitives_NEGATIVE}},
+		{name: "oneof, first", input: &generated.Primitives{FieldM: &generated.Primitives_FieldMa{FieldMa: []byte{4, 2}}}},
+		{name: "oneof, second", input: &generated.Primitives{FieldM: &generated.Primitives_FieldMe{FieldMe: nonZero[uint32]()}}},
 	}
 	for _, tc := range marshalCases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -74,6 +99,12 @@ func TestStableMarshalSingle(t *testing.T) {
 				var actual test.Primitives
 				require.NoError(t, protojson.Unmarshal(r, &actual))
 
+				t.Run("protojson compatibility", func(t *testing.T) {
+					data, err := protojson.MarshalOptions{EmitUnpopulated: true}.Marshal(&actual)
+					require.NoError(t, err)
+					require.JSONEq(t, string(data), string(r))
+				})
+
 				var actualFrostfs generated.Primitives
 				require.NoError(t, actualFrostfs.UnmarshalJSON(r))
 				require.Equal(t, tc.input, &actualFrostfs)
@@ -86,6 +117,7 @@ func TestStableMarshalSingle(t *testing.T) {
 
 func primitivesEqual(t *testing.T, a *generated.Primitives, b *test.Primitives) {
 	// Compare each field directly, because proto-generated code has private fields.
+	require.Equal(t, len(a.FieldA), len(b.FieldA))
 	require.Equal(t, a.FieldA, b.FieldA)
 	require.Equal(t, a.FieldB, b.FieldB)
 	require.Equal(t, a.FieldC, b.FieldC)
@@ -97,6 +129,9 @@ func primitivesEqual(t *testing.T, a *generated.Primitives, b *test.Primitives)
 	require.Equal(t, a.FieldJ, b.FieldJ)
 	require.Equal(t, a.FieldK, b.FieldK)
 	require.EqualValues(t, a.FieldH, b.FieldH)
+	require.Equal(t, a.GetFieldMa(), b.GetFieldMa())
+	require.Equal(t, a.GetFieldMe(), b.GetFieldMe())
+	require.Equal(t, a.GetFieldAux().GetInnerField(), b.GetFieldAux().GetInnerField())
 }
 
 func repPrimitivesEqual(t *testing.T, a *generated.RepPrimitives, b *test.RepPrimitives) {
@@ -108,6 +143,10 @@ func repPrimitivesEqual(t *testing.T, a *generated.RepPrimitives, b *test.RepPri
 	require.Equal(t, a.FieldE, b.FieldE)
 	require.Equal(t, a.FieldF, b.FieldF)
 	require.Equal(t, a.FieldFu, b.FieldFu)
+	require.Equal(t, len(a.GetFieldAux()), len(b.GetFieldAux()))
+	for i := range a.FieldAux {
+		require.Equal(t, a.GetFieldAux()[i].GetInnerField(), b.GetFieldAux()[i].GetInnerField())
+	}
 }
 
 func randIntSlice[T protoInt](n int, includeZero bool) []T {
@@ -124,6 +163,14 @@ func randIntSlice[T protoInt](n int, includeZero bool) []T {
 	return r
 }
 
+func uint32SliceToAux(s []uint32) []generated.RepPrimitives_Aux {
+	r := make([]generated.RepPrimitives_Aux, len(s))
+	for i := range s {
+		r[i] = generated.RepPrimitives_Aux{InnerField: s[i]}
+	}
+	return r
+}
+
 func TestStableMarshalRep(t *testing.T) {
 	t.Run("empty", func(t *testing.T) {
 		marshalCases := []struct {
@@ -171,6 +218,9 @@ func TestStableMarshalRep(t *testing.T) {
 		{name: "uint64", input: &generated.RepPrimitives{FieldFu: randIntSlice[uint64](1, true)}},
 		{name: "uint64", input: &generated.RepPrimitives{FieldFu: randIntSlice[uint64](2, true)}},
 		{name: "uint64", input: &generated.RepPrimitives{FieldFu: randIntSlice[uint64](2, false)}},
+		{name: "message", input: &generated.RepPrimitives{FieldAux: uint32SliceToAux(randIntSlice[uint32](1, true))}},
+		{name: "message", input: &generated.RepPrimitives{FieldAux: uint32SliceToAux(randIntSlice[uint32](2, true))}},
+		{name: "message", input: &generated.RepPrimitives{FieldAux: uint32SliceToAux(randIntSlice[uint32](2, false))}},
 	}
 	for _, tc := range marshalCases {
 		t.Run(tc.name, func(t *testing.T) {

util/proto/test/test.proto

@@ -22,6 +22,14 @@ message Primitives {
     NEGATIVE = -1;
   }
   SomeEnum field_h = 300;
+
+  message Aux { uint32 inner_field = 1; }
+
+  oneof field_m {
+    bytes field_ma = 401;
+    uint32 field_me = 402;
+    Aux field_aux = 403;
+  }
 }
 
 message RepPrimitives {
@@ -32,4 +40,7 @@ message RepPrimitives {
   repeated int64 field_e = 5;
   repeated uint64 field_f = 6;
   repeated uint64 field_fu = 7 [ packed = false ];
+
+  message Aux { uint32 inner_field = 1; }
+  repeated Aux field_aux = 8;
 }

util/protogen/internalgengo/file.go

@@ -126,29 +126,24 @@ func emitOneofGettersSetters(g *protogen.GeneratedFile, msg *protogen.Message, f
 	// For some reason protoc generates different code for oneof message/non-message fields:
 	// 1. For message we have 2 level struct wrapping and setters use inner type.
 	// 2. For other types we also have 2 level wrapping, but setters use outer type.
+	ft := fieldType(g, ff)
+
+	g.P("func (x *", msg.GoIdent.GoName, ") Get", ff.GoName, "() ", ft, " {")
+	g.P("if xx, ok := x.Get", ff.Oneof.GoName, "().(*", ff.GoIdent, "); ok { return xx.", ff.GoName, " }")
+	g.P("return ", fieldDefaultValue(ff))
+	g.P("}")
+
 	if ff.Desc.Kind() == protoreflect.MessageKind {
-		ft := fieldType(g, ff)
-
-		g.P("func (x *", msg.GoIdent.GoName, ") Get", ff.GoName, "() ", ft, " {")
-		g.P("if xx, ok := x.Get", ff.Oneof.GoName, "().(*", ff.GoIdent, "); ok { return xx.", ff.GoName, " }")
-		g.P("return nil")
-		g.P("}")
-
 		g.P("func (x *", msg.GoIdent.GoName, ") Set", ff.GoName, "(v ", ft, ") {")
 		g.P("x.", ff.Oneof.GoName, " = &", ff.GoIdent, "{", ff.GoName, ": v}")
 		g.P("}")
 	} else {
-		g.P("func (x *", msg.GoIdent.GoName, ") Get", ff.GoName, "() *", ff.GoIdent, " {")
-		g.P("if xx, ok := x.Get", ff.Oneof.GoName, "().(*", ff.GoIdent, "); ok { return xx }")
-		g.P("return nil")
-		g.P("}")
-
 		g.P("func (x *", msg.GoIdent.GoName, ") Set", ff.GoName, "(v *", ff.GoIdent, ") {")
 		g.P("x.", ff.Oneof.GoName, " = v")
 		g.P("}")
 
 		ft := fieldType(g, ff)
-		emitGetterSetter(g, ff.GoIdent.GoName, ff.GoName, ft.String(), "nil")
+		emitGetterSetter(g, ff.GoIdent.GoName, ff.GoName, ft.String(), fieldDefaultValue(ff))
 	}
 }
 

util/protogen/internalgengo/json.go

@@ -59,6 +59,35 @@ func emitJSONUnmarshal(g *protogen.GeneratedFile, msg *protogen.Message) {
 	g.P("}")
 }
 
+func emitJSONParseInteger(g *protogen.GeneratedFile, ident string, method string, bitSize int, typ string) {
+	g.P("r := in.JsonNumber()")
+	g.P("n := r.String()")
+	g.P("v, err := ", strconvPackage.Ident(method), "(n, 10, ", bitSize, ")")
+	g.P("if err != nil {")
+	g.P("	in.AddError(err)")
+	g.P("	return")
+	g.P("}")
+	g.P(ident, " := ", typ, "(v)")
+}
+
+func emitJSONReadEnum(g *protogen.GeneratedFile, name string, enumType string) {
+	g.P(`switch v := in.Interface().(type) {
+	case string:
+		if vv, ok := `+enumType+`_value[v]; ok {
+			`+name+` = `+enumType+`(vv)
+			break
+		}
+		vv, err := `, strconvPackage.Ident("ParseInt"), `(v, 10, 32)
+		if err != nil {
+			in.AddError(err)
+			return
+		}
+		`+name+` = `+enumType+`(vv)
+	case float64:
+		`+name+` = `+enumType+`(v)
+	}`)
+}
+
 func emitJSONFieldRead(g *protogen.GeneratedFile, f *protogen.Field, name string) {
 	g.P("{")
 	defer g.P("}")
@@ -83,30 +112,20 @@ func emitJSONFieldRead(g *protogen.GeneratedFile, f *protogen.Field, name string
 
 		enumType := fieldType(g, f).String()
 		g.P("var parsedValue " + enumType)
-		g.P(`switch v := in.Interface().(type) {
-		case string:
-			if vv, ok := `+enumType+`_value[v]; ok {
-				parsedValue = `+enumType+`(vv)
-				break
-			}
-			vv, err := `, strconvPackage.Ident("ParseInt"), `(v, 10, 32)
-			if err != nil {
-				in.AddError(err)
-				return
-			}
-			parsedValue = `+enumType+`(vv)
-		case float64:
-			parsedValue = `+enumType+`(v)
-		}`)
+		emitJSONReadEnum(g, "parsedValue", enumType)
 		template = "%s = parsedValue"
 	case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
-		template = "%s = in.Int32()"
+		emitJSONParseInteger(g, "pv", "ParseInt", 32, "int32")
+		template = "%s = pv"
 	case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
-		template = "%s = in.Uint32()"
+		emitJSONParseInteger(g, "pv", "ParseUint", 32, "uint32")
+		template = "%s = pv"
 	case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
-		template = "%s = in.Int64()"
+		emitJSONParseInteger(g, "pv", "ParseInt", 64, "int64")
+		template = "%s = pv"
 	case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
-		template = "%s = in.Uint64()"
+		emitJSONParseInteger(g, "pv", "ParseUint", 64, "uint64")
+		template = "%s = pv"
 	case protoreflect.FloatKind:
 		template = "%s = in.Float32()"
 	case protoreflect.DoubleKind:
@@ -114,10 +133,20 @@ func emitJSONFieldRead(g *protogen.GeneratedFile, f *protogen.Field, name string
 	case protoreflect.StringKind:
 		template = "%s = in.String()"
 	case protoreflect.BytesKind:
-		template = "%s = in.Bytes()"
+		// Since some time ago proto3 support optional keyword, thus the presence is not tracked by default:
+		// https://github.com/protocolbuffers/protobuf-go/blob/fb995f184a1719ec42b247a3771d1036d92adf67/internal/impl/message_reflect_field.go#L327
+		// We do not explicitly support `optional` keyword, protoc will fail on such fileds.
+		// Thus, treat empty string as `[]byte(nil)`.
+		template = `{
+			tmp := in.Bytes()
+			if len(tmp) == 0 {
+				tmp = nil
+			}
+			%s = tmp
+		}`
 	case protoreflect.MessageKind:
 		if f.Desc.IsList() {
-			g.P("f = new(", fieldType(g, f)[3:], ")")
+			g.P("f = ", fieldType(g, f)[2:], "{}")
 		} else {
 			g.P("f = new(", fieldType(g, f)[1:], ")")
 		}
@@ -147,8 +176,11 @@ func emitJSONMarshal(g *protogen.GeneratedFile, msg *protogen.Message) {
 	g.P("func (x *", msg.GoIdent.GoName, ") MarshalEasyJSON(out *", jwriterPackage.Ident("Writer"), ") {")
 	g.P(`if x == nil { out.RawString("null"); return }`)
 
+	if len(msg.Fields) != 0 {
+		g.P("first := true")
+	}
 	g.P("out.RawByte('{')")
-	for i, f := range msg.Fields {
+	for _, f := range msg.Fields {
 		if f.Oneof != nil {
 			if f.Oneof.Fields[0] != f {
 				continue
@@ -157,31 +189,38 @@ func emitJSONMarshal(g *protogen.GeneratedFile, msg *protogen.Message) {
 			g.P("switch xx := x.", f.Oneof.GoName, ".(type) {")
 			for _, ff := range f.Oneof.Fields {
 				g.P("case *", ff.GoIdent, ":")
-				emitJSONFieldWrite(g, ff, "xx", i == 0)
+				emitJSONFieldWrite(g, ff, "xx")
 			}
-			g.P("default:")
-			g.P(`out.RawString("null")`)
 			g.P("}")
 			continue
 		}
-		emitJSONFieldWrite(g, f, "x", i == 0)
+		emitJSONFieldWrite(g, f, "x")
 	}
 	g.P("out.RawByte('}')")
 	g.P("}")
 }
 
-func emitJSONFieldWrite(g *protogen.GeneratedFile, f *protogen.Field, name string, first bool) {
+func emitJSONFieldWrite(g *protogen.GeneratedFile, f *protogen.Field, name string) {
 	g.P("{")
 	defer g.P("}")
 
-	g.P("const prefix string = ", `",\"`, fieldJSONName(f), `\":"`)
-	if first {
-		g.P("out.RawString(prefix[1:])")
-	} else {
-		g.P("out.RawString(prefix)")
-	}
-
 	selector := name + "." + f.GoName
+
+	// This code is responsible for ignoring default values.
+	// We will restore it after having parametrized JSON marshaling.
+	//
+	// isNotDefault := notNil
+	// if f.Desc.IsList() {
+	// 	isNotDefault = notEmpty
+	// } else if f.Desc.Kind() != protoreflect.MessageKind {
+	// 	_, isNotDefault = easyprotoKindInfo(f.Desc.Kind())
+	// }
+	// g.P("if ", isNotDefault(selector), "{")
+	// defer g.P("}")
+
+	g.P("if !first { out.RawByte(','); } else { first = false; }")
+	g.P("const prefix string = ", `"\"`, fieldJSONName(f), `\":"`)
+	g.P("out.RawString(prefix)")
 	if f.Desc.IsList() {
 		selector += "[i]"
 		g.P("out.RawByte('[')")
@@ -197,15 +236,27 @@ func emitJSONFieldWrite(g *protogen.GeneratedFile, f *protogen.Field, name strin
 	case protoreflect.BoolKind:
 		template = "out.Bool(%s)"
 	case protoreflect.EnumKind:
-		template = "out.Int32(int32(%s))"
+		enumType := fieldType(g, f).String()
+		template = `v := int32(%s)
+			if vv, ok := ` + enumType + `_name[v]; ok {
+				out.String(vv)
+			} else {
+				out.Int32(v)
+			}`
 	case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
 		template = "out.Int32(%s)"
 	case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
 		template = "out.Uint32(%s)"
 	case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
-		template = "out.Int64(%s)"
+		g.P("out.RawByte('\"')")
+		g.P("out.Buffer.Buf = ", strconvPackage.Ident("AppendInt"), "(out.Buffer.Buf, ", selector, ", 10)")
+		g.P("out.RawByte('\"')")
+		return
 	case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
-		template = "out.Uint64(%s)"
+		g.P("out.RawByte('\"')")
+		g.P("out.Buffer.Buf = ", strconvPackage.Ident("AppendUint"), "(out.Buffer.Buf, ", selector, ", 10)")
+		g.P("out.RawByte('\"')")
+		return
 	case protoreflect.FloatKind:
 		template = "out.Float32(%s)"
 	case protoreflect.DoubleKind:
@@ -213,7 +264,10 @@ func emitJSONFieldWrite(g *protogen.GeneratedFile, f *protogen.Field, name strin
 	case protoreflect.StringKind:
 		template = "out.String(%s)"
 	case protoreflect.BytesKind:
-		template = "out.Base64Bytes(%s)"
+		g.P("if ", selector, "!= nil {")
+		g.P("out.Base64Bytes(", selector, ")")
+		g.P("} else { out.String(\"\") }")
+		return
 	case protoreflect.MessageKind:
 		template = "%s.MarshalEasyJSON(out)"
 	case protoreflect.GroupKind:

util/protogen/internalgengo/proto.go

@@ -39,8 +39,8 @@ func emitFieldUnmarshal(g *protogen.GeneratedFile, f *protogen.Field) {
 		g.P("data, ok := fc.MessageData()")
 		g.P(`if !ok { return fmt.Errorf("cannot unmarshal field %s", "`, f.GoName, `") }`)
 		if f.Desc.IsList() {
-			g.P(name, " = append(", name, ", new(", fieldType(g, f)[3:], "))")
-			g.P("ff := ", name, "[len(", name, ")-1]")
+			g.P(name, " = append(", name, ", ", fieldType(g, f)[2:], "{})")
+			g.P("ff := &", name, "[len(", name, ")-1]")
 			name = "ff"
 		} else if f.Oneof != nil {
 			const tmp = "oneofField"
@@ -172,11 +172,12 @@ func emitMarshalRaw(g *protogen.GeneratedFile, f *protogen.Field, name string) {
 			defer g.P("}")
 
 			name += "[i]"
+		} else {
+			g.P("if ", notNil(name), " {")
+			defer g.P("}")
 		}
 
-		g.P("if ", notNil(name), " && ", name, ".StableSize() != 0 {")
 		g.P(name, ".EmitProtobuf(mm.AppendMessage(", f.Desc.Number(), "))")
-		g.P("}")
 		return
 	}
 

util/protogen/internalgengo/proto_field_type.go

@@ -43,7 +43,10 @@ func fieldType(g *protogen.GeneratedFile, field *protogen.Field) structField {
 	case protoreflect.BytesKind:
 		typ = "[]byte"
 	case protoreflect.MessageKind:
-		typ = structField(g.QualifiedGoIdent(field.Message.GoIdent)).PointerTo()
+		typ = structField(g.QualifiedGoIdent(field.Message.GoIdent))
+		if !field.Desc.IsList() {
+			typ = typ.PointerTo()
+		}
 	case protoreflect.GroupKind:
 		panic("unimplemented")
 	}

util/protogen/internalgengo/proto_stable_compat.go

@@ -72,7 +72,7 @@ func emitFieldSize(g *protogen.GeneratedFile, f *protogen.Field) {
 	case f.Desc.IsList() && (f.Desc.Kind() == protoreflect.MessageKind || f.Desc.Kind() == protoreflect.Uint64Kind && !f.Desc.IsPacked()):
 		g.P("for i := range ", name, "{")
 		if f.Desc.Kind() == protoreflect.MessageKind {
-			g.P("size += ", protoPackage.Ident("NestedStructureSize"), "(", f.Desc.Number(), ", ", name, "[i])")
+			g.P("size += ", protoPackage.Ident("NestedStructureSizeUnchecked"), "(", f.Desc.Number(), ", &", name, "[i])")
 		} else {
 			if f.Desc.Kind() != protoreflect.Uint64Kind {
 				panic("only uint64 unpacked primitive is supported")

util/protogen/main.go

@@ -2,8 +2,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
-	"os"
 
 	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/protogen/internalgengo"
 	"google.golang.org/protobuf/compiler/protogen"
@@ -12,18 +10,10 @@ import (
 func main() {
 	var flags flag.FlagSet
 	genFuzz := flags.Bool("fuzz", false, "generate fuzz tests")
-	yamlConfigPath := flags.String("config", "", "path to the configuration")
 
 	protogen.Options{
 		ParamFunc: flags.Set,
 	}.Run(func(gen *protogen.Plugin) error {
-		if *yamlConfigPath != "" {
-			s, e := os.Getwd()
-			fmt.Fprintln(os.Stderr, s, e)
-			data, err := os.ReadFile(*yamlConfigPath)
-			fmt.Fprintln(os.Stderr, string(data), err)
-		}
-
 		for _, f := range gen.Files {
 			if f.Generate {
 				internalgengo.GenerateFile(gen, f)