.forgejo/workflows/dco.yml

@@ -1,21 +0,0 @@
-name: DCO
-on: [pull_request]
-
-jobs:
-  dco:
-    name: DCO
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.23'
-
-      - name: Run commit format checker
-        uses: https://git.frostfs.info/TrueCloudLab/dco-go@v3
-        with:
-          from: 'origin/${{ github.event.pull_request.base.ref }}'

.forgejo/workflows/tests.yml

@@ -1,39 +0,0 @@
-name: Tests and linters
-on: [pull_request]
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.23'
-          cache: true
-
-      - name: Install linters
-        run: make lint-install
-
-      - name: Run linters
-        run: make lint
-
-  tests:
-    name: Tests
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go_versions: [ '1.22', '1.23' ]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '${{ matrix.go_versions }}'
-
-      - name: Run tests
-        run: make test

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,45 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: community, triage, bug
-assignees: ''
-
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-## Possible Solution
-<!--- Not obligatory -->
-<!--- If no reason/fix/additions for the bug can be suggested, -->
-<!--- uncomment the following phrase: -->
-
-<!--- No fix can be suggested by a QA engineer. Further solutions shall be up to developers. -->
-
-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. -->
-
-1.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Regression
-<!-- Is this issue a regression? (Yes / No) -->
-<!-- If Yes, optionally please include version or commit id or PR# that caused this regression, if you have these details. -->
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Server setup and configuration:
-* Operating System and version (`uname -a`):

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: community, triage
-assignees: ''
-
----
-
-## Is your feature request related to a problem? Please describe.
-<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-## Describe the solution you'd like
-<!--- A clear and concise description of what you want to happen. -->
-
-## Describe alternatives you've considered
-<!--- A clear and concise description of any alternative solutions or features you've considered. -->
-
-## Additional context
-<!--- Add any other context or screenshots about the feature request here. -->

.github/workflows/dco.yml

@@ -0,0 +1,21 @@
+name: DCO check
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  commits_check_job:
+    runs-on: ubuntu-latest
+    name: Commits Check
+    steps:
+    - name: Get PR Commits
+      id: 'get-pr-commits'
+      uses: tim-actions/get-pr-commits@master
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+    - name: DCO Check
+      uses: tim-actions/dco@master
+      with:
+        commits: ${{ steps.get-pr-commits.outputs.commits }}

.github/workflows/tests.yml

@@ -0,0 +1,52 @@
+name: neofs-sdk-go tests
+
+on:
+  pull_request:
+    branches:
+      - master
+    types: [opened, synchronize]
+    paths-ignore:
+      - '**/*.md'
+  workflow_dispatch:
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        go_versions: [ '1.18.x', '1.19.x', '1.20.x' ]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '${{ matrix.go_versions }}'
+
+      - name: Restore Go modules from cache
+        uses: actions/cache@v3
+        with:
+          path: /home/runner/go/pkg/mod
+          key: deps-${{ hashFiles('go.sum') }}
+
+      - name: Update Go modules
+        run: make dep
+
+      - name: Run tests
+        run: make test
+
+  lint:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          only-new-issues: true

.gitignore

@@ -20,14 +20,4 @@ vendor/
 
 # coverage
 coverage.txt
-coverage.html
+coverage.html
-
-# antlr tool jar
-antlr*.jar
-
-# tempfiles
-.cache
-
-# binary
-bin/
-release/

.golangci.yml

@@ -4,16 +4,15 @@
 # options for analysis running
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 10m
+  timeout: 5m
 
   # include test files or not, default is true
-  tests: false
+  tests: true
 
 # output configuration options
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  formats:
+  format: tab
-    - format: tab
 
 # all available settings of specific linters
 linters-settings:
@@ -25,13 +24,6 @@ linters-settings:
   govet:
     # report about shadowed variables
     check-shadowing: false
-  staticcheck:
-    checks: ["all"]
-  funlen:
-    lines: 80 # default 60
-    statements: 60 # default 40
-  gocognit:
-    min-complexity: 40 # default 30
 
 linters:
   enable:
@@ -42,27 +34,23 @@ linters:
     # some default golangci-lint linters
     - errcheck
     - gosimple
-    - godot
     - ineffassign
     - staticcheck
     - typecheck
     - unused
 
     # extra linters
-    - bidichk
-    - durationcheck
     - exhaustive
-    - exportloopref
+    - godot
     - gofmt
-    - goimports
-    - misspell
-    - predeclared
-    - reassign
     - whitespace
-    - containedctx
+    - goimports
-    - funlen
-    - gocognit
-    - contextcheck
-    - protogetter
   disable-all: true
   fast: false
+
+issues:
+  include:
+    - EXC0002 # should have a comment
+    - EXC0003 # test/Test ... consider calling this
+    - EXC0004 # govet
+    - EXC0005 # C-style breaks

.pre-commit-config.yaml

@@ -1,36 +0,0 @@
-ci:
-  autofix_prs: false
-
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-    - id: check-added-large-files
-    - id: check-case-conflict
-    - id: check-executables-have-shebangs
-    - id: check-shebang-scripts-are-executable
-    - id: check-merge-conflict
-    - id: check-json
-    - id: check-xml
-    - id: check-yaml
-    - id: trailing-whitespace
-      args: [--markdown-linebreak-ext=md]
-    - id: end-of-file-fixer
-      exclude: "(.key|.interp|.tokens)$"
-
-  - repo: local
-    hooks:
-       - id: go-unit-tests
-         name: go unit tests
-         entry: make test GOFLAGS=''
-         pass_filenames: false
-         types: [go]
-         language: system
-
-  - repo: local
-    hooks:
-      - id: make-lint
-        name: Run Make Lint
-        entry: make lint
-        language: system
-        pass_filenames: false

Dockerfile

@@ -1,4 +0,0 @@
-FROM golang:1.22
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install make openjdk-17-jre -y
-WORKDIR /work

Makefile

@@ -1,16 +1,8 @@
 #!/usr/bin/make -f
 
-ANTLR_VERSION=4.13.1
-TMP_DIR := .cache
-LINT_VERSION ?= 1.60.1
-TRUECLOUDLAB_LINT_VERSION ?= 0.0.6
-OUTPUT_LINT_DIR ?= $(shell pwd)/bin
-LINT_DIR = $(OUTPUT_LINT_DIR)/golangci-lint-$(LINT_VERSION)-v$(TRUECLOUDLAB_LINT_VERSION)
-
 # Run tests
-test: GOFLAGS ?= "-cover -count=1"
 test:
-	@GOFLAGS=$(GOFLAGS) go test ./...
+	@go test ./... -cover
 
 # Pull go dependencies
 dep:
@@ -21,23 +13,9 @@ dep:
 	@CGO_ENABLED=0 \
 	go mod tidy -v && echo OK
 
-# Install linters
-lint-install:
-	@mkdir -p $(TMP_DIR)
-	@rm -rf $(TMP_DIR)/linters
-	@git -c advice.detachedHead=false clone --branch v$(TRUECLOUDLAB_LINT_VERSION) https://git.frostfs.info/TrueCloudLab/linters.git $(TMP_DIR)/linters
-	@@make -C $(TMP_DIR)/linters lib CGO_ENABLED=1 OUT_DIR=$(OUTPUT_LINT_DIR)
-	@rm -rf $(TMP_DIR)/linters
-	@rmdir $(TMP_DIR) 2>/dev/null || true
-	@CGO_ENABLED=1 GOBIN=$(LINT_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$(LINT_VERSION)
-
 # Run linters
 lint:
-	@if [ ! -d "$(LINT_DIR)" ]; then \
+	@golangci-lint --timeout=5m run
-		echo "Run make lint-install"; \
-		exit 1; \
-	fi
-	$(LINT_DIR)/golangci-lint run
 
 # Run tests with race detection and produce coverage output
 cover:
@@ -51,24 +29,6 @@ format:
 	@echo "⇒ Processing goimports check"
 	@goimports -w ./
 
-policy:
-	@wget -q https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar -O antlr4-tool.jar
-	@java -Xmx500M -cp antlr4-tool.jar org.antlr.v4.Tool -Dlanguage=Go \
-	-no-listener -visitor netmap/parser/Query.g4 netmap/parser/QueryLexer.g4
-
-# Run `make %` in truecloudlab/frostfs-sdk-go container(Golang+Java)
-docker/%:
-	@docker build -t truecloudlab/frostfs-sdk-go --platform linux/amd64 . > /dev/null
-	@docker run --rm -t \
-	-v `pwd`:/work \
-	-u "$$(id -u):$$(id -g)" \
-	--env HOME=/work \
-	truecloudlab/frostfs-sdk-go make $*
-
-# Synchronize tree service
-sync-tree:
-	@./syncTree.sh
-
 # Show this help prompt
 help:
 	@echo '  Usage:'
@@ -77,16 +37,4 @@ help:
 	@echo ''
 	@echo '  Targets:'
 	@echo ''
-	@awk '/^#/{ comment = substr($$0,3) } comment && /^[a-zA-Z][a-zA-Z0-9_-]+ ?:/{ print "   ", $$1, comment }' $(MAKEFILE_LIST) | column -t -s ':' | grep -v 'IGNORE' | sort -u
+	@awk '/^#/{ comment = substr($$0,3) } comment && /^[a-zA-Z][a-zA-Z0-9_-]+ ?:/{ print "   ", $$1, comment }' $(MAKEFILE_LIST) | column -t -s ':' | grep -v 'IGNORE' | sort -u
-
-# Activate pre-commit hooks
-pre-commit:
-	pre-commit install --hook-type pre-commit
-
-# Deactivate pre-commit hooks
-unpre-commit:
-	pre-commit uninstall --hook-type pre-commit
-
-# Run pre-commit hooks
-pre-commit-run:
-	@pre-commit run --all-files --hook-stage manual

README.md

@@ -1,6 +1,6 @@
 # frostfs-sdk-go
 Go implementation of FrostFS SDK. It contains high-level version-independent wrappers
-for structures from [frostfs-api-go](https://git.frostfs.info/TrueCloudLab/frostfs-api-go) as well as
+for structures from [frostfs-api-go](https://github.com/TrueCloudLab/frostfs-api-go) as well as
 helper functions for simplifying node/dApp implementations.
 
 ## Repository structure
@@ -14,7 +14,7 @@ There is also a reference implementation of checking algorithm which is used in
 
 ### checksum
 Contains `Checksum` type encapsulating checksum as well as it's kind.
-Currently Sha256 and [Tillich-Zemor hashsum](https://git.frostfs.info/TrueCloudLab/tzhash) are in use.
+Currently Sha256 and [Tillich-Zemor hashsum](https://github.com/TrueCloudLab/tzhash) are in use.
 
 ### owner
 `owner.ID` type represents single account interacting with FrostFS. In v2 version of protocol
@@ -27,7 +27,7 @@ Contains Bearer token type with several FrostFS-specific methods.
 
 ### ns
 In FrostFS there are 2 types of name resolution: DNS and NNS. NNS stands for Neo Name Service
-is just a [contract](https://git.frostfs.info/TrueCloudLab/frostfs-contract) deployed on a Neo blockchain.
+is just a [contract](https://github.com/TrueCloudLab/frostfs-contract) deployed on a Neo blockchain.
 Basically, NNS is just a DNS-on-chain which can be used for resolving container nice-names as well
 as any other name in dApps. See our [CoreDNS plugin](https://github.com/nspcc-dev/coredns/tree/master/plugin/nns)
 for the example of how NNS can be integrated in DNS.
@@ -42,6 +42,7 @@ Contains client for working with FrostFS.
 ```go
 var prmInit client.PrmInit
 prmInit.SetDefaultPrivateKey(key) // private key for request signing
+prmInit.ResolveFrostFSFailures() // enable erroneous status parsing
 
 var c client.Client
 c.Init(prmInit)
@@ -53,7 +54,7 @@ err := c.Dial(prmDial)
 if err != nil {
     return
 }
-
+    
 ctx, cancel := context.WithTimeout(context.Background(), 5 * time.Second)
 defer cancel()
 
@@ -76,7 +77,8 @@ if needed and perform any desired action. In the case above we may want to repor
 these details to the user as well as retry an operation, possibly with different parameters.
 Status wire-format is extendable and each node can report any set of details it wants.
 The set of reserved status codes can be found in
-[FrostFS API](https://git.frostfs.info/TrueCloudLab/frostfs-api/src/branch/master/status/types.proto).
+[FrostFS API](https://github.com/TrueCloudLab/frostfs-api/blob/master/status/types.proto). There is also
+a `client.PrmInit.ResolveFrostFSFailures()` to seamlessly convert erroneous statuses into Go error type.
 
 ### policy
 Contains helpers allowing conversion of placing policy from/to JSON representation
@@ -96,19 +98,19 @@ Contains CRUSH-like implementation of container node selection algorithm. Releva
 are described in this paper http://ceur-ws.org/Vol-2344/short10.pdf . Note that it can be
 outdated in some details.
 
-`netmap/json_tests` subfolder contains language-agnostic tests for selection algorithm.
+`netmap/json_tests` subfolder contains language-agnostic tests for selection algorithm. 
 
 ```go
 import (
-    "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
+    "github.com/TrueCloudLab/frostfs-sdk-go/netmap"
-    "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+    "github.com/TrueCloudLab/frostfs-sdk-go/object"
 )
 
 func placementNodes(addr *object.Address, p *netmap.PlacementPolicy, frostfsNodes []netmap.NodeInfo) {
     // Convert list of nodes in FrostFS API format to the intermediate representation.
     nodes := netmap.NodesFromInfo(nodes)
 
-    // Create new netmap (errors are skipped for the sake of clarity).
+    // Create new netmap (errors are skipped for the sake of clarity). 
     nm, _ := NewNetmap(nodes)
 
     // Calculate nodes of container.
@@ -129,4 +131,4 @@ Contain simple API wrappers.
 Wrapper over `zap.Logger` which is used across FrostFS codebase.
 
 ### util
-Utilities for working with signature-related code.
+Utilities for working with signature-related code.

accounting/decimal.go

@@ -1,10 +1,10 @@
 package accounting
 
-import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting"
+import "github.com/TrueCloudLab/frostfs-api-go/v2/accounting"
 
 // Decimal represents decimal number for accounting operations.
 //
-// Decimal is mutually compatible with git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting.Decimal
+// Decimal is mutually compatible with github.com/TrueCloudLab/frostfs-api-go/v2/accounting.Decimal
 // message. See ReadFromV2 / WriteToV2 methods.
 //
 // Instances can be created using built-in var declaration.

accounting/decimal_test.go

@@ -3,8 +3,8 @@ package accounting_test
 import (
 	"testing"
 
-	v2accounting "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting"
+	v2accounting "github.com/TrueCloudLab/frostfs-api-go/v2/accounting"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting"
+	"github.com/TrueCloudLab/frostfs-sdk-go/accounting"
 	"github.com/stretchr/testify/require"
 )
 

accounting/doc.go

@@ -9,11 +9,11 @@ working with Fixed8 balance precision:
 	dec.SetPrecision(8)
 
 Instances can be also used to process FrostFS API V2 protocol messages
-(see neo.fs.v2.accounting package in https://git.frostfs.info/TrueCloudLab/frostfs-api).
+(see neo.fs.v2.accounting package in https://github.com/TrueCloudLab/frostfs-api).
 
 On client side:
 
-	import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting"
+	import "github.com/TrueCloudLab/frostfs-api-go/v2/accounting"
 
 	var msg accounting.Decimal
 	dec.WriteToV2(&msg)

accounting/test/decimal.go

@@ -3,7 +3,7 @@ package accountingtest
 import (
 	"math/rand"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting"
+	"github.com/TrueCloudLab/frostfs-sdk-go/accounting"
 )
 
 // Decimal returns random accounting.Decimal.

accounting/test/doc.go

@@ -5,7 +5,7 @@ Note that importing the package into source files is highly discouraged.
 
 Random instance generation functions can be useful when testing expects any value, e.g.:
 
-	import accountingtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting/test"
+	import accountingtest "github.com/TrueCloudLab/frostfs-sdk-go/accounting/test"
 
 	dec := accountingtest.Decimal()
 	// test the value

ape/chain.go

@@ -1,52 +0,0 @@
-package ape
-
-import (
-	"errors"
-	"fmt"
-
-	apeV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/ape"
-)
-
-var (
-	ErrInvalidChainRepresentation = errors.New("invalid chain representation")
-)
-
-// ChainID is Chain's identifier.
-type ChainID []byte
-
-// Chain is an SDK representation for v2's Chain.
-//
-// Note that Chain (as well as v2's Chain) and all related entities
-// are NOT operated by Access-Policy-Engine (APE). The client is responsible
-// to convert these types to policy-engine entities.
-type Chain struct {
-	// Raw is the encoded chain kind.
-	// It assumes that Raw's bytes are the result of encoding provided by
-	// policy-engine package.
-	Raw []byte
-}
-
-// ToV2 converts Chain to v2.
-func (c *Chain) ToV2() *apeV2.Chain {
-	v2ct := new(apeV2.Chain)
-
-	if c.Raw != nil {
-		v2Raw := new(apeV2.ChainRaw)
-		v2Raw.SetRaw(c.Raw)
-		v2ct.SetKind(v2Raw)
-	}
-
-	return v2ct
-}
-
-// ReadFromV2 fills Chain from v2.
-func (c *Chain) ReadFromV2(v2ct *apeV2.Chain) error {
-	switch v := v2ct.GetKind().(type) {
-	default:
-		return fmt.Errorf("unsupported chain kind: %T", v)
-	case *apeV2.ChainRaw:
-		raw := v.GetRaw()
-		c.Raw = raw
-	}
-	return nil
-}

ape/chain_target.go

@@ -1,53 +0,0 @@
-package ape
-
-import (
-	apeV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/ape"
-)
-
-// TargetType is an SDK representation for v2's TargetType.
-type TargetType apeV2.TargetType
-
-const (
-	TargetTypeUndefined TargetType = iota
-	TargetTypeNamespace
-	TargetTypeContainer
-	TargetTypeUser
-	TargetTypeGroup
-)
-
-// ToV2 converts TargetType to v2.
-func (targetType TargetType) ToV2() apeV2.TargetType {
-	return apeV2.TargetType(targetType)
-}
-
-// FromV2 reads TargetType to v2.
-func (targetType *TargetType) FromV2(v2targetType apeV2.TargetType) {
-	*targetType = TargetType(v2targetType)
-}
-
-// ChainTarget is an SDK representation for v2's ChainTarget.
-//
-// Note that ChainTarget (as well as v2's ChainTarget) and all related entities
-// are NOT operated by Access-Policy-Engine (APE). The client is responsible
-// to convert these types to policy-engine entities.
-type ChainTarget struct {
-	TargetType TargetType
-
-	Name string
-}
-
-// ToV2 converts ChainTarget to v2.
-func (ct *ChainTarget) ToV2() *apeV2.ChainTarget {
-	v2ct := new(apeV2.ChainTarget)
-
-	v2ct.SetTargetType(ct.TargetType.ToV2())
-	v2ct.SetName(ct.Name)
-
-	return v2ct
-}
-
-// FromV2 reads ChainTarget frpm v2.
-func (ct *ChainTarget) FromV2(v2ct *apeV2.ChainTarget) {
-	ct.TargetType.FromV2(v2ct.GetTargetType())
-	ct.Name = v2ct.GetName()
-}

ape/chain_target_test.go

@@ -1,65 +0,0 @@
-package ape_test
-
-import (
-	"testing"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ape"
-	"github.com/stretchr/testify/require"
-
-	apeV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/ape"
-)
-
-var (
-	m = map[ape.TargetType]apeV2.TargetType{
-		ape.TargetTypeUndefined: apeV2.TargetTypeUndefined,
-		ape.TargetTypeNamespace: apeV2.TargetTypeNamespace,
-		ape.TargetTypeContainer: apeV2.TargetTypeContainer,
-		ape.TargetTypeUser:      apeV2.TargetTypeUser,
-		ape.TargetTypeGroup:     apeV2.TargetTypeGroup,
-	}
-)
-
-func TestTargetType(t *testing.T) {
-	for typesdk, typev2 := range m {
-		t.Run("from sdk to v2 "+typev2.String(), func(t *testing.T) {
-			v2 := typesdk.ToV2()
-			require.Equal(t, v2, typev2)
-		})
-
-		t.Run("from v2 to sdk "+typev2.String(), func(t *testing.T) {
-			var typ ape.TargetType
-			typ.FromV2(typev2)
-			require.Equal(t, typesdk, typ)
-		})
-	}
-}
-
-func TestChainTarget(t *testing.T) {
-	var (
-		typ  = ape.TargetTypeNamespace
-		name = "namespaceXXYYZZ"
-	)
-
-	t.Run("from sdk to v2", func(t *testing.T) {
-		ct := ape.ChainTarget{
-			TargetType: typ,
-			Name:       name,
-		}
-
-		v2 := ct.ToV2()
-		require.Equal(t, m[typ], v2.GetTargetType())
-		require.Equal(t, name, v2.GetName())
-	})
-
-	t.Run("from v2 to sdk", func(t *testing.T) {
-		v2 := &apeV2.ChainTarget{}
-		v2.SetTargetType(m[typ])
-		v2.SetName(name)
-
-		var ct ape.ChainTarget
-		ct.FromV2(v2)
-
-		require.Equal(t, typ, ct.TargetType)
-		require.Equal(t, name, ct.Name)
-	})
-}

ape/chain_test.go

@@ -1,43 +0,0 @@
-package ape_test
-
-import (
-	"testing"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ape"
-	"github.com/stretchr/testify/require"
-
-	apeV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/ape"
-)
-
-const (
-	encoded = `{"ID":"","Rules":[{"Status":"Allow","Actions":{"Inverted":false,"Names":["GetObject"]},"Resources":{"Inverted":false,"Names":["native:object/*"]},"Any":false,"Condition":[{"Op":"StringEquals","Object":"Resource","Key":"Department","Value":"HR"}]}],"MatchType":"DenyPriority"}`
-)
-
-func TestChainData(t *testing.T) {
-	t.Run("raw chain", func(t *testing.T) {
-		var c ape.Chain
-
-		b := []byte(encoded)
-		c.Raw = b
-
-		v2, ok := c.ToV2().GetKind().(*apeV2.ChainRaw)
-		require.True(t, ok)
-		require.Equal(t, b, v2.Raw)
-	})
-}
-
-func TestChainMessageV2(t *testing.T) {
-	b := []byte(encoded)
-
-	v2Raw := &apeV2.ChainRaw{}
-	v2Raw.SetRaw(b)
-
-	v2 := &apeV2.Chain{}
-	v2.SetKind(v2Raw)
-
-	var c ape.Chain
-	c.ReadFromV2(v2)
-
-	require.NotNil(t, c.Raw)
-	require.Equal(t, b, c.Raw)
-}

audit/doc.go

@@ -0,0 +1,26 @@
+/*
+Package audit provides features to process data audit in FrostFS system.
+
+Result type groups values which can be gathered during data audit process:
+
+	var res audit.Result
+	res.ForEpoch(32)
+	res.ForContainer(cnr)
+	// ...
+	res.Complete()
+
+Result instances can be stored in a binary format. On reporter side:
+
+	data := res.Marshal()
+	// send data
+
+On receiver side:
+
+	var res audit.Result
+	err := res.Unmarshal(data)
+	// ...
+
+Using package types in an application is recommended to potentially work with
+different protocol versions with which these types are compatible.
+*/
+package audit

audit/result.go

@@ -0,0 +1,377 @@
+package audit
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/TrueCloudLab/frostfs-api-go/v2/audit"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
+	"github.com/TrueCloudLab/frostfs-sdk-go/version"
+)
+
+// Result represents report on the results of the data audit in FrostFS system.
+//
+// Result is mutually binary-compatible with github.com/TrueCloudLab/frostfs-api-go/v2/audit.DataAuditResult
+// message. See Marshal / Unmarshal methods.
+//
+// Instances can be created using built-in var declaration.
+type Result struct {
+	versionEncoded bool
+
+	v2 audit.DataAuditResult
+}
+
+// Marshal encodes Result into a canonical FrostFS binary format (Protocol Buffers
+// with direct field order).
+//
+// Writes version.Current() protocol version into the resulting message if Result
+// hasn't been already decoded from such a message using Unmarshal.
+//
+// See also Unmarshal.
+func (r *Result) Marshal() []byte {
+	if !r.versionEncoded {
+		var verV2 refs.Version
+		version.Current().WriteToV2(&verV2)
+		r.v2.SetVersion(&verV2)
+		r.versionEncoded = true
+	}
+
+	return r.v2.StableMarshal(nil)
+}
+
+var errCIDNotSet = errors.New("container ID is not set")
+
+// Unmarshal decodes Result from its canonical FrostFS binary format (Protocol Buffers
+// with direct field order). Returns an error describing a format violation.
+//
+// See also Marshal.
+func (r *Result) Unmarshal(data []byte) error {
+	err := r.v2.Unmarshal(data)
+	if err != nil {
+		return err
+	}
+
+	r.versionEncoded = true
+
+	// format checks
+
+	var cID cid.ID
+
+	cidV2 := r.v2.GetContainerID()
+	if cidV2 == nil {
+		return errCIDNotSet
+	}
+
+	err = cID.ReadFromV2(*cidV2)
+	if err != nil {
+		return fmt.Errorf("could not convert V2 container ID: %w", err)
+	}
+
+	var (
+		oID   oid.ID
+		oidV2 refs.ObjectID
+	)
+
+	for _, oidV2 = range r.v2.GetPassSG() {
+		err = oID.ReadFromV2(oidV2)
+		if err != nil {
+			return fmt.Errorf("invalid passed storage group ID: %w", err)
+		}
+	}
+
+	for _, oidV2 = range r.v2.GetFailSG() {
+		err = oID.ReadFromV2(oidV2)
+		if err != nil {
+			return fmt.Errorf("invalid failed storage group ID: %w", err)
+		}
+	}
+
+	return nil
+}
+
+// Epoch returns FrostFS epoch when the data associated with the Result was audited.
+//
+// Zero Result has zero epoch.
+//
+// See also ForEpoch.
+func (r Result) Epoch() uint64 {
+	return r.v2.GetAuditEpoch()
+}
+
+// ForEpoch specifies FrostFS epoch when the data associated with the Result was audited.
+//
+// See also Epoch.
+func (r *Result) ForEpoch(epoch uint64) {
+	r.v2.SetAuditEpoch(epoch)
+}
+
+// Container returns identifier of the container with which the data audit Result
+// is associated and a bool that indicates container ID field presence in the Result.
+//
+// Zero Result does not have container ID.
+//
+// See also ForContainer.
+func (r Result) Container() (cid.ID, bool) {
+	var cID cid.ID
+
+	cidV2 := r.v2.GetContainerID()
+	if cidV2 != nil {
+		_ = cID.ReadFromV2(*cidV2)
+		return cID, true
+	}
+
+	return cID, false
+}
+
+// ForContainer sets identifier of the container with which the data audit Result
+// is associated.
+//
+// See also Container.
+func (r *Result) ForContainer(cnr cid.ID) {
+	var cidV2 refs.ContainerID
+	cnr.WriteToV2(&cidV2)
+
+	r.v2.SetContainerID(&cidV2)
+}
+
+// AuditorKey returns public key of the auditing FrostFS Inner Ring node in
+// a FrostFS binary key format.
+//
+// Zero Result has nil key. Return value MUST NOT be mutated: to do this,
+// first make a copy.
+//
+// See also SetAuditorPublicKey.
+func (r Result) AuditorKey() []byte {
+	return r.v2.GetPublicKey()
+}
+
+// SetAuditorKey specifies public key of the auditing FrostFS Inner Ring node in
+// a FrostFS binary key format.
+//
+// Argument MUST NOT be mutated at least until the end of using the Result.
+//
+// See also AuditorKey.
+func (r *Result) SetAuditorKey(key []byte) {
+	r.v2.SetPublicKey(key)
+}
+
+// Completed returns completion state of the data audit associated with the Result.
+//
+// Zero Result corresponds to incomplete data audit.
+//
+// See also Complete.
+func (r Result) Completed() bool {
+	return r.v2.GetComplete()
+}
+
+// Complete marks the data audit associated with the Result as completed.
+//
+// See also Completed.
+func (r *Result) Complete() {
+	r.v2.SetComplete(true)
+}
+
+// RequestsPoR returns number of requests made by Proof-of-Retrievability
+// audit check to get all headers of the objects inside storage groups.
+//
+// Zero Result has zero requests.
+//
+// See also SetRequestsPoR.
+func (r Result) RequestsPoR() uint32 {
+	return r.v2.GetRequests()
+}
+
+// SetRequestsPoR sets number of requests made by Proof-of-Retrievability
+// audit check to get all headers of the objects inside storage groups.
+//
+// See also RequestsPoR.
+func (r *Result) SetRequestsPoR(v uint32) {
+	r.v2.SetRequests(v)
+}
+
+// RetriesPoR returns number of retries made by Proof-of-Retrievability
+// audit check to get all headers of the objects inside storage groups.
+//
+// Zero Result has zero retries.
+//
+// See also SetRetriesPoR.
+func (r Result) RetriesPoR() uint32 {
+	return r.v2.GetRetries()
+}
+
+// SetRetriesPoR sets number of retries made by Proof-of-Retrievability
+// audit check to get all headers of the objects inside storage groups.
+//
+// See also RetriesPoR.
+func (r *Result) SetRetriesPoR(v uint32) {
+	r.v2.SetRetries(v)
+}
+
+// IteratePassedStorageGroups iterates over all storage groups that passed
+// Proof-of-Retrievability audit check and passes them into f. Breaks on f's
+// false return, f MUST NOT be nil.
+//
+// Zero Result has no passed storage groups and doesn't call f.
+//
+// See also SubmitPassedStorageGroup.
+func (r Result) IteratePassedStorageGroups(f func(oid.ID) bool) {
+	r2 := r.v2.GetPassSG()
+
+	var id oid.ID
+
+	for i := range r2 {
+		_ = id.ReadFromV2(r2[i])
+
+		if !f(id) {
+			return
+		}
+	}
+}
+
+// SubmitPassedStorageGroup marks storage group as passed Proof-of-Retrievability
+// audit check.
+//
+// See also IteratePassedStorageGroups.
+func (r *Result) SubmitPassedStorageGroup(sg oid.ID) {
+	var idV2 refs.ObjectID
+	sg.WriteToV2(&idV2)
+
+	r.v2.SetPassSG(append(r.v2.GetPassSG(), idV2))
+}
+
+// IterateFailedStorageGroups is similar to IteratePassedStorageGroups but for failed groups.
+//
+// See also SubmitFailedStorageGroup.
+func (r Result) IterateFailedStorageGroups(f func(oid.ID) bool) {
+	v := r.v2.GetFailSG()
+	var id oid.ID
+
+	for i := range v {
+		_ = id.ReadFromV2(v[i])
+		if !f(id) {
+			return
+		}
+	}
+}
+
+// SubmitFailedStorageGroup is similar to SubmitPassedStorageGroup but for failed groups.
+//
+// See also IterateFailedStorageGroups.
+func (r *Result) SubmitFailedStorageGroup(sg oid.ID) {
+	var idV2 refs.ObjectID
+	sg.WriteToV2(&idV2)
+
+	r.v2.SetFailSG(append(r.v2.GetFailSG(), idV2))
+}
+
+// Hits returns number of sampled objects under audit placed
+// in an optimal way according to the container's placement policy
+// when checking Proof-of-Placement.
+//
+// Zero result has zero hits.
+//
+// See also SetHits.
+func (r Result) Hits() uint32 {
+	return r.v2.GetHit()
+}
+
+// SetHits sets number of sampled objects under audit placed
+// in an optimal way according to the containers placement policy
+// when checking Proof-of-Placement.
+//
+// See also Hits.
+func (r *Result) SetHits(hit uint32) {
+	r.v2.SetHit(hit)
+}
+
+// Misses returns number of sampled objects under audit placed
+// in suboptimal way according to the container's placement policy,
+// but still at a satisfactory level when checking Proof-of-Placement.
+//
+// Zero Result has zero misses.
+//
+// See also SetMisses.
+func (r Result) Misses() uint32 {
+	return r.v2.GetMiss()
+}
+
+// SetMisses sets number of sampled objects under audit placed
+// in suboptimal way according to the container's placement policy,
+// but still at a satisfactory level when checking Proof-of-Placement.
+//
+// See also Misses.
+func (r *Result) SetMisses(miss uint32) {
+	r.v2.SetMiss(miss)
+}
+
+// Failures returns number of sampled objects under audit stored
+// in a way not confirming placement policy or not found at all
+// when checking Proof-of-Placement.
+//
+// Zero result has zero failures.
+//
+// See also SetFailures.
+func (r Result) Failures() uint32 {
+	return r.v2.GetFail()
+}
+
+// SetFailures sets number of sampled objects under audit stored
+// in a way not confirming placement policy or not found at all
+// when checking Proof-of-Placement.
+//
+// See also Failures.
+func (r *Result) SetFailures(fail uint32) {
+	r.v2.SetFail(fail)
+}
+
+// IteratePassedStorageNodes iterates over all storage nodes that passed at least one
+// Proof-of-Data-Possession audit check and passes their public keys into f. Breaks on
+// f's false return.
+//
+// f MUST NOT be nil and MUST NOT mutate parameter passed into it at least until
+// the end of using the Result.
+//
+// Zero Result has no passed storage nodes and doesn't call f.
+//
+// See also SubmitPassedStorageNode.
+func (r Result) IteratePassedStorageNodes(f func([]byte) bool) {
+	v := r.v2.GetPassNodes()
+
+	for i := range v {
+		if !f(v[i]) {
+			return
+		}
+	}
+}
+
+// SubmitPassedStorageNodes marks storage node list as passed Proof-of-Data-Possession
+// audit check. The list contains public keys.
+//
+// Argument and its elements MUST NOT be mutated at least until the end of using the Result.
+//
+// See also IteratePassedStorageNodes.
+func (r *Result) SubmitPassedStorageNodes(list [][]byte) {
+	r.v2.SetPassNodes(list)
+}
+
+// IterateFailedStorageNodes is similar to IteratePassedStorageNodes but for failed nodes.
+//
+// See also SubmitPassedStorageNodes.
+func (r Result) IterateFailedStorageNodes(f func([]byte) bool) {
+	v := r.v2.GetFailNodes()
+
+	for i := range v {
+		if !f(v[i]) {
+			return
+		}
+	}
+}
+
+// SubmitFailedStorageNodes is similar to SubmitPassedStorageNodes but for failed nodes.
+//
+// See also IterateFailedStorageNodes.
+func (r *Result) SubmitFailedStorageNodes(list [][]byte) {
+	r.v2.SetFailNodes(list)
+}

audit/result_test.go

@@ -0,0 +1,191 @@
+package audit_test
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/TrueCloudLab/frostfs-sdk-go/audit"
+	audittest "github.com/TrueCloudLab/frostfs-sdk-go/audit/test"
+	cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
+	oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test"
+	"github.com/stretchr/testify/require"
+)
+
+func TestResultData(t *testing.T) {
+	var r audit.Result
+
+	countSG := func(passed bool, f func(oid.ID)) int {
+		called := 0
+
+		ff := func(arg oid.ID) bool {
+			called++
+
+			if f != nil {
+				f(arg)
+			}
+
+			return true
+		}
+
+		if passed {
+			r.IteratePassedStorageGroups(ff)
+		} else {
+			r.IterateFailedStorageGroups(ff)
+		}
+
+		return called
+	}
+
+	countPassSG := func(f func(oid.ID)) int { return countSG(true, f) }
+	countFailSG := func(f func(oid.ID)) int { return countSG(false, f) }
+
+	countNodes := func(passed bool, f func([]byte)) int {
+		called := 0
+
+		ff := func(arg []byte) bool {
+			called++
+
+			if f != nil {
+				f(arg)
+			}
+
+			return true
+		}
+
+		if passed {
+			r.IteratePassedStorageNodes(ff)
+		} else {
+			r.IterateFailedStorageNodes(ff)
+		}
+
+		return called
+	}
+
+	countPassNodes := func(f func([]byte)) int { return countNodes(true, f) }
+	countFailNodes := func(f func([]byte)) int { return countNodes(false, f) }
+
+	require.Zero(t, r.Epoch())
+	_, set := r.Container()
+	require.False(t, set)
+	require.Nil(t, r.AuditorKey())
+	require.False(t, r.Completed())
+	require.Zero(t, r.RequestsPoR())
+	require.Zero(t, r.RetriesPoR())
+	require.Zero(t, countPassSG(nil))
+	require.Zero(t, countFailSG(nil))
+	require.Zero(t, countPassNodes(nil))
+	require.Zero(t, countFailNodes(nil))
+
+	epoch := uint64(13)
+	r.ForEpoch(epoch)
+	require.Equal(t, epoch, r.Epoch())
+
+	cnr := cidtest.ID()
+	r.ForContainer(cnr)
+	cID, set := r.Container()
+	require.True(t, set)
+	require.Equal(t, cnr, cID)
+
+	key := []byte{1, 2, 3}
+	r.SetAuditorKey(key)
+	require.Equal(t, key, r.AuditorKey())
+
+	r.Complete()
+	require.True(t, r.Completed())
+
+	requests := uint32(2)
+	r.SetRequestsPoR(requests)
+	require.Equal(t, requests, r.RequestsPoR())
+
+	retries := uint32(1)
+	r.SetRetriesPoR(retries)
+	require.Equal(t, retries, r.RetriesPoR())
+
+	passSG1, passSG2 := oidtest.ID(), oidtest.ID()
+	r.SubmitPassedStorageGroup(passSG1)
+	r.SubmitPassedStorageGroup(passSG2)
+
+	called1, called2 := false, false
+
+	require.EqualValues(t, 2, countPassSG(func(id oid.ID) {
+		if id.Equals(passSG1) {
+			called1 = true
+		} else if id.Equals(passSG2) {
+			called2 = true
+		}
+	}))
+	require.True(t, called1)
+	require.True(t, called2)
+
+	failSG1, failSG2 := oidtest.ID(), oidtest.ID()
+	r.SubmitFailedStorageGroup(failSG1)
+	r.SubmitFailedStorageGroup(failSG2)
+
+	called1, called2 = false, false
+
+	require.EqualValues(t, 2, countFailSG(func(id oid.ID) {
+		if id.Equals(failSG1) {
+			called1 = true
+		} else if id.Equals(failSG2) {
+			called2 = true
+		}
+	}))
+	require.True(t, called1)
+	require.True(t, called2)
+
+	hit := uint32(1)
+	r.SetHits(hit)
+	require.Equal(t, hit, r.Hits())
+
+	miss := uint32(2)
+	r.SetMisses(miss)
+	require.Equal(t, miss, r.Misses())
+
+	fail := uint32(3)
+	r.SetFailures(fail)
+	require.Equal(t, fail, r.Failures())
+
+	passNodes := [][]byte{{1}, {2}}
+	r.SubmitPassedStorageNodes(passNodes)
+
+	called1, called2 = false, false
+
+	require.EqualValues(t, 2, countPassNodes(func(arg []byte) {
+		if bytes.Equal(arg, passNodes[0]) {
+			called1 = true
+		} else if bytes.Equal(arg, passNodes[1]) {
+			called2 = true
+		}
+	}))
+	require.True(t, called1)
+	require.True(t, called2)
+
+	failNodes := [][]byte{{3}, {4}}
+	r.SubmitFailedStorageNodes(failNodes)
+
+	called1, called2 = false, false
+
+	require.EqualValues(t, 2, countFailNodes(func(arg []byte) {
+		if bytes.Equal(arg, failNodes[0]) {
+			called1 = true
+		} else if bytes.Equal(arg, failNodes[1]) {
+			called2 = true
+		}
+	}))
+	require.True(t, called1)
+	require.True(t, called2)
+}
+
+func TestResultEncoding(t *testing.T) {
+	r := *audittest.Result()
+
+	t.Run("binary", func(t *testing.T) {
+		data := r.Marshal()
+
+		var r2 audit.Result
+		require.NoError(t, r2.Unmarshal(data))
+
+		require.Equal(t, r, r2)
+	})
+}

audit/test/doc.go

@@ -0,0 +1,13 @@
+/*
+Package audittest provides functions for convenient testing of audit package API.
+
+Note that importing the package into source files is highly discouraged.
+
+Random instance generation functions can be useful when testing expects any value, e.g.:
+
+	import audittest "github.com/TrueCloudLab/frostfs-sdk-go/audit/test"
+
+	dec := audittest.Result()
+	// test the value
+*/
+package audittest

audit/test/generate.go

@@ -0,0 +1,36 @@
+package audittest
+
+import (
+	"github.com/TrueCloudLab/frostfs-sdk-go/audit"
+	cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
+	oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test"
+)
+
+// Result returns random audit.Result.
+func Result() *audit.Result {
+	var x audit.Result
+
+	x.ForContainer(cidtest.ID())
+	x.SetAuditorKey([]byte("key"))
+	x.Complete()
+	x.ForEpoch(44)
+	x.SetHits(55)
+	x.SetMisses(66)
+	x.SetFailures(77)
+	x.SetRequestsPoR(88)
+	x.SetRequestsPoR(99)
+	x.SubmitFailedStorageNodes([][]byte{
+		[]byte("node1"),
+		[]byte("node2"),
+	})
+	x.SubmitPassedStorageNodes([][]byte{
+		[]byte("node3"),
+		[]byte("node4"),
+	})
+	x.SubmitPassedStorageGroup(oidtest.ID())
+	x.SubmitPassedStorageGroup(oidtest.ID())
+	x.SubmitFailedStorageGroup(oidtest.ID())
+	x.SubmitFailedStorageGroup(oidtest.ID())
+
+	return &x
+}

bearer/bearer.go

@@ -5,20 +5,18 @@ import (
 	"errors"
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/acl"
-	apeV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/ape"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	apeSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ape"
+	frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
+	"github.com/TrueCloudLab/frostfs-sdk-go/eacl"
-	frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
+	"github.com/TrueCloudLab/frostfs-sdk-go/user"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 )
 
 // Token represents bearer token for object service operations.
 //
-// Token is mutually compatible with git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl.BearerToken
+// Token is mutually compatible with github.com/TrueCloudLab/frostfs-api-go/v2/acl.BearerToken
 // message. See ReadFromV2 / WriteToV2 methods.
 //
 // Instances can be created using built-in var declaration.
@@ -34,84 +32,6 @@ type Token struct {
 
 	sigSet bool
 	sig    refs.Signature
-
-	apeOverrideSet bool
-	apeOverride    APEOverride
-
-	impersonate bool
-}
-
-// APEOverride is the list of APE chains defined for a target.
-// These chains are meant to serve as overrides to the already defined (or even undefined)
-// APE chains for the target (see contract `Policy`).
-//
-// The server-side processing of the bearer token with set APE overrides must verify if a client is permitted
-// to override chains for the target, preventing unauthorized access through the APE mechanism.
-type APEOverride struct {
-	// Target for which chains are applied.
-	Target apeSDK.ChainTarget
-
-	// The list of APE chains.
-	Chains []apeSDK.Chain
-}
-
-// Marshal marshals APEOverride into a protobuf binary form.
-func (c *APEOverride) Marshal() ([]byte, error) {
-	return c.ToV2().StableMarshal(nil), nil
-}
-
-// Unmarshal unmarshals protobuf binary representation of APEOverride.
-func (c *APEOverride) Unmarshal(data []byte) error {
-	overrideV2 := new(acl.APEOverride)
-	if err := overrideV2.Unmarshal(data); err != nil {
-		return err
-	}
-
-	return c.FromV2(overrideV2)
-}
-
-// MarshalJSON encodes APEOverride to protobuf JSON format.
-func (c *APEOverride) MarshalJSON() ([]byte, error) {
-	return c.ToV2().MarshalJSON()
-}
-
-// UnmarshalJSON decodes APEOverride from protobuf JSON format.
-func (c *APEOverride) UnmarshalJSON(data []byte) error {
-	overrideV2 := new(acl.APEOverride)
-	if err := overrideV2.UnmarshalJSON(data); err != nil {
-		return err
-	}
-
-	return c.FromV2(overrideV2)
-}
-
-func (c *APEOverride) FromV2(tokenAPEChains *acl.APEOverride) error {
-	c.Target.FromV2(tokenAPEChains.GetTarget())
-	if chains := tokenAPEChains.GetChains(); len(chains) > 0 {
-		c.Chains = make([]apeSDK.Chain, len(chains))
-		for i := range chains {
-			if err := c.Chains[i].ReadFromV2(chains[i]); err != nil {
-				return fmt.Errorf("invalid APE chain: %w", err)
-			}
-		}
-	}
-	return nil
-}
-
-func (c *APEOverride) ToV2() *acl.APEOverride {
-	if c == nil {
-		return nil
-	}
-
-	apeOverride := new(acl.APEOverride)
-	apeOverride.SetTarget(c.Target.ToV2())
-	chains := make([]*apeV2.Chain, len(c.Chains))
-	for i := range c.Chains {
-		chains[i] = c.Chains[i].ToV2()
-	}
-	apeOverride.SetChains(chains)
-
-	return apeOverride
 }
 
 // reads Token from the acl.BearerToken message. If checkFieldPresence is set,
@@ -124,13 +44,10 @@ func (b *Token) readFromV2(m acl.BearerToken, checkFieldPresence bool) error {
 		return errors.New("missing token body")
 	}
 
-	b.impersonate = body.GetImpersonate()
-
-	apeOverrides := body.GetAPEOverride()
 	eaclTable := body.GetEACL()
 	if b.eaclTableSet = eaclTable != nil; b.eaclTableSet {
 		b.eaclTable = *eacl.NewTableFromV2(eaclTable)
-	} else if checkFieldPresence && !b.impersonate && apeOverrides == nil {
+	} else if checkFieldPresence {
 		return errors.New("missing eACL table")
 	}
 
@@ -151,14 +68,6 @@ func (b *Token) readFromV2(m acl.BearerToken, checkFieldPresence bool) error {
 		return errors.New("missing token lifetime")
 	}
 
-	if b.apeOverrideSet = apeOverrides != nil; b.apeOverrideSet {
-		if err = b.apeOverride.FromV2(apeOverrides); err != nil {
-			return err
-		}
-	} else if checkFieldPresence && !b.impersonate && !b.eaclTableSet {
-		return errors.New("missing APE override")
-	}
-
 	sig := m.GetSignature()
 	if b.sigSet = sig != nil; sig != nil {
 		b.sig = *sig
@@ -177,7 +86,7 @@ func (b *Token) ReadFromV2(m acl.BearerToken) error {
 }
 
 func (b Token) fillBody() *acl.BearerTokenBody {
-	if !b.eaclTableSet && !b.targetUserSet && !b.lifetimeSet && !b.impersonate && !b.apeOverrideSet {
+	if !b.eaclTableSet && !b.targetUserSet && !b.lifetimeSet {
 		return nil
 	}
 
@@ -203,12 +112,6 @@ func (b Token) fillBody() *acl.BearerTokenBody {
 		body.SetLifetime(&lifetime)
 	}
 
-	if b.apeOverrideSet {
-		body.SetAPEOverride(b.apeOverride.ToV2())
-	}
-
-	body.SetImpersonate(b.impersonate)
-
 	return &body
 }
 
@@ -305,36 +208,6 @@ func (b Token) EACLTable() eacl.Table {
 	return eacl.Table{}
 }
 
-// SetAPEOverride sets APE override to the bearer token.
-//
-// See also: APEOverride.
-func (b *Token) SetAPEOverride(v APEOverride) {
-	b.apeOverride = v
-	b.apeOverrideSet = true
-}
-
-// APEOverride returns APE override set by SetAPEOverride.
-//
-// Zero Token has zero APEOverride.
-func (b *Token) APEOverride() APEOverride {
-	if b.apeOverrideSet {
-		return b.apeOverride
-	}
-
-	return APEOverride{}
-}
-
-// SetImpersonate mark token as impersonate to consider token signer as request owner.
-// If this field is true extended EACLTable in token body isn't processed.
-func (b *Token) SetImpersonate(v bool) {
-	b.impersonate = v
-}
-
-// Impersonate returns true if token is impersonated.
-func (b Token) Impersonate() bool {
-	return b.impersonate
-}
-
 // AssertContainer checks if the token is valid within the given container.
 //
 // Note: cnr is assumed to refer to the issuer's container, otherwise the check

bearer/bearer_test.go

@@ -3,20 +3,19 @@ package bearer_test
 import (
 	"bytes"
 	"math/rand"
-	"reflect"
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/acl"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
+	"github.com/TrueCloudLab/frostfs-sdk-go/bearer"
-	bearertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer/test"
+	bearertest "github.com/TrueCloudLab/frostfs-sdk-go/bearer/test"
-	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
+	cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
+	frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
-	frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
+	frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl"
+	"github.com/TrueCloudLab/frostfs-sdk-go/eacl"
-	eacltest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl/test"
+	eacltest "github.com/TrueCloudLab/frostfs-sdk-go/eacl/test"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
+	"github.com/TrueCloudLab/frostfs-sdk-go/user"
-	usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test"
+	usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/stretchr/testify/require"
 )
@@ -82,58 +81,6 @@ func TestToken_SetEACLTable(t *testing.T) {
 	require.True(t, isEqualEACLTables(eaclTable, val.EACLTable()))
 }
 
-func TestToken_SetAPEOverrides(t *testing.T) {
-	var val bearer.Token
-	var m acl.BearerToken
-	filled := bearertest.Token()
-
-	val.WriteToV2(&m)
-	require.Zero(t, m.GetBody())
-
-	val2 := filled
-
-	require.NoError(t, val2.Unmarshal(val.Marshal()))
-	require.Zero(t, val2.APEOverride())
-
-	val2 = filled
-
-	jd, err := val.MarshalJSON()
-	require.NoError(t, err)
-
-	require.NoError(t, val2.UnmarshalJSON(jd))
-	require.Zero(t, val2.APEOverride())
-
-	// set value
-
-	tApe := bearertest.APEOverride()
-
-	val.SetAPEOverride(tApe)
-	require.Equal(t, tApe, val.APEOverride())
-
-	val.WriteToV2(&m)
-	require.NotNil(t, m.GetBody().GetAPEOverride())
-	require.True(t, tokenAPEOverridesEqual(tApe.ToV2(), m.GetBody().GetAPEOverride()))
-
-	val2 = filled
-
-	require.NoError(t, val2.Unmarshal(val.Marshal()))
-	apeOverride := val2.APEOverride()
-	require.True(t, tokenAPEOverridesEqual(tApe.ToV2(), apeOverride.ToV2()))
-
-	val2 = filled
-
-	jd, err = val.MarshalJSON()
-	require.NoError(t, err)
-
-	require.NoError(t, val2.UnmarshalJSON(jd))
-	apeOverride = val.APEOverride()
-	require.True(t, tokenAPEOverridesEqual(tApe.ToV2(), apeOverride.ToV2()))
-}
-
-func tokenAPEOverridesEqual(lhs, rhs *acl.APEOverride) bool {
-	return reflect.DeepEqual(lhs, rhs)
-}
-
 func TestToken_ForUser(t *testing.T) {
 	var val bearer.Token
 	var m acl.BearerToken
@@ -160,7 +107,7 @@ func TestToken_ForUser(t *testing.T) {
 	require.Zero(t, m.GetBody())
 
 	// set value
-	usr := usertest.ID()
+	usr := *usertest.ID()
 
 	var usrV2 refs.OwnerID
 	usr.WriteToV2(&usrV2)
@@ -296,11 +243,11 @@ func TestToken_AssertContainer(t *testing.T) {
 
 func TestToken_AssertUser(t *testing.T) {
 	var val bearer.Token
-	usr := usertest.ID()
+	usr := *usertest.ID()
 
 	require.True(t, val.AssertUser(usr))
 
-	val.ForUser(usertest.ID())
+	val.ForUser(*usertest.ID())
 	require.False(t, val.AssertUser(usr))
 
 	val.ForUser(usr)
@@ -376,16 +323,12 @@ func TestToken_ReadFromV2(t *testing.T) {
 
 	require.NoError(t, val.ReadFromV2(m))
 
-	body.SetEACL(nil)
-	body.SetImpersonate(true)
-	require.NoError(t, val.ReadFromV2(m))
-
 	var m2 acl.BearerToken
 
 	val.WriteToV2(&m2)
 	require.Equal(t, m, m2)
 
-	usr, usr2 := usertest.ID(), usertest.ID()
+	usr, usr2 := *usertest.ID(), *usertest.ID()
 
 	require.True(t, val.AssertUser(usr))
 	require.True(t, val.AssertUser(usr2))

bearer/doc.go

@@ -22,7 +22,7 @@ Bearer token must be signed by owner of the container.
 Provide signed token in JSON or binary format to the request sender. Request
 sender can attach this bearer token to the object service requests:
 
-	import sdkClient "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
+	import sdkClient "github.com/TrueCloudLab/frostfs-sdk-go/client"
 
 	var headParams sdkClient.PrmObjectHead
 	headParams.WithBearerToken(bearerToken)

bearer/test/generate.go

@@ -1,10 +1,9 @@
 package bearertest
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ape"
+	"github.com/TrueCloudLab/frostfs-sdk-go/bearer"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
+	eacltest "github.com/TrueCloudLab/frostfs-sdk-go/eacl/test"
-	eacltest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl/test"
+	usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test"
-	usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test"
 )
 
 // Token returns random bearer.Token.
@@ -14,19 +13,8 @@ func Token() (t bearer.Token) {
 	t.SetExp(3)
 	t.SetNbf(2)
 	t.SetIat(1)
-	t.ForUser(usertest.ID())
+	t.ForUser(*usertest.ID())
 	t.SetEACLTable(*eacltest.Table())
-	t.SetAPEOverride(APEOverride())
 
 	return t
 }
-
-func APEOverride() bearer.APEOverride {
-	return bearer.APEOverride{
-		Target: ape.ChainTarget{
-			TargetType: ape.TargetTypeContainer,
-			Name:       "F8JsMnChywiPvbDvpxMbjTjx5KhWHHp6gCDt8BhzL9kF",
-		},
-		Chains: []ape.Chain{{Raw: []byte("{}")}},
-	}
-}

checksum/checksum.go

@@ -6,13 +6,13 @@ import (
 	"errors"
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	"git.frostfs.info/TrueCloudLab/tzhash/tz"
+	"github.com/TrueCloudLab/tzhash/tz"
 )
 
 // Checksum represents checksum of some digital data.
 //
-// Checksum is mutually compatible with git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs.Checksum
+// Checksum is mutually compatible with github.com/TrueCloudLab/frostfs-api-go/v2/refs.Checksum
 // message. See ReadFromV2 / WriteToV2 methods.
 //
 // Instances can be created using built-in var declaration.
@@ -24,17 +24,17 @@ type Checksum refs.Checksum
 
 // Type represents the enumeration
 // of checksum types.
-type Type refs.ChecksumType
+type Type uint8
 
 const (
 	// Unknown is an undefined checksum type.
-	Unknown Type = Type(refs.UnknownChecksum)
+	Unknown Type = iota
 
 	// SHA256 is a SHA256 checksum type.
-	SHA256 = Type(refs.SHA256)
+	SHA256
 
 	// TZ is a Tillich-Zémor checksum type.
-	TZ = Type(refs.TillichZemor)
+	TZ
 )
 
 // ReadFromV2 reads Checksum from the refs.Checksum message. Checks if the

checksum/checksum_test.go

@@ -5,8 +5,8 @@ import (
 	"crypto/sha256"
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	"git.frostfs.info/TrueCloudLab/tzhash/tz"
+	"github.com/TrueCloudLab/tzhash/tz"
 	"github.com/stretchr/testify/require"
 )
 

checksum/example_test.go

@@ -2,11 +2,11 @@ package checksum
 
 import (
 	"bytes"
-	"crypto/rand"
 	"crypto/sha256"
 	"fmt"
+	"math/rand"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
 )
 
 func ExampleCalculate() {

checksum/test/doc.go

@@ -5,7 +5,7 @@ Note that importing the package into source files is highly discouraged.
 
 Random instance generation functions can be useful when testing expects any value, e.g.:
 
-	import checksumtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum/test"
+	import checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test"
 
 	cs := checksumtest.Checksum()
 	// test the value

checksum/test/generate.go

@@ -1,17 +1,17 @@
 package checksumtest
 
 import (
-	"crypto/rand"
 	"crypto/sha256"
+	"math/rand"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum"
+	"github.com/TrueCloudLab/frostfs-sdk-go/checksum"
 )
 
 // Checksum returns random checksum.Checksum.
 func Checksum() checksum.Checksum {
 	var cs [sha256.Size]byte
 
-	_, _ = rand.Read(cs[:])
+	rand.Read(cs[:])
 
 	var x checksum.Checksum
 

client/accounting.go

@@ -2,50 +2,28 @@ package client
 
 import (
 	"context"
-	"fmt"
 
-	v2accounting "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting"
+	v2accounting "github.com/TrueCloudLab/frostfs-api-go/v2/accounting"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	"github.com/TrueCloudLab/frostfs-sdk-go/accounting"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-sdk-go/user"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/accounting"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 )
 
 // PrmBalanceGet groups parameters of BalanceGet operation.
 type PrmBalanceGet struct {
-	XHeaders []string
+	prmCommonMeta
 
-	Account user.ID
+	accountSet bool
+	account    user.ID
 }
 
 // SetAccount sets identifier of the FrostFS account for which the balance is requested.
 // Required parameter.
-//
-// Deprecated: Use PrmBalanceGet.Account instead.
 func (x *PrmBalanceGet) SetAccount(id user.ID) {
-	x.Account = id
+	x.account = id
-}
+	x.accountSet = true
-
-func (x *PrmBalanceGet) buildRequest(c *Client) (*v2accounting.BalanceRequest, error) {
-	if x.Account.IsEmpty() {
-		return nil, errorAccountNotSet
-	}
-
-	var accountV2 refs.OwnerID
-	x.Account.WriteToV2(&accountV2)
-
-	var body v2accounting.BalanceRequestBody
-	body.SetOwnerID(&accountV2)
-
-	var req v2accounting.BalanceRequest
-	req.SetBody(&body)
-
-	c.prepareRequest(&req, new(v2session.RequestMetaHeader))
-	return &req, nil
 }
 
 // ResBalanceGet groups resulting values of BalanceGet operation.
@@ -64,9 +42,9 @@ func (x ResBalanceGet) Amount() accounting.Decimal {
 //
 // Exactly one return value is non-nil. By default, server status is returned in res structure.
 // Any client's internal or transport errors are returned as `error`,
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly (see PrmBalanceGet docs).
 // Context is required and must not be nil. It is used for network communication.
@@ -74,35 +52,60 @@ func (x ResBalanceGet) Amount() accounting.Decimal {
 // Return statuses:
 //   - global (see Client docs).
 func (c *Client) BalanceGet(ctx context.Context, prm PrmBalanceGet) (*ResBalanceGet, error) {
-	req, err := prm.buildRequest(c)
+	switch {
-	if err != nil {
+	case ctx == nil:
-		return nil, err
+		return nil, errorMissingContext
+	case !prm.accountSet:
+		return nil, errorAccountNotSet
 	}
 
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
+	// form request body
-		return nil, fmt.Errorf("sign request: %w", err)
+	var accountV2 refs.OwnerID
+	prm.account.WriteToV2(&accountV2)
+
+	var body v2accounting.BalanceRequestBody
+	body.SetOwnerID(&accountV2)
+
+	// form request
+	var req v2accounting.BalanceRequest
+
+	req.SetBody(&body)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResBalanceGet
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.Balance(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2accounting.BalanceResponse)
+
+		const fieldBalance = "balance"
+
+		bal := resp.GetBody().GetBalance()
+		if bal == nil {
+			cc.err = newErrMissingResponseField(fieldBalance)
+			return
+		}
+
+		cc.err = res.amount.ReadFromV2(*bal)
+		if cc.err != nil {
+			cc.err = newErrInvalidResponseField(fieldBalance, cc.err)
+		}
 	}
 
-	resp, err := rpcapi.Balance(&c.c, req, client.WithContext(ctx))
+	// process call
-	if err != nil {
+	if !cc.processCall() {
-		return nil, err
+		return nil, cc.err
 	}
 
-	var res ResBalanceGet
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	const fieldBalance = "balance"
-
-	bal := resp.GetBody().GetBalance()
-	if bal == nil {
-		return &res, newErrMissingResponseField(fieldBalance)
-	}
-
-	if err := res.amount.ReadFromV2(*bal); err != nil {
-		return &res, newErrInvalidResponseField(fieldBalance, err)
-	}
 	return &res, nil
 }

client/apemanager_add_chain.go

@@ -1,79 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	apemanagerV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/apemanager"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	apeSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ape"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-)
-
-// PrmAPEManagerAddChain groups parameters of APEManagerAddChain operation.
-type PrmAPEManagerAddChain struct {
-	XHeaders []string
-
-	ChainTarget apeSDK.ChainTarget
-
-	Chain apeSDK.Chain
-}
-
-func (prm *PrmAPEManagerAddChain) buildRequest(c *Client) (*apemanagerV2.AddChainRequest, error) {
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	req := new(apemanagerV2.AddChainRequest)
-	reqBody := new(apemanagerV2.AddChainRequestBody)
-
-	reqBody.SetTarget(prm.ChainTarget.ToV2())
-	reqBody.SetChain(prm.Chain.ToV2())
-
-	req.SetBody(reqBody)
-
-	var meta sessionV2.RequestMetaHeader
-	writeXHeadersToMeta(prm.XHeaders, &meta)
-
-	c.prepareRequest(req, &meta)
-
-	return req, nil
-}
-
-type ResAPEManagerAddChain struct {
-	statusRes
-
-	// ChainID of set Chain. If Chain does not contain chainID before request, then
-	// ChainID is generated.
-	ChainID apeSDK.ChainID
-}
-
-// APEManagerAddChain sets Chain for ChainTarget.
-func (c *Client) APEManagerAddChain(ctx context.Context, prm PrmAPEManagerAddChain) (*ResAPEManagerAddChain, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.AddChain(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResAPEManagerAddChain
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	res.ChainID = resp.GetBody().GetChainID()
-
-	return &res, nil
-}

client/apemanager_list_chains.go

@@ -1,80 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	apemanagerV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/apemanager"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	apeSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ape"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-)
-
-// PrmAPEManagerListChains groups parameters of APEManagerListChains operation.
-type PrmAPEManagerListChains struct {
-	XHeaders []string
-
-	ChainTarget apeSDK.ChainTarget
-}
-
-func (prm *PrmAPEManagerListChains) buildRequest(c *Client) (*apemanagerV2.ListChainsRequest, error) {
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	req := new(apemanagerV2.ListChainsRequest)
-	reqBody := new(apemanagerV2.ListChainsRequestBody)
-
-	reqBody.SetTarget(prm.ChainTarget.ToV2())
-
-	req.SetBody(reqBody)
-
-	var meta sessionV2.RequestMetaHeader
-	writeXHeadersToMeta(prm.XHeaders, &meta)
-
-	c.prepareRequest(req, &meta)
-
-	return req, nil
-}
-
-type ResAPEManagerListChains struct {
-	statusRes
-
-	Chains []apeSDK.Chain
-}
-
-// APEManagerListChains lists Chains for ChainTarget.
-func (c *Client) APEManagerListChains(ctx context.Context, prm PrmAPEManagerListChains) (*ResAPEManagerListChains, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.ListChains(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResAPEManagerListChains
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	for _, ch := range resp.GetBody().GetChains() {
-		var chSDK apeSDK.Chain
-		if err := chSDK.ReadFromV2(ch); err != nil {
-			return nil, err
-		}
-		res.Chains = append(res.Chains, chSDK)
-	}
-
-	return &res, nil
-}

client/apemanager_remove_chain.go

@@ -1,73 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	apemanagerV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/apemanager"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	sessionV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	apeSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ape"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-)
-
-// PrmAPEManagerRemoveChain groups parameters of APEManagerRemoveChain operation.
-type PrmAPEManagerRemoveChain struct {
-	XHeaders []string
-
-	ChainTarget apeSDK.ChainTarget
-
-	ChainID apeSDK.ChainID
-}
-
-func (prm *PrmAPEManagerRemoveChain) buildRequest(c *Client) (*apemanagerV2.RemoveChainRequest, error) {
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	req := new(apemanagerV2.RemoveChainRequest)
-	reqBody := new(apemanagerV2.RemoveChainRequestBody)
-
-	reqBody.SetTarget(prm.ChainTarget.ToV2())
-	reqBody.SetChainID(prm.ChainID)
-
-	req.SetBody(reqBody)
-
-	var meta sessionV2.RequestMetaHeader
-	writeXHeadersToMeta(prm.XHeaders, &meta)
-
-	c.prepareRequest(req, &meta)
-
-	return req, nil
-}
-
-type ResAPEManagerRemoveChain struct {
-	statusRes
-}
-
-// APEManagerRemoveChain removes Chain with ChainID defined for ChainTarget.
-func (c *Client) APEManagerRemoveChain(ctx context.Context, prm PrmAPEManagerRemoveChain) (*ResAPEManagerRemoveChain, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.RemoveChain(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResAPEManagerRemoveChain
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	return &res, nil
-}

client/api.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	v2netmap "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
+	v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
 )
 
 // interface of FrostFS API server. Exists for test purposes only.

client/client.go

@@ -7,12 +7,9 @@ import (
 	"errors"
 	"time"
 
-	v2accounting "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/accounting"
+	v2accounting "github.com/TrueCloudLab/frostfs-api-go/v2/accounting"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 // Client represents virtual connection to the FrostFS network to communicate
@@ -79,49 +76,46 @@ func (c *Client) Init(prm PrmInit) {
 // Calling multiple times leads to undefined behavior.
 //
 // See also Init / Close.
-func (c *Client) Dial(ctx context.Context, prm PrmDial) error {
+func (c *Client) Dial(prm PrmDial) error {
-	if prm.Endpoint == "" {
+	if prm.endpoint == "" {
 		return errorServerAddrUnset
 	}
 
-	if prm.DialTimeout <= 0 {
+	if prm.timeoutDialSet {
-		prm.DialTimeout = defaultDialTimeout
+		if prm.timeoutDial <= 0 {
+			return errorNonPositiveTimeout
+		}
+	} else {
+		prm.timeoutDial = 5 * time.Second
 	}
-	if prm.StreamTimeout <= 0 {
+
-		prm.StreamTimeout = defaultStreamTimeout
+	if prm.streamTimeoutSet {
+		if prm.streamTimeout <= 0 {
+			return errorNonPositiveTimeout
+		}
+	} else {
+		prm.streamTimeout = 10 * time.Second
 	}
 
 	c.c = *client.New(append(
-		client.WithNetworkURIAddress(prm.Endpoint, prm.TLSConfig),
+		client.WithNetworkURIAddress(prm.endpoint, prm.tlsConfig),
-		client.WithDialTimeout(prm.DialTimeout),
+		client.WithDialTimeout(prm.timeoutDial),
-		client.WithRWTimeout(prm.StreamTimeout),
+		client.WithRWTimeout(prm.streamTimeout),
-		client.WithGRPCDialOptions(prm.GRPCDialOptions),
 	)...)
 
 	c.setFrostFSAPIServer((*coreServer)(&c.c))
 
-	ctx, cancel := context.WithTimeout(ctx, prm.DialTimeout)
+	if prm.parentCtx == nil {
-	defer cancel()
+		prm.parentCtx = context.Background()
-	_, err := rpc.Balance(&c.c, new(v2accounting.BalanceRequest),
+	}
-		client.WithContext(ctx),
-	)
-	if err != nil {
-		var ctxErr error
 
-		// return context errors since they signal about dial problem
+	// TODO: (neofs-api-go#382) perform generic dial stage of the client.Client
-		if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
+	_, err := rpc.Balance(&c.c, new(v2accounting.BalanceRequest),
-			ctxErr = err
+		client.WithContext(prm.parentCtx),
-		} else if st, ok := status.FromError(err); ok && st.Code() == codes.Canceled {
+	)
-			ctxErr = context.Canceled
+	// return context errors since they signal about dial problem
-		} else if ok && st.Code() == codes.DeadlineExceeded {
+	if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
-			ctxErr = context.DeadlineExceeded
+		return err
-		}
-		if ctxErr != nil {
-			if conn := c.c.Conn(); conn != nil {
-				_ = conn.Close()
-			}
-			return ctxErr
-		}
 	}
 
 	return nil
@@ -129,7 +123,7 @@ func (c *Client) Dial(ctx context.Context, prm PrmDial) error {
 
 // sets underlying provider of frostFSAPIServer. The method is used for testing as an approach
 // to skip Dial stage and override FrostFS API server. MUST NOT be used outside test code.
-// In real applications wrapper over git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client
+// In real applications wrapper over github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client
 // is statically used.
 func (c *Client) setFrostFSAPIServer(server frostFSAPIServer) {
 	c.server = server
@@ -152,67 +146,52 @@ func (c *Client) Close() error {
 //
 // See also Init.
 type PrmInit struct {
-	DisableFrostFSErrorResolution bool
+	resolveFrostFSErrors bool
 
-	Key ecdsa.PrivateKey
+	key ecdsa.PrivateKey
 
-	ResponseInfoCallback func(ResponseMetaInfo) error
+	cbRespInfo func(ResponseMetaInfo) error
 
-	NetMagic uint64
+	netMagic uint64
 }
 
 // SetDefaultPrivateKey sets Client private key to be used for the protocol
 // communication by default.
 //
 // Required for operations without custom key parametrization (see corresponding Prm* docs).
-//
-// Deprecated: Use PrmInit.Key instead.
 func (x *PrmInit) SetDefaultPrivateKey(key ecdsa.PrivateKey) {
-	x.Key = key
+	x.key = key
 }
 
-// Deprecated: method is no-op. Option is default.
+// ResolveFrostFSFailures makes the Client to resolve failure statuses of the
+// FrostFS protocol into Go built-in errors. These errors are returned from
+// each protocol operation. By default, statuses aren't resolved and written
+// to the resulting structure (see corresponding Res* docs).
 func (x *PrmInit) ResolveFrostFSFailures() {
-}
+	x.resolveFrostFSErrors = true
-
-// DisableFrostFSFailuresResolution makes the Client to preserve failure statuses of the
-// FrostFS protocol only in resulting structure (see corresponding Res* docs).
-// These errors are returned from each protocol operation. By default, statuses
-// are resolved and returned as a Go built-in errors.
-//
-// Deprecated: Use PrmInit.DisableFrostFSErrorResolution instead.
-func (x *PrmInit) DisableFrostFSFailuresResolution() {
-	x.DisableFrostFSErrorResolution = true
 }
 
 // SetResponseInfoCallback makes the Client to pass ResponseMetaInfo from each
 // FrostFS server response to f. Nil (default) means ignore response meta info.
-//
-// Deprecated: Use PrmInit.ResponseInfoCallback instead.
 func (x *PrmInit) SetResponseInfoCallback(f func(ResponseMetaInfo) error) {
-	x.ResponseInfoCallback = f
+	x.cbRespInfo = f
 }
 
-const (
-	defaultDialTimeout   = 5 * time.Second
-	defaultStreamTimeout = 10 * time.Second
-)
-
 // PrmDial groups connection parameters for the Client.
 //
 // See also Dial.
 type PrmDial struct {
-	Endpoint string
+	endpoint string
 
-	TLSConfig *tls.Config
+	tlsConfig *tls.Config
 
-	// If DialTimeout is non-positive, then it's set to defaultDialTimeout.
+	timeoutDialSet bool
-	DialTimeout time.Duration
+	timeoutDial    time.Duration
 
-	// If StreamTimeout is non-positive, then it's set to defaultStreamTimeout.
+	streamTimeoutSet bool
-	StreamTimeout time.Duration
+	streamTimeout    time.Duration
 
-	GRPCDialOptions []grpc.DialOption
+	parentCtx context.Context
 }
 
 // SetServerURI sets server URI in the FrostFS network.
@@ -228,41 +207,36 @@ type PrmDial struct {
 //	grpcs
 //
 // See also SetTLSConfig.
-//
-// Deprecated: Use PrmDial.Endpoint instead.
 func (x *PrmDial) SetServerURI(endpoint string) {
-	x.Endpoint = endpoint
+	x.endpoint = endpoint
 }
 
 // SetTLSConfig sets tls.Config to open TLS client connection
 // to the FrostFS server. Nil (default) means insecure connection.
 //
 // See also SetServerURI.
-//
-// Depreacted: Use PrmDial.TLSConfig instead.
 func (x *PrmDial) SetTLSConfig(tlsConfig *tls.Config) {
-	x.TLSConfig = tlsConfig
+	x.tlsConfig = tlsConfig
 }
 
 // SetTimeout sets the timeout for connection to be established.
 // MUST BE positive. If not called, 5s timeout will be used by default.
-//
-// Deprecated: Use PrmDial.DialTimeout instead.
 func (x *PrmDial) SetTimeout(timeout time.Duration) {
-	x.DialTimeout = timeout
+	x.timeoutDialSet = true
+	x.timeoutDial = timeout
 }
 
 // SetStreamTimeout sets the timeout for individual operations in streaming RPC.
 // MUST BE positive. If not called, 10s timeout will be used by default.
-//
-// Deprecated: Use PrmDial.StreamTimeout instead.
 func (x *PrmDial) SetStreamTimeout(timeout time.Duration) {
-	x.StreamTimeout = timeout
+	x.streamTimeoutSet = true
+	x.streamTimeout = timeout
 }
 
-// SetGRPCDialOptions sets the gRPC dial options for new gRPC client connection.
+// SetContext allows to specify optional base context within which connection
+// should be established.
 //
-// Deprecated: Use PrmDial.GRPCDialOptions instead.
+// Context SHOULD NOT be nil.
-func (x *PrmDial) SetGRPCDialOptions(opts ...grpc.DialOption) {
+func (x *PrmDial) SetContext(ctx context.Context) {
-	x.GRPCDialOptions = opts
+	x.parentCtx = ctx
 }

client/client_test.go

@@ -7,7 +7,7 @@ import (
 	"crypto/rand"
 	"testing"
 
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
 	"github.com/stretchr/testify/require"
 )
 
@@ -29,9 +29,8 @@ func assertStatusErr(tb testing.TB, res interface{ Status() apistatus.Status })
 }
 
 func newClient(server frostFSAPIServer) *Client {
-	prm := PrmInit{
+	var prm PrmInit
-		Key: *key,
+	prm.SetDefaultPrivateKey(*key)
-	}
 
 	var c Client
 	c.Init(prm)
@@ -44,13 +43,15 @@ func TestClient_DialContext(t *testing.T) {
 	var c Client
 
 	// try to connect to any host
-	prm := PrmDial{
+	var prm PrmDial
-		Endpoint: "localhost:8080",
+	prm.SetServerURI("localhost:8080")
-	}
 
 	assert := func(ctx context.Context, errExpected error) {
+		// use the particular context
+		prm.SetContext(ctx)
+
 		// expect particular context error according to Dial docs
-		require.ErrorIs(t, c.Dial(ctx, prm), errExpected)
+		require.ErrorIs(t, c.Dial(prm), errExpected)
 	}
 
 	// create pre-abandoned context

client/common.go

@@ -1,22 +1,33 @@
 package client
 
 import (
+	"crypto/ecdsa"
 	"errors"
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
+	"github.com/TrueCloudLab/frostfs-sdk-go/version"
 )
 
+// common interface of resulting structures with API status.
+type resCommon interface {
+	setStatus(apistatus.Status)
+}
+
 // structure is embedded to all resulting types in order to inherit status-related methods.
 type statusRes struct {
 	st apistatus.Status
 }
 
+// setStatus implements resCommon interface method.
+func (x *statusRes) setStatus(st apistatus.Status) {
+	x.st = st
+}
+
 // Status returns server's status return.
 //
 // Use apistatus package functionality to handle the status.
@@ -24,13 +35,29 @@ func (x statusRes) Status() apistatus.Status {
 	return x.st
 }
 
+// groups meta parameters shared between all Client operations.
+type prmCommonMeta struct {
+	// FrostFS request X-Headers
+	xHeaders []string
+}
+
+// WithXHeaders specifies list of extended headers (string key-value pairs)
+// to be attached to the request. Must have an even length.
+//
+// Slice must not be mutated until the operation completes.
+func (x *prmCommonMeta) WithXHeaders(hs ...string) {
+	if len(hs)%2 != 0 {
+		panic("slice of X-Headers with odd length")
+	}
+
+	x.xHeaders = hs
+}
+
 func writeXHeadersToMeta(xHeaders []string, h *v2session.RequestMetaHeader) {
 	if len(xHeaders) == 0 {
 		return
 	}
 
-	// TODO (aarifullin): remove the panic when all client parameters will check XHeaders
-	// within buildRequest invocation.
 	if len(xHeaders)%2 != 0 {
 		panic("slice of X-Headers with odd length")
 	}
@@ -46,21 +73,104 @@ func writeXHeadersToMeta(xHeaders []string, h *v2session.RequestMetaHeader) {
 
 // error messages.
 var (
-	errorMissingContainer = errors.New("missing container")
+	errorMissingContext       = errors.New("missing context")
-	errorMissingObject    = errors.New("missing object")
+	errorMissingContainer     = errors.New("missing container")
-	errorAccountNotSet    = errors.New("account not set")
+	errorMissingObject        = errors.New("missing object")
-	errorServerAddrUnset  = errors.New("server address is unset or empty")
+	errorAccountNotSet        = errors.New("account not set")
-	errorZeroRangeLength  = errors.New("zero range length")
+	errorServerAddrUnset      = errors.New("server address is unset or empty")
-	errorMissingRanges    = errors.New("missing ranges")
+	errorNonPositiveTimeout   = errors.New("non-positive timeout")
-	errorInvalidXHeaders  = errors.New("xheaders must be presented only as key-value pairs")
+	errorEACLTableNotSet      = errors.New("eACL table not set")
+	errorMissingAnnouncements = errors.New("missing announcements")
+	errorZeroRangeLength      = errors.New("zero range length")
+	errorMissingRanges        = errors.New("missing ranges")
+	errorZeroEpoch            = errors.New("zero epoch")
+	errorMissingTrusts        = errors.New("missing trusts")
+	errorTrustNotSet          = errors.New("current trust value not set")
 )
 
+// groups all the details required to send a single request and process a response to it.
+type contextCall struct {
+	// ==================================================
+	// state vars that do not require explicit initialization
+
+	// final error to be returned from client method
+	err error
+
+	// received response
+	resp responseV2
+
+	// ==================================================
+	// shared parameters which are set uniformly on all calls
+
+	// request signing key
+	key ecdsa.PrivateKey
+
+	// callback prior to processing the response by the client
+	callbackResp func(ResponseMetaInfo) error
+
+	// if set, protocol errors will be expanded into a final error
+	resolveAPIFailures bool
+
+	// FrostFS network magic
+	netMagic uint64
+
+	// Meta parameters
+	meta prmCommonMeta
+
+	// ==================================================
+	// custom call parameters
+
+	// structure of the call result
+	statusRes resCommon
+
+	// request to be signed with a key and sent
+	req request
+
+	// function to send a request (unary) and receive a response
+	call func() (responseV2, error)
+
+	// function to send the request (req field)
+	wReq func() error
+
+	// function to recv the response (resp field)
+	rResp func() error
+
+	// function to close the message stream
+	closer func() error
+
+	// function of writing response fields to the resulting structure (optional)
+	result func(v2 responseV2)
+}
+
 type request interface {
 	GetMetaHeader() *v2session.RequestMetaHeader
 	SetMetaHeader(*v2session.RequestMetaHeader)
 	SetVerificationHeader(*v2session.RequestVerificationHeader)
 }
 
+// sets needed fields of the request meta header.
+func (x contextCall) prepareRequest() {
+	meta := x.req.GetMetaHeader()
+	if meta == nil {
+		meta = new(v2session.RequestMetaHeader)
+		x.req.SetMetaHeader(meta)
+	}
+
+	if meta.GetTTL() == 0 {
+		meta.SetTTL(2)
+	}
+
+	if meta.GetVersion() == nil {
+		var verV2 refs.Version
+		version.Current().WriteToV2(&verV2)
+		meta.SetVersion(&verV2)
+	}
+
+	meta.SetNetworkMagic(x.netMagic)
+
+	writeXHeadersToMeta(x.meta.xHeaders, meta)
+}
+
 func (c *Client) prepareRequest(req request, meta *v2session.RequestMetaHeader) {
 	ttl := meta.GetTTL()
 	if ttl == 0 {
@@ -75,36 +185,167 @@ func (c *Client) prepareRequest(req request, meta *v2session.RequestMetaHeader)
 
 	meta.SetTTL(ttl)
 	meta.SetVersion(verV2)
-	meta.SetNetworkMagic(c.prm.NetMagic)
+	meta.SetNetworkMagic(c.prm.netMagic)
 
 	req.SetMetaHeader(meta)
 }
 
-// processResponse verifies response signature and converts status to an error if needed.
+// prepares, signs and writes the request. Result means success.
-func (c *Client) processResponse(resp responseV2) (apistatus.Status, error) {
+// If failed, contextCall.err contains the reason.
-	if c.prm.ResponseInfoCallback != nil {
+func (x *contextCall) writeRequest() bool {
-		rmi := ResponseMetaInfo{
+	x.prepareRequest()
-			key:   resp.GetVerificationHeader().GetBodySignature().GetKey(),
+
-			epoch: resp.GetMetaHeader().GetEpoch(),
+	x.req.SetVerificationHeader(nil)
-		}
+
-		if err := c.prm.ResponseInfoCallback(rmi); err != nil {
+	// sign the request
-			return nil, fmt.Errorf("response callback error: %w", err)
+	x.err = signature.SignServiceMessage(&x.key, x.req)
+	if x.err != nil {
+		x.err = fmt.Errorf("sign request: %w", x.err)
+		return false
+	}
+
+	x.err = x.wReq()
+	if x.err != nil {
+		x.err = fmt.Errorf("write request: %w", x.err)
+		return false
+	}
+
+	return true
+}
+
+// performs common actions of response processing and writes any problem as a result status or client error
+// (in both cases returns false).
+//
+// Actions:
+//   - verify signature (internal);
+//   - call response callback (internal);
+//   - unwrap status error (optional).
+func (x *contextCall) processResponse() bool {
+	// call response callback if set
+	if x.callbackResp != nil {
+		x.err = x.callbackResp(ResponseMetaInfo{
+			key:   x.resp.GetVerificationHeader().GetBodySignature().GetKey(),
+			epoch: x.resp.GetMetaHeader().GetEpoch(),
+		})
+		if x.err != nil {
+			x.err = fmt.Errorf("response callback error: %w", x.err)
+			return false
 		}
 	}
 
+	// note that we call response callback before signature check since it is expected more lightweight
+	// while verification needs marshaling
+
+	// verify response signature
+	x.err = signature.VerifyServiceMessage(x.resp)
+	if x.err != nil {
+		x.err = fmt.Errorf("invalid response signature: %w", x.err)
+		return false
+	}
+
+	// get result status
+	st := apistatus.FromStatusV2(x.resp.GetMetaHeader().GetStatus())
+
+	// unwrap unsuccessful status and return it
+	// as error if client has been configured so
+	successfulStatus := apistatus.IsSuccessful(st)
+
+	if x.resolveAPIFailures {
+		x.err = apistatus.ErrFromStatus(st)
+	} else {
+		x.statusRes.setStatus(st)
+	}
+
+	return successfulStatus
+}
+
+// processResponse verifies response signature and converts status to an error if needed.
+func (c *Client) processResponse(resp responseV2) (apistatus.Status, error) {
 	err := signature.VerifyServiceMessage(resp)
 	if err != nil {
 		return nil, fmt.Errorf("invalid response signature: %w", err)
 	}
 
 	st := apistatus.FromStatusV2(resp.GetMetaHeader().GetStatus())
-	if !c.prm.DisableFrostFSErrorResolution {
+	if c.prm.resolveFrostFSErrors {
 		return st, apistatus.ErrFromStatus(st)
 	}
 	return st, nil
 }
 
-// ExecRaw executes f with underlying git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client.Client
+// reads response (if rResp is set) and processes it. Result means success.
+// If failed, contextCall.err (or statusRes if resolveAPIFailures is set) contains the reason.
+func (x *contextCall) readResponse() bool {
+	if x.rResp != nil {
+		x.err = x.rResp()
+		if x.err != nil {
+			x.err = fmt.Errorf("read response: %w", x.err)
+			return false
+		}
+	}
+
+	return x.processResponse()
+}
+
+// closes the message stream (if closer is set) and writes the results (if result is set).
+// Return means success. If failed, contextCall.err contains the reason.
+func (x *contextCall) close() bool {
+	if x.closer != nil {
+		x.err = x.closer()
+		if x.err != nil {
+			x.err = fmt.Errorf("close RPC: %w", x.err)
+			return false
+		}
+	}
+
+	// write response to resulting structure
+	if x.result != nil {
+		x.result(x.resp)
+	}
+
+	return x.err == nil
+}
+
+// goes through all stages of sending a request and processing a response. Returns true if successful.
+// If failed, contextCall.err contains the reason.
+func (x *contextCall) processCall() bool {
+	// set request writer
+	x.wReq = func() error {
+		var err error
+		x.resp, err = x.call()
+		return err
+	}
+
+	// write request
+	ok := x.writeRequest()
+	if !ok {
+		return false
+	}
+
+	// read response
+	ok = x.readResponse()
+	if !ok {
+		return x.err == nil
+	}
+
+	// close and write response to resulting structure
+	ok = x.close()
+	if !ok {
+		return false
+	}
+
+	return x.err == nil
+}
+
+// initializes static cross-call parameters inherited from client.
+func (c *Client) initCallContext(ctx *contextCall) {
+	ctx.key = c.prm.key
+	ctx.resolveAPIFailures = c.prm.resolveFrostFSErrors
+	ctx.callbackResp = c.prm.cbRespInfo
+	ctx.netMagic = c.prm.netMagic
+}
+
+// ExecRaw executes f with underlying github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client.Client
 // instance. Communicate over the Protocol Buffers protocol in a more flexible way:
 // most often used to transmit data over a fixed version of the FrostFS protocol, as well
 // as to support custom services.
@@ -115,7 +356,7 @@ func (c *Client) processResponse(resp responseV2) (apistatus.Status, error) {
 // before closing the connection.
 //
 // See also Dial and Close.
-// See also git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client package docs.
+// See also github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client package docs.
 func (c *Client) ExecRaw(f func(client *client.Client) error) error {
 	return f(&c.c)
 }

client/container.go

@@ -2,11 +2,803 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
+	v2container "github.com/TrueCloudLab/frostfs-api-go/v2/container"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
+	"github.com/TrueCloudLab/frostfs-sdk-go/container"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
+	frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
+	frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
+	"github.com/TrueCloudLab/frostfs-sdk-go/eacl"
+	"github.com/TrueCloudLab/frostfs-sdk-go/session"
+	"github.com/TrueCloudLab/frostfs-sdk-go/user"
 )
 
+// PrmContainerPut groups parameters of ContainerPut operation.
+type PrmContainerPut struct {
+	prmCommonMeta
+
+	cnrSet bool
+	cnr    container.Container
+
+	sessionSet bool
+	session    session.Container
+}
+
+// SetContainer sets structured information about new FrostFS container.
+// Required parameter.
+func (x *PrmContainerPut) SetContainer(cnr container.Container) {
+	x.cnr = cnr
+	x.cnrSet = true
+}
+
+// WithinSession specifies session within which container should be saved.
+//
+// Creator of the session acquires the authorship of the request. This affects
+// the execution of an operation (e.g. access control).
+//
+// Session is optional, if set the following requirements apply:
+//   - session operation MUST be session.VerbContainerPut (ForVerb)
+//   - token MUST be signed using private key of the owner of the container to be saved
+func (x *PrmContainerPut) WithinSession(s session.Container) {
+	x.session = s
+	x.sessionSet = true
+}
+
+// ResContainerPut groups resulting values of ContainerPut operation.
+type ResContainerPut struct {
+	statusRes
+
+	id cid.ID
+}
+
+// ID returns identifier of the container declared to be stored in the system.
+// Used as a link to information about the container (in particular, you can
+// asynchronously check if the save was successful).
+func (x ResContainerPut) ID() cid.ID {
+	return x.id
+}
+
+// ContainerPut sends request to save container in FrostFS.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Operation is asynchronous and no guaranteed even in the absence of errors.
+// The required time is also not predictable.
+//
+// Success can be verified by reading by identifier (see ResContainerPut.ID).
+//
+// Returns an error if parameters are set incorrectly (see PrmContainerPut docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs).
+func (c *Client) ContainerPut(ctx context.Context, prm PrmContainerPut) (*ResContainerPut, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case !prm.cnrSet:
+		return nil, errorMissingContainer
+	}
+
+	// TODO: check private key is set before forming the request
+	// sign container
+	var cnr v2container.Container
+	prm.cnr.WriteToV2(&cnr)
+
+	var sig frostfscrypto.Signature
+
+	err := container.CalculateSignature(&sig, prm.cnr, c.prm.key)
+	if err != nil {
+		return nil, fmt.Errorf("calculate container signature: %w", err)
+	}
+
+	var sigv2 refs.Signature
+
+	sig.WriteToV2(&sigv2)
+
+	// form request body
+	reqBody := new(v2container.PutRequestBody)
+	reqBody.SetContainer(&cnr)
+	reqBody.SetSignature(&sigv2)
+
+	// form meta header
+	var meta v2session.RequestMetaHeader
+	writeXHeadersToMeta(prm.prmCommonMeta.xHeaders, &meta)
+
+	if prm.sessionSet {
+		var tokv2 v2session.Token
+		prm.session.WriteToV2(&tokv2)
+
+		meta.SetSessionToken(&tokv2)
+	}
+
+	// form request
+	var req v2container.PutRequest
+
+	req.SetBody(reqBody)
+	req.SetMetaHeader(&meta)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResContainerPut
+	)
+
+	c.initCallContext(&cc)
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.PutContainer(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2container.PutResponse)
+
+		const fieldCnrID = "container ID"
+
+		cidV2 := resp.GetBody().GetContainerID()
+		if cidV2 == nil {
+			cc.err = newErrMissingResponseField(fieldCnrID)
+			return
+		}
+
+		cc.err = res.id.ReadFromV2(*cidV2)
+		if cc.err != nil {
+			cc.err = newErrInvalidResponseField(fieldCnrID, cc.err)
+		}
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
+// PrmContainerGet groups parameters of ContainerGet operation.
+type PrmContainerGet struct {
+	prmCommonMeta
+
+	idSet bool
+	id    cid.ID
+}
+
+// SetContainer sets identifier of the container to be read.
+// Required parameter.
+func (x *PrmContainerGet) SetContainer(id cid.ID) {
+	x.id = id
+	x.idSet = true
+}
+
+// ResContainerGet groups resulting values of ContainerGet operation.
+type ResContainerGet struct {
+	statusRes
+
+	cnr container.Container
+}
+
+// Container returns structured information about the requested container.
+//
+// Client doesn't retain value so modification is safe.
+func (x ResContainerGet) Container() container.Container {
+	return x.cnr
+}
+
+// ContainerGet reads FrostFS container by ID.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Returns an error if parameters are set incorrectly (see PrmContainerGet docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs);
+//   - *apistatus.ContainerNotFound.
+func (c *Client) ContainerGet(ctx context.Context, prm PrmContainerGet) (*ResContainerGet, error) {
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case !prm.idSet:
+		return nil, errorMissingContainer
+	}
+
+	var cidV2 refs.ContainerID
+	prm.id.WriteToV2(&cidV2)
+
+	// form request body
+	reqBody := new(v2container.GetRequestBody)
+	reqBody.SetContainerID(&cidV2)
+
+	// form request
+	var req v2container.GetRequest
+
+	req.SetBody(reqBody)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResContainerGet
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.GetContainer(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2container.GetResponse)
+
+		cnrV2 := resp.GetBody().GetContainer()
+		if cnrV2 == nil {
+			cc.err = errors.New("missing container in response")
+			return
+		}
+
+		cc.err = res.cnr.ReadFromV2(*cnrV2)
+		if cc.err != nil {
+			cc.err = fmt.Errorf("invalid container in response: %w", cc.err)
+		}
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
+// PrmContainerList groups parameters of ContainerList operation.
+type PrmContainerList struct {
+	prmCommonMeta
+
+	ownerSet bool
+	ownerID  user.ID
+}
+
+// SetAccount sets identifier of the FrostFS account to list the containers.
+// Required parameter.
+func (x *PrmContainerList) SetAccount(id user.ID) {
+	x.ownerID = id
+	x.ownerSet = true
+}
+
+// ResContainerList groups resulting values of ContainerList operation.
+type ResContainerList struct {
+	statusRes
+
+	ids []cid.ID
+}
+
+// Containers returns list of identifiers of the account-owned containers.
+//
+// Client doesn't retain value so modification is safe.
+func (x ResContainerList) Containers() []cid.ID {
+	return x.ids
+}
+
+// ContainerList requests identifiers of the account-owned containers.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Returns an error if parameters are set incorrectly (see PrmContainerList docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs).
+func (c *Client) ContainerList(ctx context.Context, prm PrmContainerList) (*ResContainerList, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case !prm.ownerSet:
+		return nil, errorAccountNotSet
+	}
+
+	// form request body
+	var ownerV2 refs.OwnerID
+	prm.ownerID.WriteToV2(&ownerV2)
+
+	reqBody := new(v2container.ListRequestBody)
+	reqBody.SetOwnerID(&ownerV2)
+
+	// form request
+	var req v2container.ListRequest
+
+	req.SetBody(reqBody)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResContainerList
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.ListContainers(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2container.ListResponse)
+
+		res.ids = make([]cid.ID, len(resp.GetBody().GetContainerIDs()))
+
+		for i, cidV2 := range resp.GetBody().GetContainerIDs() {
+			cc.err = res.ids[i].ReadFromV2(cidV2)
+			if cc.err != nil {
+				cc.err = fmt.Errorf("invalid ID in the response: %w", cc.err)
+				return
+			}
+		}
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
+// PrmContainerDelete groups parameters of ContainerDelete operation.
+type PrmContainerDelete struct {
+	prmCommonMeta
+
+	idSet bool
+	id    cid.ID
+
+	tokSet bool
+	tok    session.Container
+}
+
+// SetContainer sets identifier of the FrostFS container to be removed.
+// Required parameter.
+func (x *PrmContainerDelete) SetContainer(id cid.ID) {
+	x.id = id
+	x.idSet = true
+}
+
+// WithinSession specifies session within which container should be removed.
+//
+// Creator of the session acquires the authorship of the request.
+// This may affect the execution of an operation (e.g. access control).
+//
+// Must be signed.
+func (x *PrmContainerDelete) WithinSession(tok session.Container) {
+	x.tok = tok
+	x.tokSet = true
+}
+
+// ResContainerDelete groups resulting values of ContainerDelete operation.
+type ResContainerDelete struct {
+	statusRes
+}
+
+// ContainerDelete sends request to remove the FrostFS container.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Operation is asynchronous and no guaranteed even in the absence of errors.
+// The required time is also not predictable.
+//
+// Success can be verified by reading by identifier (see GetContainer).
+//
+// Returns an error if parameters are set incorrectly (see PrmContainerDelete docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Exactly one return value is non-nil. Server status return is returned in ResContainerDelete.
+// Reflects all internal errors in second return value (transport problems, response processing, etc.).
+//
+// Return statuses:
+//   - global (see Client docs).
+func (c *Client) ContainerDelete(ctx context.Context, prm PrmContainerDelete) (*ResContainerDelete, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case !prm.idSet:
+		return nil, errorMissingContainer
+	}
+
+	// sign container ID
+	var cidV2 refs.ContainerID
+	prm.id.WriteToV2(&cidV2)
+
+	// container contract expects signature of container ID value
+	// don't get confused with stable marshaled protobuf container.ID structure
+	data := cidV2.GetValue()
+
+	var sig frostfscrypto.Signature
+
+	err := sig.Calculate(frostfsecdsa.SignerRFC6979(c.prm.key), data)
+	if err != nil {
+		return nil, fmt.Errorf("calculate signature: %w", err)
+	}
+
+	var sigv2 refs.Signature
+
+	sig.WriteToV2(&sigv2)
+
+	// form request body
+	reqBody := new(v2container.DeleteRequestBody)
+	reqBody.SetContainerID(&cidV2)
+	reqBody.SetSignature(&sigv2)
+
+	// form meta header
+	var meta v2session.RequestMetaHeader
+	writeXHeadersToMeta(prm.prmCommonMeta.xHeaders, &meta)
+
+	if prm.tokSet {
+		var tokv2 v2session.Token
+		prm.tok.WriteToV2(&tokv2)
+
+		meta.SetSessionToken(&tokv2)
+	}
+
+	// form request
+	var req v2container.DeleteRequest
+
+	req.SetBody(reqBody)
+	req.SetMetaHeader(&meta)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResContainerDelete
+	)
+
+	c.initCallContext(&cc)
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.DeleteContainer(&c.c, &req, client.WithContext(ctx))
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
+// PrmContainerEACL groups parameters of ContainerEACL operation.
+type PrmContainerEACL struct {
+	prmCommonMeta
+
+	idSet bool
+	id    cid.ID
+}
+
+// SetContainer sets identifier of the FrostFS container to read the eACL table.
+// Required parameter.
+func (x *PrmContainerEACL) SetContainer(id cid.ID) {
+	x.id = id
+	x.idSet = true
+}
+
+// ResContainerEACL groups resulting values of ContainerEACL operation.
+type ResContainerEACL struct {
+	statusRes
+
+	table eacl.Table
+}
+
+// Table returns eACL table of the requested container.
+func (x ResContainerEACL) Table() eacl.Table {
+	return x.table
+}
+
+// ContainerEACL reads eACL table of the FrostFS container.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Returns an error if parameters are set incorrectly (see PrmContainerEACL docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs);
+//   - *apistatus.ContainerNotFound;
+//   - *apistatus.EACLNotFound.
+func (c *Client) ContainerEACL(ctx context.Context, prm PrmContainerEACL) (*ResContainerEACL, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case !prm.idSet:
+		return nil, errorMissingContainer
+	}
+
+	var cidV2 refs.ContainerID
+	prm.id.WriteToV2(&cidV2)
+
+	// form request body
+	reqBody := new(v2container.GetExtendedACLRequestBody)
+	reqBody.SetContainerID(&cidV2)
+
+	// form request
+	var req v2container.GetExtendedACLRequest
+
+	req.SetBody(reqBody)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResContainerEACL
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.GetEACL(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2container.GetExtendedACLResponse)
+
+		eACL := resp.GetBody().GetEACL()
+		if eACL == nil {
+			cc.err = newErrMissingResponseField("eACL")
+			return
+		}
+
+		res.table = *eacl.NewTableFromV2(eACL)
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
+// PrmContainerSetEACL groups parameters of ContainerSetEACL operation.
+type PrmContainerSetEACL struct {
+	prmCommonMeta
+
+	tableSet bool
+	table    eacl.Table
+
+	sessionSet bool
+	session    session.Container
+}
+
+// SetTable sets eACL table structure to be set for the container.
+// Required parameter.
+func (x *PrmContainerSetEACL) SetTable(table eacl.Table) {
+	x.table = table
+	x.tableSet = true
+}
+
+// WithinSession specifies session within which extended ACL of the container
+// should be saved.
+//
+// Creator of the session acquires the authorship of the request. This affects
+// the execution of an operation (e.g. access control).
+//
+// Session is optional, if set the following requirements apply:
+//   - if particular container is specified (ApplyOnlyTo), it MUST equal the container
+//     for which extended ACL is going to be set
+//   - session operation MUST be session.VerbContainerSetEACL (ForVerb)
+//   - token MUST be signed using private key of the owner of the container to be saved
+func (x *PrmContainerSetEACL) WithinSession(s session.Container) {
+	x.session = s
+	x.sessionSet = true
+}
+
+// ResContainerSetEACL groups resulting values of ContainerSetEACL operation.
+type ResContainerSetEACL struct {
+	statusRes
+}
+
+// ContainerSetEACL sends request to update eACL table of the FrostFS container.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Operation is asynchronous and no guaranteed even in the absence of errors.
+// The required time is also not predictable.
+//
+// Success can be verified by reading by identifier (see EACL).
+//
+// Returns an error if parameters are set incorrectly (see PrmContainerSetEACL docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs).
+func (c *Client) ContainerSetEACL(ctx context.Context, prm PrmContainerSetEACL) (*ResContainerSetEACL, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case !prm.tableSet:
+		return nil, errorEACLTableNotSet
+	}
+
+	// sign the eACL table
+	eaclV2 := prm.table.ToV2()
+
+	var sig frostfscrypto.Signature
+
+	err := sig.Calculate(frostfsecdsa.SignerRFC6979(c.prm.key), eaclV2.StableMarshal(nil))
+	if err != nil {
+		return nil, fmt.Errorf("calculate signature: %w", err)
+	}
+
+	var sigv2 refs.Signature
+
+	sig.WriteToV2(&sigv2)
+
+	// form request body
+	reqBody := new(v2container.SetExtendedACLRequestBody)
+	reqBody.SetEACL(eaclV2)
+	reqBody.SetSignature(&sigv2)
+
+	// form meta header
+	var meta v2session.RequestMetaHeader
+	writeXHeadersToMeta(prm.prmCommonMeta.xHeaders, &meta)
+
+	if prm.sessionSet {
+		var tokv2 v2session.Token
+		prm.session.WriteToV2(&tokv2)
+
+		meta.SetSessionToken(&tokv2)
+	}
+
+	// form request
+	var req v2container.SetExtendedACLRequest
+
+	req.SetBody(reqBody)
+	req.SetMetaHeader(&meta)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResContainerSetEACL
+	)
+
+	c.initCallContext(&cc)
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.SetEACL(&c.c, &req, client.WithContext(ctx))
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
+// PrmAnnounceSpace groups parameters of ContainerAnnounceUsedSpace operation.
+type PrmAnnounceSpace struct {
+	prmCommonMeta
+
+	announcements []container.SizeEstimation
+}
+
+// SetValues sets values describing volume of space that is used for the container objects.
+// Required parameter. Must not be empty.
+//
+// Must not be mutated before the end of the operation.
+func (x *PrmAnnounceSpace) SetValues(vs []container.SizeEstimation) {
+	x.announcements = vs
+}
+
+// ResAnnounceSpace groups resulting values of ContainerAnnounceUsedSpace operation.
+type ResAnnounceSpace struct {
+	statusRes
+}
+
+// ContainerAnnounceUsedSpace sends request to announce volume of the space used for the container objects.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Operation is asynchronous and no guaranteed even in the absence of errors.
+// The required time is also not predictable.
+//
+// At this moment success can not be checked.
+//
+// Returns an error if parameters are set incorrectly (see PrmAnnounceSpace docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs).
+func (c *Client) ContainerAnnounceUsedSpace(ctx context.Context, prm PrmAnnounceSpace) (*ResAnnounceSpace, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case len(prm.announcements) == 0:
+		return nil, errorMissingAnnouncements
+	}
+
+	// convert list of SDK announcement structures into FrostFS-API v2 list
+	v2announce := make([]v2container.UsedSpaceAnnouncement, len(prm.announcements))
+	for i := range prm.announcements {
+		prm.announcements[i].WriteToV2(&v2announce[i])
+	}
+
+	// prepare body of the FrostFS-API v2 request and request itself
+	reqBody := new(v2container.AnnounceUsedSpaceRequestBody)
+	reqBody.SetAnnouncements(v2announce)
+
+	// form request
+	var req v2container.AnnounceUsedSpaceRequest
+
+	req.SetBody(reqBody)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResAnnounceSpace
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.AnnounceUsedSpace(&c.c, &req, client.WithContext(ctx))
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
 // SyncContainerWithNetwork requests network configuration using passed client
 // and applies it to the container. Container MUST not be nil.
 //

client/container_delete.go

@@ -1,139 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	v2container "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
-	frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
-)
-
-// PrmContainerDelete groups parameters of ContainerDelete operation.
-type PrmContainerDelete struct {
-	// FrostFS request X-Headers
-	XHeaders []string
-
-	ContainerID *cid.ID
-
-	Session *session.Container
-}
-
-// SetContainer sets identifier of the FrostFS container to be removed.
-// Required parameter.
-//
-// Deprecated: Use PrmContainerDelete.Container instead.
-func (prm *PrmContainerDelete) SetContainer(id cid.ID) {
-	prm.ContainerID = &id
-}
-
-func (prm *PrmContainerDelete) buildRequest(c *Client) (*v2container.DeleteRequest, error) {
-	if prm.ContainerID == nil {
-		return nil, errorMissingContainer
-	}
-
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	var cidV2 refs.ContainerID
-	prm.ContainerID.WriteToV2(&cidV2)
-
-	// Container contract expects signature of container ID value,
-	// don't get confused with stable marshaled protobuf container.ID structure.
-	data := cidV2.GetValue()
-
-	var sig frostfscrypto.Signature
-
-	err := sig.Calculate(frostfsecdsa.SignerRFC6979(c.prm.Key), data)
-	if err != nil {
-		return nil, fmt.Errorf("calculate signature: %w", err)
-	}
-
-	var sigv2 refs.Signature
-	sig.WriteToV2(&sigv2)
-
-	reqBody := new(v2container.DeleteRequestBody)
-	reqBody.SetContainerID(&cidV2)
-	reqBody.SetSignature(&sigv2)
-
-	var meta v2session.RequestMetaHeader
-	writeXHeadersToMeta(prm.XHeaders, &meta)
-
-	if prm.Session != nil {
-		var tokv2 v2session.Token
-		prm.Session.WriteToV2(&tokv2)
-
-		meta.SetSessionToken(&tokv2)
-	}
-
-	var req v2container.DeleteRequest
-	req.SetBody(reqBody)
-	c.prepareRequest(&req, &meta)
-	return &req, nil
-}
-
-// WithinSession specifies session within which container should be removed.
-//
-// Creator of the session acquires the authorship of the request.
-// This may affect the execution of an operation (e.g. access control).
-//
-// Must be signed.
-//
-// Deprecated: Use PrmContainerDelete.Session instead.
-func (prm *PrmContainerDelete) WithinSession(tok session.Container) {
-	prm.Session = &tok
-}
-
-// ResContainerDelete groups resulting values of ContainerDelete operation.
-type ResContainerDelete struct {
-	statusRes
-}
-
-// ContainerDelete sends request to remove the FrostFS container.
-//
-// Exactly one return value is non-nil. By default, server status is returned in res structure.
-// Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
-// otherwise, are also returned as `error`.
-//
-// Operation is asynchronous and no guaranteed even in the absence of errors.
-// The required time is also not predictable.
-//
-// Success can be verified by reading by identifier (see GetContainer).
-//
-// Returns an error if parameters are set incorrectly (see PrmContainerDelete docs).
-// Context is required and must not be nil. It is used for network communication.
-//
-// Exactly one return value is non-nil. Server status return is returned in ResContainerDelete.
-// Reflects all internal errors in second return value (transport problems, response processing, etc.).
-//
-// Return statuses:
-//   - global (see Client docs).
-func (c *Client) ContainerDelete(ctx context.Context, prm PrmContainerDelete) (*ResContainerDelete, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.DeleteContainer(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResContainerDelete
-	res.st, err = c.processResponse(resp)
-	return &res, err
-}

client/container_get.go

@@ -1,126 +0,0 @@
-package client
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	v2container "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
-)
-
-// PrmContainerGet groups parameters of ContainerGet operation.
-type PrmContainerGet struct {
-	// FrostFS request X-Headers.
-	XHeaders []string
-
-	ContainerID *cid.ID
-
-	Session *session.Container
-}
-
-// SetContainer sets identifier of the container to be read.
-// Required parameter.
-//
-// Deprecated: Use PrmContainerGet.ContainerID instead.
-func (prm *PrmContainerGet) SetContainer(cid cid.ID) {
-	prm.ContainerID = &cid
-}
-
-func (prm *PrmContainerGet) buildRequest(c *Client) (*v2container.GetRequest, error) {
-	if prm.ContainerID == nil {
-		return nil, errorMissingContainer
-	}
-
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	var cidV2 refs.ContainerID
-	prm.ContainerID.WriteToV2(&cidV2)
-
-	reqBody := new(v2container.GetRequestBody)
-	reqBody.SetContainerID(&cidV2)
-
-	var meta v2session.RequestMetaHeader
-	writeXHeadersToMeta(prm.XHeaders, &meta)
-
-	if prm.Session != nil {
-		var tokv2 v2session.Token
-		prm.Session.WriteToV2(&tokv2)
-
-		meta.SetSessionToken(&tokv2)
-	}
-
-	var req v2container.GetRequest
-	req.SetBody(reqBody)
-	c.prepareRequest(&req, &meta)
-	return &req, nil
-}
-
-// ResContainerGet groups resulting values of ContainerGet operation.
-type ResContainerGet struct {
-	statusRes
-
-	cnr container.Container
-}
-
-// Container returns structured information about the requested container.
-//
-// Client doesn't retain value so modification is safe.
-func (x ResContainerGet) Container() container.Container {
-	return x.cnr
-}
-
-// ContainerGet reads FrostFS container by ID.
-//
-// Exactly one return value is non-nil. By default, server status is returned in res structure.
-// Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
-// otherwise, are also returned as `error`.
-//
-// Returns an error if parameters are set incorrectly (see PrmContainerGet docs).
-// Context is required and must not be nil. It is used for network communication.
-//
-// Return statuses:
-//   - global (see Client docs);
-//   - *apistatus.ContainerNotFound.
-func (c *Client) ContainerGet(ctx context.Context, prm PrmContainerGet) (*ResContainerGet, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.GetContainer(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResContainerGet
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	cnrV2 := resp.GetBody().GetContainer()
-	if cnrV2 == nil {
-		return &res, errors.New("missing container in response")
-	}
-	if err := res.cnr.ReadFromV2(*cnrV2); err != nil {
-		return &res, fmt.Errorf("invalid container in response: %w", err)
-	}
-	return &res, nil
-}

client/container_list.go

@@ -1,119 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	v2container "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
-)
-
-// PrmContainerList groups parameters of ContainerList operation.
-type PrmContainerList struct {
-	XHeaders []string
-
-	Account user.ID
-
-	Session *session.Container
-}
-
-// SetAccount sets identifier of the FrostFS account to list the containers.
-// Required parameter.
-//
-// Deprecated: Use PrmContainerList.Account instead.
-func (x *PrmContainerList) SetAccount(id user.ID) {
-	x.Account = id
-}
-
-func (x *PrmContainerList) buildRequest(c *Client) (*v2container.ListRequest, error) {
-	if x.Account.IsEmpty() {
-		return nil, errorAccountNotSet
-	}
-
-	var ownerV2 refs.OwnerID
-	x.Account.WriteToV2(&ownerV2)
-
-	reqBody := new(v2container.ListRequestBody)
-	reqBody.SetOwnerID(&ownerV2)
-
-	var meta v2session.RequestMetaHeader
-	writeXHeadersToMeta(x.XHeaders, &meta)
-
-	if x.Session != nil {
-		var tokv2 v2session.Token
-		x.Session.WriteToV2(&tokv2)
-
-		meta.SetSessionToken(&tokv2)
-	}
-
-	var req v2container.ListRequest
-	req.SetBody(reqBody)
-	c.prepareRequest(&req, &meta)
-	return &req, nil
-}
-
-// ResContainerList groups resulting values of ContainerList operation.
-type ResContainerList struct {
-	statusRes
-
-	ids []cid.ID
-}
-
-// Containers returns list of identifiers of the account-owned containers.
-//
-// Client doesn't retain value so modification is safe.
-func (x ResContainerList) Containers() []cid.ID {
-	return x.ids
-}
-
-// ContainerList requests identifiers of the account-owned containers.
-//
-// Exactly one return value is non-nil. By default, server status is returned in res structure.
-// Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
-// otherwise, are also returned as `error`.
-//
-// Returns an error if parameters are set incorrectly (see PrmContainerList docs).
-// Context is required and must not be nil. It is used for network communication.
-//
-// Return statuses:
-//   - global (see Client docs).
-func (c *Client) ContainerList(ctx context.Context, prm PrmContainerList) (*ResContainerList, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.ListContainers(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResContainerList
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	res.ids = make([]cid.ID, len(resp.GetBody().GetContainerIDs()))
-	for i, cidV2 := range resp.GetBody().GetContainerIDs() {
-		if err := res.ids[i].ReadFromV2(cidV2); err != nil {
-			return &res, fmt.Errorf("invalid ID in the response: %w", err)
-		}
-	}
-
-	return &res, nil
-}

client/container_put.go

@@ -1,160 +0,0 @@
-package client
-
-import (
-	"context"
-	"fmt"
-
-	v2container "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
-)
-
-// PrmContainerPut groups parameters of ContainerPut operation.
-type PrmContainerPut struct {
-	// FrostFS request X-Headers
-	XHeaders []string
-
-	Container *container.Container
-
-	Session *session.Container
-}
-
-// SetContainer sets structured information about new FrostFS container.
-// Required parameter.
-//
-// Deprecated: Use PrmContainerPut.Container instead.
-func (x *PrmContainerPut) SetContainer(cnr container.Container) {
-	x.Container = &cnr
-}
-
-// WithinSession specifies session within which container should be saved.
-//
-// Creator of the session acquires the authorship of the request. This affects
-// the execution of an operation (e.g. access control).
-//
-// Session is optional, if set the following requirements apply:
-//   - session operation MUST be session.VerbContainerPut (ForVerb)
-//   - token MUST be signed using private key of the owner of the container to be saved
-//
-// Deprecated: Use PrmContainerPut.Session instead.
-func (x *PrmContainerPut) WithinSession(s session.Container) {
-	x.Session = &s
-}
-
-func (x *PrmContainerPut) buildRequest(c *Client) (*v2container.PutRequest, error) {
-	if x.Container == nil {
-		return nil, errorMissingContainer
-	}
-
-	if len(x.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	// TODO: check private key is set before forming the request
-	var cnr v2container.Container
-	x.Container.WriteToV2(&cnr)
-
-	var sig frostfscrypto.Signature
-
-	err := container.CalculateSignature(&sig, *x.Container, c.prm.Key)
-	if err != nil {
-		return nil, fmt.Errorf("calculate container signature: %w", err)
-	}
-
-	var sigv2 refs.Signature
-	sig.WriteToV2(&sigv2)
-
-	reqBody := new(v2container.PutRequestBody)
-	reqBody.SetContainer(&cnr)
-	reqBody.SetSignature(&sigv2)
-
-	var meta v2session.RequestMetaHeader
-	writeXHeadersToMeta(x.XHeaders, &meta)
-
-	if x.Session != nil {
-		var tokv2 v2session.Token
-		x.Session.WriteToV2(&tokv2)
-
-		meta.SetSessionToken(&tokv2)
-	}
-
-	var req v2container.PutRequest
-	req.SetBody(reqBody)
-	c.prepareRequest(&req, &meta)
-	return &req, nil
-}
-
-// ResContainerPut groups resulting values of ContainerPut operation.
-type ResContainerPut struct {
-	statusRes
-
-	id cid.ID
-}
-
-// ID returns identifier of the container declared to be stored in the system.
-// Used as a link to information about the container (in particular, you can
-// asynchronously check if the save was successful).
-func (x ResContainerPut) ID() cid.ID {
-	return x.id
-}
-
-// ContainerPut sends request to save container in FrostFS.
-//
-// Exactly one return value is non-nil. By default, server status is returned in res structure.
-// Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
-// otherwise, are also returned as `error`.
-//
-// Operation is asynchronous and no guaranteed even in the absence of errors.
-// The required time is also not predictable.
-//
-// Success can be verified by reading by identifier (see ResContainerPut.ID).
-//
-// Returns an error if parameters are set incorrectly (see PrmContainerPut docs).
-// Context is required and must not be nil. It is used for network communication.
-//
-// Return statuses:
-//   - global (see Client docs).
-//
-// nolint: funlen
-func (c *Client) ContainerPut(ctx context.Context, prm PrmContainerPut) (*ResContainerPut, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.PutContainer(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResContainerPut
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	const fieldCnrID = "container ID"
-
-	cidV2 := resp.GetBody().GetContainerID()
-	if cidV2 == nil {
-		return &res, newErrMissingResponseField(fieldCnrID)
-	}
-	if err := res.id.ReadFromV2(*cidV2); err != nil {
-		return &res, newErrInvalidResponseField(fieldCnrID, err)
-	}
-	return &res, nil
-}

client/doc.go

@@ -47,8 +47,8 @@ Consume custom service of the server:
 		rpc CustomRPC(CustomRPCRequest) returns (CustomRPCResponse);
 	}
 
-	import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	import "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/common"
+	import "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/common"
 
 	req := new(CustomRPCRequest)
 	// ...
@@ -72,7 +72,7 @@ for the all operations are write-only and the results of the all operations are
 read-only. To be able to override client behavior (e.g. for tests), abstract it
 with an interface:
 
-	import "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
+	import "github.com/TrueCloudLab/frostfs-sdk-go/client"
 
 	type FrostFSClient interface {
 		// Operations according to the application needs

client/errors.go

@@ -1,76 +1,97 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
 )
 
-// wrapsErrType returns true if any error in the error tree of err is of type E.
+// unwraps err using errors.Unwrap and returns the result.
-func wrapsErrType[E error](err error) bool {
+func unwrapErr(err error) error {
-	switch e := err.(type) {
+	for e := errors.Unwrap(err); e != nil; e = errors.Unwrap(err) {
-	case E:
+		err = e
-		return true
-	case interface{ Unwrap() error }:
-		return wrapsErrType[E](e.Unwrap())
-	case interface{ Unwrap() []error }:
-		for _, ei := range e.Unwrap() {
-			if wrapsErrType[E](ei) {
-				return true
-			}
-		}
-		return false
-	default:
-		return false
 	}
+
+	return err
 }
 
 // IsErrContainerNotFound checks if err corresponds to FrostFS status
 // return corresponding to missing container. Supports wrapped errors.
 func IsErrContainerNotFound(err error) bool {
-	return wrapsErrType[*apistatus.ContainerNotFound](err)
+	switch unwrapErr(err).(type) {
+	default:
+		return false
+	case
+		apistatus.ContainerNotFound,
+		*apistatus.ContainerNotFound:
+		return true
+	}
 }
 
 // IsErrEACLNotFound checks if err corresponds to FrostFS status
 // return corresponding to missing eACL table. Supports wrapped errors.
 func IsErrEACLNotFound(err error) bool {
-	return wrapsErrType[*apistatus.EACLNotFound](err)
+	switch unwrapErr(err).(type) {
+	default:
+		return false
+	case
+		apistatus.EACLNotFound,
+		*apistatus.EACLNotFound:
+		return true
+	}
 }
 
 // IsErrObjectNotFound checks if err corresponds to FrostFS status
 // return corresponding to missing object. Supports wrapped errors.
 func IsErrObjectNotFound(err error) bool {
-	return wrapsErrType[*apistatus.ObjectNotFound](err)
+	switch unwrapErr(err).(type) {
+	default:
+		return false
+	case
+		apistatus.ObjectNotFound,
+		*apistatus.ObjectNotFound:
+		return true
+	}
 }
 
 // IsErrObjectAlreadyRemoved checks if err corresponds to FrostFS status
 // return corresponding to already removed object. Supports wrapped errors.
 func IsErrObjectAlreadyRemoved(err error) bool {
-	return wrapsErrType[*apistatus.ObjectAlreadyRemoved](err)
+	switch unwrapErr(err).(type) {
+	default:
+		return false
+	case
+		apistatus.ObjectAlreadyRemoved,
+		*apistatus.ObjectAlreadyRemoved:
+		return true
+	}
 }
 
 // IsErrSessionExpired checks if err corresponds to FrostFS status return
 // corresponding to expired session. Supports wrapped errors.
 func IsErrSessionExpired(err error) bool {
-	return wrapsErrType[*apistatus.SessionTokenExpired](err)
+	switch unwrapErr(err).(type) {
+	default:
+		return false
+	case
+		apistatus.SessionTokenExpired,
+		*apistatus.SessionTokenExpired:
+		return true
+	}
 }
 
 // IsErrSessionNotFound checks if err corresponds to FrostFS status return
 // corresponding to missing session. Supports wrapped errors.
 func IsErrSessionNotFound(err error) bool {
-	return wrapsErrType[*apistatus.SessionTokenNotFound](err)
+	switch unwrapErr(err).(type) {
-}
+	default:
-
+		return false
-// IsErrAPEManagerAccessDenied checks if err corresponds to FrostFS status return
+	case
-// corresponding to apemanager access deny. Supports wrapped errors.
+		apistatus.SessionTokenNotFound,
-func IsErrAPEManagerAccessDenied(err error) bool {
+		*apistatus.SessionTokenNotFound:
-	return wrapsErrType[*apistatus.APEManagerAccessDenied](err)
+		return true
-}
+	}
-
-// IsErrNodeUnderMaintenance checks if err corresponds to FrostFS status return
-// corresponding to nodes being under maintenance. Supports wrapped errors.
-func IsErrNodeUnderMaintenance(err error) bool {
-	return wrapsErrType[*apistatus.NodeUnderMaintenance](err)
 }
 
 // returns error describing missing field with the given name.

client/errors_test.go

@@ -4,51 +4,65 @@ import (
 	"fmt"
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
+	"github.com/TrueCloudLab/frostfs-sdk-go/client"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
 	"github.com/stretchr/testify/require"
 )
 
 func TestErrors(t *testing.T) {
-	errs := []struct {
+	for _, tc := range []struct {
 		check func(error) bool
-		err   error
+		errs  []error
 	}{
 		{
 			check: client.IsErrContainerNotFound,
-			err:   new(apistatus.ContainerNotFound),
+			errs: []error{
+				apistatus.ContainerNotFound{},
+				new(apistatus.ContainerNotFound),
+			},
 		},
 		{
 			check: client.IsErrEACLNotFound,
-			err:   new(apistatus.EACLNotFound),
+			errs: []error{
+				apistatus.EACLNotFound{},
+				new(apistatus.EACLNotFound),
+			},
 		},
 		{
 			check: client.IsErrObjectNotFound,
-			err:   new(apistatus.ObjectNotFound),
+			errs: []error{
+				apistatus.ObjectNotFound{},
+				new(apistatus.ObjectNotFound),
+			},
 		},
 		{
 			check: client.IsErrObjectAlreadyRemoved,
-			err:   new(apistatus.ObjectAlreadyRemoved),
+			errs: []error{
+				apistatus.ObjectAlreadyRemoved{},
+				new(apistatus.ObjectAlreadyRemoved),
+			},
 		},
 		{
 			check: client.IsErrSessionExpired,
-			err:   new(apistatus.SessionTokenExpired),
+			errs: []error{
-		},
+				apistatus.SessionTokenExpired{},
-		{
+				new(apistatus.SessionTokenExpired),
+			},
+		}, {
 			check: client.IsErrSessionNotFound,
-			err:   new(apistatus.SessionTokenNotFound),
+			errs: []error{
+				apistatus.SessionTokenNotFound{},
+				new(apistatus.SessionTokenNotFound),
+			},
 		},
-		{
+	} {
-			check: client.IsErrNodeUnderMaintenance,
+		require.NotEmpty(t, tc.errs)
-			err:   new(apistatus.NodeUnderMaintenance),
-		},
-	}
 
-	for i := range errs {
+		for i := range tc.errs {
-		for j := range errs {
+			require.True(t, tc.check(tc.errs[i]), tc.errs[i])
-			nestedErr := fmt.Errorf("top-level context: :%w", fmt.Errorf("inner context: %w", errs[j].err))
+			require.True(t, tc.check(fmt.Errorf("top-level context: :%w",
-			require.Equal(t, i == j, errs[i].check(errs[j].err))
+				fmt.Errorf("inner context: %w", tc.errs[i])),
-			require.Equal(t, i == j, errs[i].check(nestedErr))
+			), tc.errs[i])
 		}
 	}
 }

client/netmap.go

@@ -4,29 +4,19 @@ import (
 	"context"
 	"fmt"
 
-	v2netmap "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
+	v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
+	"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
+	"github.com/TrueCloudLab/frostfs-sdk-go/version"
 )
 
 // PrmEndpointInfo groups parameters of EndpointInfo operation.
 type PrmEndpointInfo struct {
-	XHeaders []string
+	prmCommonMeta
-}
-
-func (x *PrmEndpointInfo) buildRequest(c *Client) (*v2netmap.LocalNodeInfoRequest, error) {
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(x.XHeaders, meta)
-
-	req := new(v2netmap.LocalNodeInfoRequest)
-	req.SetBody(new(v2netmap.LocalNodeInfoRequestBody))
-	c.prepareRequest(req, meta)
-	return req, nil
 }
 
 // ResEndpointInfo group resulting values of EndpointInfo operation.
@@ -53,9 +43,9 @@ func (x ResEndpointInfo) NodeInfo() netmap.NodeInfo {
 // Method can be used as a health check to see if node is alive and responds to requests.
 //
 // Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly (see PrmEndpointInfo docs).
 // Context is required and must not be nil. It is used for network communication.
@@ -66,63 +56,73 @@ func (x ResEndpointInfo) NodeInfo() netmap.NodeInfo {
 // Return statuses:
 //   - global (see Client docs).
 func (c *Client) EndpointInfo(ctx context.Context, prm PrmEndpointInfo) (*ResEndpointInfo, error) {
-	req, err := prm.buildRequest(c)
+	// check context
-	if err != nil {
+	if ctx == nil {
-		return nil, err
+		return nil, errorMissingContext
 	}
 
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
+	// form request
-		return nil, fmt.Errorf("sign request: %w", err)
+	var req v2netmap.LocalNodeInfoRequest
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResEndpointInfo
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.LocalNodeInfo(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2netmap.LocalNodeInfoResponse)
+
+		body := resp.GetBody()
+
+		const fieldVersion = "version"
+
+		verV2 := body.GetVersion()
+		if verV2 == nil {
+			cc.err = newErrMissingResponseField(fieldVersion)
+			return
+		}
+
+		cc.err = res.version.ReadFromV2(*verV2)
+		if cc.err != nil {
+			cc.err = newErrInvalidResponseField(fieldVersion, cc.err)
+			return
+		}
+
+		const fieldNodeInfo = "node info"
+
+		nodeInfoV2 := body.GetNodeInfo()
+		if nodeInfoV2 == nil {
+			cc.err = newErrMissingResponseField(fieldNodeInfo)
+			return
+		}
+
+		cc.err = res.ni.ReadFromV2(*nodeInfoV2)
+		if cc.err != nil {
+			cc.err = newErrInvalidResponseField(fieldNodeInfo, cc.err)
+			return
+		}
 	}
 
-	resp, err := rpcapi.LocalNodeInfo(&c.c, req, client.WithContext(ctx))
+	// process call
-	if err != nil {
+	if !cc.processCall() {
-		return nil, err
+		return nil, cc.err
 	}
 
-	var res ResEndpointInfo
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	body := resp.GetBody()
-
-	const fieldVersion = "version"
-
-	verV2 := body.GetVersion()
-	if verV2 == nil {
-		return nil, newErrMissingResponseField(fieldVersion)
-	}
-	if err := res.version.ReadFromV2(*verV2); err != nil {
-		return nil, newErrInvalidResponseField(fieldVersion, err)
-	}
-
-	const fieldNodeInfo = "node info"
-
-	nodeInfoV2 := body.GetNodeInfo()
-	if nodeInfoV2 == nil {
-		return nil, newErrMissingResponseField(fieldNodeInfo)
-	}
-	if err := res.ni.ReadFromV2(*nodeInfoV2); err != nil {
-		return nil, newErrInvalidResponseField(fieldNodeInfo, err)
-	}
 	return &res, nil
 }
 
 // PrmNetworkInfo groups parameters of NetworkInfo operation.
 type PrmNetworkInfo struct {
-	XHeaders []string
+	prmCommonMeta
-}
-
-func (x PrmNetworkInfo) buildRequest(c *Client) (*v2netmap.NetworkInfoRequest, error) {
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(x.XHeaders, meta)
-
-	var req v2netmap.NetworkInfoRequest
-	req.SetBody(new(v2netmap.NetworkInfoRequestBody))
-	c.prepareRequest(&req, meta)
-	return &req, nil
 }
 
 // ResNetworkInfo groups resulting values of NetworkInfo operation.
@@ -140,9 +140,9 @@ func (x ResNetworkInfo) Info() netmap.NetworkInfo {
 // NetworkInfo requests information about the FrostFS network of which the remote server is a part.
 //
 // Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly (see PrmNetworkInfo docs).
 // Context is required and must not be nil. It is used for network communication.
@@ -153,40 +153,57 @@ func (x ResNetworkInfo) Info() netmap.NetworkInfo {
 // Return statuses:
 //   - global (see Client docs).
 func (c *Client) NetworkInfo(ctx context.Context, prm PrmNetworkInfo) (*ResNetworkInfo, error) {
-	req, err := prm.buildRequest(c)
+	// check context
-	if err != nil {
+	if ctx == nil {
-		return nil, err
+		return nil, errorMissingContext
 	}
 
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
+	// form request
-		return nil, fmt.Errorf("sign request: %w", err)
+	var req v2netmap.NetworkInfoRequest
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResNetworkInfo
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.NetworkInfo(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2netmap.NetworkInfoResponse)
+
+		const fieldNetInfo = "network info"
+
+		netInfoV2 := resp.GetBody().GetNetworkInfo()
+		if netInfoV2 == nil {
+			cc.err = newErrMissingResponseField(fieldNetInfo)
+			return
+		}
+
+		cc.err = res.info.ReadFromV2(*netInfoV2)
+		if cc.err != nil {
+			cc.err = newErrInvalidResponseField(fieldNetInfo, cc.err)
+			return
+		}
 	}
 
-	resp, err := rpcapi.NetworkInfo(&c.c, req, client.WithContext(ctx))
+	// process call
-	if err != nil {
+	if !cc.processCall() {
-		return nil, err
+		return nil, cc.err
 	}
 
-	var res ResNetworkInfo
-	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
-		return &res, err
-	}
-
-	const fieldNetInfo = "network info"
-
-	netInfoV2 := resp.GetBody().GetNetworkInfo()
-	if netInfoV2 == nil {
-		return nil, newErrMissingResponseField(fieldNetInfo)
-	}
-	if err := res.info.ReadFromV2(*netInfoV2); err != nil {
-		return nil, newErrInvalidResponseField(fieldNetInfo, err)
-	}
 	return &res, nil
 }
 
 // PrmNetMapSnapshot groups parameters of NetMapSnapshot operation.
-type PrmNetMapSnapshot struct{}
+type PrmNetMapSnapshot struct {
+}
 
 // ResNetMapSnapshot groups resulting values of NetMapSnapshot operation.
 type ResNetMapSnapshot struct {
@@ -203,9 +220,9 @@ func (x ResNetMapSnapshot) NetMap() netmap.NetMap {
 // NetMapSnapshot requests current network view of the remote server.
 //
 // Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly.
 // Context is required and MUST NOT be nil. It is used for network communication.
@@ -216,6 +233,11 @@ func (x ResNetMapSnapshot) NetMap() netmap.NetMap {
 // Return statuses:
 //   - global (see Client docs).
 func (c *Client) NetMapSnapshot(ctx context.Context, _ PrmNetMapSnapshot) (*ResNetMapSnapshot, error) {
+	// check context
+	if ctx == nil {
+		return nil, errorMissingContext
+	}
+
 	// form request body
 	var body v2netmap.SnapshotRequestBody
 
@@ -227,7 +249,7 @@ func (c *Client) NetMapSnapshot(ctx context.Context, _ PrmNetMapSnapshot) (*ResN
 	req.SetBody(&body)
 	c.prepareRequest(&req, &meta)
 
-	err := signature.SignServiceMessage(&c.prm.Key, &req)
+	err := signature.SignServiceMessage(&c.prm.key, &req)
 	if err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
@@ -239,8 +261,12 @@ func (c *Client) NetMapSnapshot(ctx context.Context, _ PrmNetMapSnapshot) (*ResN
 
 	var res ResNetMapSnapshot
 	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
+	if err != nil {
-		return &res, err
+		return nil, err
+	}
+
+	if !apistatus.IsSuccessful(res.st) {
+		return &res, nil
 	}
 
 	const fieldNetMap = "network map"

client/netmap_test.go

@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"testing"
 
-	v2netmap "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
+	v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
+	"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
 	"github.com/stretchr/testify/require"
 )
 
@@ -67,9 +67,13 @@ func TestClient_NetMapSnapshot(t *testing.T) {
 	var res *ResNetMapSnapshot
 	var srv serverNetMap
 	c := newClient(&srv)
-	c.prm.DisableFrostFSFailuresResolution()
 	ctx := context.Background()
 
+	// missing context
+	//nolint:staticcheck
+	_, err = c.NetMapSnapshot(nil, prm)
+	require.ErrorIs(t, err, errorMissingContext, "")
+
 	// request signature
 	srv.errTransport = errors.New("any error")
 

client/object_delete.go

@@ -5,41 +5,87 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/acl"
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
+	v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	v2refs "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	v2refs "github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
+	"github.com/TrueCloudLab/frostfs-sdk-go/bearer"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
+	"github.com/TrueCloudLab/frostfs-sdk-go/session"
 )
 
 // PrmObjectDelete groups parameters of ObjectDelete operation.
 type PrmObjectDelete struct {
-	XHeaders []string
+	meta v2session.RequestMetaHeader
 
-	BearerToken *bearer.Token
+	body v2object.DeleteRequestBody
 
-	Session *session.Object
+	addr v2refs.Address
 
-	ContainerID *cid.ID
+	keySet bool
+	key    ecdsa.PrivateKey
+}
 
-	ObjectID *oid.ID
+// WithinSession specifies session within which object should be read.
+//
+// Creator of the session acquires the authorship of the request.
+// This may affect the execution of an operation (e.g. access control).
+//
+// Must be signed.
+func (x *PrmObjectDelete) WithinSession(t session.Object) {
+	var tv2 v2session.Token
+	t.WriteToV2(&tv2)
 
-	Key *ecdsa.PrivateKey
+	x.meta.SetSessionToken(&tv2)
+}
+
+// WithBearerToken attaches bearer token to be used for the operation.
+//
+// If set, underlying eACL rules will be used in access control.
+//
+// Must be signed.
+func (x *PrmObjectDelete) WithBearerToken(t bearer.Token) {
+	var v2token acl.BearerToken
+	t.WriteToV2(&v2token)
+	x.meta.SetBearerToken(&v2token)
+}
+
+// FromContainer specifies FrostFS container of the object.
+// Required parameter.
+func (x *PrmObjectDelete) FromContainer(id cid.ID) {
+	var cidV2 v2refs.ContainerID
+	id.WriteToV2(&cidV2)
+
+	x.addr.SetContainerID(&cidV2)
+}
+
+// ByID specifies identifier of the requested object.
+// Required parameter.
+func (x *PrmObjectDelete) ByID(id oid.ID) {
+	var idV2 v2refs.ObjectID
+	id.WriteToV2(&idV2)
+
+	x.addr.SetObjectID(&idV2)
 }
 
 // UseKey specifies private key to sign the requests.
 // If key is not provided, then Client default key is used.
+func (x *PrmObjectDelete) UseKey(key ecdsa.PrivateKey) {
+	x.keySet = true
+	x.key = key
+}
+
+// WithXHeaders specifies list of extended headers (string key-value pairs)
+// to be attached to the request. Must have an even length.
 //
-// Deprecated: Use PrmObjectDelete.Key instead.
+// Slice must not be mutated until the operation completes.
-func (prm *PrmObjectDelete) UseKey(key ecdsa.PrivateKey) {
+func (x *PrmObjectDelete) WithXHeaders(hs ...string) {
-	prm.Key = &key
+	writeXHeadersToMeta(hs, &x.meta)
 }
 
 // ResObjectDelete groups resulting values of ObjectDelete operation.
@@ -54,54 +100,6 @@ func (x ResObjectDelete) Tombstone() oid.ID {
 	return x.tomb
 }
 
-func (prm *PrmObjectDelete) buildRequest(c *Client) (*v2object.DeleteRequest, error) {
-	if prm.ContainerID == nil {
-		return nil, errorMissingContainer
-	}
-
-	if prm.ObjectID == nil {
-		return nil, errorMissingObject
-	}
-
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	addr := new(v2refs.Address)
-
-	cnrV2 := new(v2refs.ContainerID)
-	prm.ContainerID.WriteToV2(cnrV2)
-	addr.SetContainerID(cnrV2)
-
-	objV2 := new(v2refs.ObjectID)
-	prm.ObjectID.WriteToV2(objV2)
-	addr.SetObjectID(objV2)
-
-	body := new(v2object.DeleteRequestBody)
-	body.SetAddress(addr)
-
-	req := new(v2object.DeleteRequest)
-	req.SetBody(body)
-	c.prepareRequest(req, meta)
-
-	return req, nil
-}
-
 // ObjectDelete marks an object for deletion from the container using FrostFS API protocol.
 // As a marker, a special unit called a tombstone is placed in the container.
 // It confirms the user's intent to delete the object, and is itself a container object.
@@ -112,9 +110,9 @@ func (prm *PrmObjectDelete) buildRequest(c *Client) (*v2object.DeleteRequest, er
 //
 // Exactly one return value is non-nil. By default, server status is returned in res structure.
 // Any client's internal or transport errors are returned as `error`,
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly (see PrmObjectDelete docs).
 // Context is required and must not be nil. It is used for network communication.
@@ -126,30 +124,46 @@ func (prm *PrmObjectDelete) buildRequest(c *Client) (*v2object.DeleteRequest, er
 //   - *apistatus.ObjectLocked;
 //   - *apistatus.SessionTokenExpired.
 func (c *Client) ObjectDelete(ctx context.Context, prm PrmObjectDelete) (*ResObjectDelete, error) {
-	req, err := prm.buildRequest(c)
+	switch {
-	if err != nil {
+	case ctx == nil:
-		return nil, err
+		return nil, errorMissingContext
+	case prm.addr.GetContainerID() == nil:
+		return nil, errorMissingContainer
+	case prm.addr.GetObjectID() == nil:
+		return nil, errorMissingObject
 	}
 
-	key := c.prm.Key
+	// form request body
-	if prm.Key != nil {
+	prm.body.SetAddress(&prm.addr)
-		key = *prm.Key
+
+	// form request
+	var req v2object.DeleteRequest
+	req.SetBody(&prm.body)
+	c.prepareRequest(&req, &prm.meta)
+
+	key := c.prm.key
+	if prm.keySet {
+		key = prm.key
 	}
 
-	err = signature.SignServiceMessage(&key, req)
+	err := signature.SignServiceMessage(&key, &req)
 	if err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
 
-	resp, err := rpcapi.DeleteObject(&c.c, req, client.WithContext(ctx))
+	resp, err := rpcapi.DeleteObject(&c.c, &req, client.WithContext(ctx))
 	if err != nil {
 		return nil, err
 	}
 
 	var res ResObjectDelete
 	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
+	if err != nil {
-		return &res, err
+		return nil, err
+	}
+
+	if !apistatus.IsSuccessful(res.st) {
+		return &res, nil
 	}
 
 	const fieldTombstone = "tombstone"

client/object_get.go

@@ -7,91 +7,92 @@ import (
 	"fmt"
 	"io"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/acl"
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
+	v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	v2refs "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	v2refs "github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
+	"github.com/TrueCloudLab/frostfs-sdk-go/bearer"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	"github.com/TrueCloudLab/frostfs-sdk-go/object"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
+	"github.com/TrueCloudLab/frostfs-sdk-go/session"
 )
 
+// shared parameters of GET/HEAD/RANGE.
+type prmObjectRead struct {
+	meta v2session.RequestMetaHeader
+
+	raw bool
+
+	addr v2refs.Address
+}
+
+// WithXHeaders specifies list of extended headers (string key-value pairs)
+// to be attached to the request. Must have an even length.
+//
+// Slice must not be mutated until the operation completes.
+func (x *prmObjectRead) WithXHeaders(hs ...string) {
+	writeXHeadersToMeta(hs, &x.meta)
+}
+
+// MarkRaw marks an intent to read physically stored object.
+func (x *prmObjectRead) MarkRaw() {
+	x.raw = true
+}
+
+// MarkLocal tells the server to execute the operation locally.
+func (x *prmObjectRead) MarkLocal() {
+	x.meta.SetTTL(1)
+}
+
+// WithinSession specifies session within which object should be read.
+//
+// Creator of the session acquires the authorship of the request.
+// This may affect the execution of an operation (e.g. access control).
+//
+// Must be signed.
+func (x *prmObjectRead) WithinSession(t session.Object) {
+	var tokv2 v2session.Token
+	t.WriteToV2(&tokv2)
+	x.meta.SetSessionToken(&tokv2)
+}
+
+// WithBearerToken attaches bearer token to be used for the operation.
+//
+// If set, underlying eACL rules will be used in access control.
+//
+// Must be signed.
+func (x *prmObjectRead) WithBearerToken(t bearer.Token) {
+	var v2token acl.BearerToken
+	t.WriteToV2(&v2token)
+	x.meta.SetBearerToken(&v2token)
+}
+
+// FromContainer specifies FrostFS container of the object.
+// Required parameter.
+func (x *prmObjectRead) FromContainer(id cid.ID) {
+	var cnrV2 v2refs.ContainerID
+	id.WriteToV2(&cnrV2)
+	x.addr.SetContainerID(&cnrV2)
+}
+
+// ByID specifies identifier of the requested object.
+// Required parameter.
+func (x *prmObjectRead) ByID(id oid.ID) {
+	var objV2 v2refs.ObjectID
+	id.WriteToV2(&objV2)
+	x.addr.SetObjectID(&objV2)
+}
+
 // PrmObjectGet groups parameters of ObjectGetInit operation.
 type PrmObjectGet struct {
-	XHeaders []string
+	prmObjectRead
 
-	BearerToken *bearer.Token
+	key *ecdsa.PrivateKey
-
-	Session *session.Object
-
-	Raw bool
-
-	Local bool
-
-	ContainerID *cid.ID
-
-	ObjectID *oid.ID
-
-	Key *ecdsa.PrivateKey
-}
-
-func (prm *PrmObjectGet) buildRequest(c *Client) (*v2object.GetRequest, error) {
-	if prm.ContainerID == nil {
-		return nil, errorMissingContainer
-	}
-
-	if prm.ObjectID == nil {
-		return nil, errorMissingObject
-	}
-
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	if prm.Local {
-		meta.SetTTL(1)
-	}
-
-	addr := new(v2refs.Address)
-
-	cnrV2 := new(v2refs.ContainerID)
-	prm.ContainerID.WriteToV2(cnrV2)
-	addr.SetContainerID(cnrV2)
-
-	objV2 := new(v2refs.ObjectID)
-	prm.ObjectID.WriteToV2(objV2)
-	addr.SetObjectID(objV2)
-
-	body := new(v2object.GetRequestBody)
-	body.SetRaw(prm.Raw)
-	body.SetAddress(addr)
-
-	req := new(v2object.GetRequest)
-	req.SetBody(body)
-	c.prepareRequest(req, meta)
-
-	return req, nil
 }
 
 // ResObjectGet groups the final result values of ObjectGetInit operation.
@@ -121,10 +122,8 @@ type ObjectReader struct {
 
 // UseKey specifies private key to sign the requests.
 // If key is not provided, then Client default key is used.
-//
+func (x *PrmObjectGet) UseKey(key ecdsa.PrivateKey) {
-// Deprecated: Use PrmObjectGet.Key instead.
+	x.key = &key
-func (prm *PrmObjectGet) UseKey(key ecdsa.PrivateKey) {
-	prm.Key = &key
 }
 
 // ReadHeader reads header of the object. Result means success.
@@ -150,9 +149,6 @@ func (x *ObjectReader) ReadHeader(dst *object.Object) bool {
 	case *v2object.SplitInfo:
 		x.err = object.NewSplitInfoError(object.NewSplitInfoFromV2(v))
 		return false
-	case *v2object.ECInfo:
-		x.err = object.NewECInfoError(object.NewECInfoFromV2(v))
-		return false
 	case *v2object.GetObjectPartInit:
 		partInit = v
 	}
@@ -261,7 +257,6 @@ func (x *ObjectReader) close(ignoreEOF bool) (*ResObjectGet, error) {
 // Return errors:
 //
 //	*object.SplitInfoError (returned on virtual objects with PrmObjectGet.MakeRaw).
-//	*object.ECInfoError (returned on erasure-coded objects with PrmObjectGet.MakeRaw).
 //
 // Return statuses:
 //   - global (see Client docs);
@@ -304,24 +299,41 @@ func (x *ObjectReader) Read(p []byte) (int, error) {
 // Returns an error if parameters are set incorrectly (see PrmObjectGet docs).
 // Context is required and must not be nil. It is used for network communication.
 func (c *Client) ObjectGetInit(ctx context.Context, prm PrmObjectGet) (*ObjectReader, error) {
-	req, err := prm.buildRequest(c)
+	// check parameters
-	if err != nil {
+	switch {
-		return nil, err
+	case ctx == nil:
+		return nil, errorMissingContext
+	case prm.addr.GetContainerID() == nil:
+		return nil, errorMissingContainer
+	case prm.addr.GetObjectID() == nil:
+		return nil, errorMissingObject
 	}
 
-	key := prm.Key
+	// form request body
+	var body v2object.GetRequestBody
+
+	body.SetRaw(prm.raw)
+	body.SetAddress(&prm.addr)
+
+	// form request
+	var req v2object.GetRequest
+
+	req.SetBody(&body)
+	c.prepareRequest(&req, &prm.meta)
+
+	key := prm.key
 	if key == nil {
-		key = &c.prm.Key
+		key = &c.prm.key
 	}
 
-	err = signature.SignServiceMessage(key, req)
+	err := signature.SignServiceMessage(key, &req)
 	if err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
 
 	ctx, cancel := context.WithCancel(ctx)
 
-	stream, err := rpcapi.GetObject(&c.c, req, client.WithContext(ctx))
+	stream, err := rpcapi.GetObject(&c.c, &req, client.WithContext(ctx))
 	if err != nil {
 		cancel()
 		return nil, fmt.Errorf("open stream: %w", err)
@@ -337,29 +349,17 @@ func (c *Client) ObjectGetInit(ctx context.Context, prm PrmObjectGet) (*ObjectRe
 
 // PrmObjectHead groups parameters of ObjectHead operation.
 type PrmObjectHead struct {
-	XHeaders []string
+	prmObjectRead
 
-	BearerToken *bearer.Token
+	keySet bool
-
+	key    ecdsa.PrivateKey
-	Session *session.Object
-
-	Raw bool
-
-	Local bool
-
-	ContainerID *cid.ID
-
-	ObjectID *oid.ID
-
-	Key *ecdsa.PrivateKey
 }
 
 // UseKey specifies private key to sign the requests.
 // If key is not provided, then Client default key is used.
-//
+func (x *PrmObjectHead) UseKey(key ecdsa.PrivateKey) {
-// Deprecated: Use PrmObjectHead.Key instead.
+	x.keySet = true
-func (prm *PrmObjectHead) UseKey(key ecdsa.PrivateKey) {
+	x.key = key
-	prm.Key = &key
 }
 
 // ResObjectHead groups resulting values of ObjectHead operation.
@@ -392,65 +392,13 @@ func (x *ResObjectHead) ReadHeader(dst *object.Object) bool {
 	return true
 }
 
-func (prm *PrmObjectHead) buildRequest(c *Client) (*v2object.HeadRequest, error) {
-	if prm.ContainerID == nil {
-		return nil, errorMissingContainer
-	}
-
-	if prm.ObjectID == nil {
-		return nil, errorMissingObject
-	}
-
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	if prm.Local {
-		meta.SetTTL(1)
-	}
-
-	addr := new(v2refs.Address)
-
-	cnrV2 := new(v2refs.ContainerID)
-	prm.ContainerID.WriteToV2(cnrV2)
-	addr.SetContainerID(cnrV2)
-
-	objV2 := new(v2refs.ObjectID)
-	prm.ObjectID.WriteToV2(objV2)
-	addr.SetObjectID(objV2)
-	body := new(v2object.HeadRequestBody)
-	body.SetRaw(prm.Raw)
-	body.SetAddress(addr)
-
-	req := new(v2object.HeadRequest)
-	req.SetBody(body)
-	c.prepareRequest(req, meta)
-
-	return req, nil
-}
-
 // ObjectHead reads object header through a remote server using FrostFS API protocol.
 //
 // Exactly one return value is non-nil. By default, server status is returned in res structure.
 // Any client's internal or transport errors are returned as `error`,
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly (see PrmObjectHead docs).
 // Context is required and must not be nil. It is used for network communication.
@@ -458,7 +406,6 @@ func (prm *PrmObjectHead) buildRequest(c *Client) (*v2object.HeadRequest, error)
 // Return errors:
 //
 //	*object.SplitInfoError (returned on virtual objects with PrmObjectHead.MakeRaw).
-//	*object.ECInfoError (returned on erasure-coded objects with PrmObjectHead.MakeRaw).
 //
 // Return statuses:
 //   - global (see Client docs);
@@ -468,43 +415,56 @@ func (prm *PrmObjectHead) buildRequest(c *Client) (*v2object.HeadRequest, error)
 //   - *apistatus.ObjectAlreadyRemoved;
 //   - *apistatus.SessionTokenExpired.
 func (c *Client) ObjectHead(ctx context.Context, prm PrmObjectHead) (*ResObjectHead, error) {
-	req, err := prm.buildRequest(c)
+	switch {
-	if err != nil {
+	case ctx == nil:
-		return nil, err
+		return nil, errorMissingContext
+	case prm.addr.GetContainerID() == nil:
+		return nil, errorMissingContainer
+	case prm.addr.GetObjectID() == nil:
+		return nil, errorMissingObject
 	}
 
-	key := c.prm.Key
+	var body v2object.HeadRequestBody
-	if prm.Key != nil {
+	body.SetRaw(prm.raw)
-		key = *prm.Key
+	body.SetAddress(&prm.addr)
+
+	var req v2object.HeadRequest
+	req.SetBody(&body)
+	c.prepareRequest(&req, &prm.meta)
+
+	key := c.prm.key
+	if prm.keySet {
+		key = prm.key
 	}
 
 	// sign the request
-
+	err := signature.SignServiceMessage(&key, &req)
-	err = signature.SignServiceMessage(&key, req)
 	if err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
 
-	resp, err := rpcapi.HeadObject(&c.c, req, client.WithContext(ctx))
+	resp, err := rpcapi.HeadObject(&c.c, &req, client.WithContext(ctx))
 	if err != nil {
 		return nil, fmt.Errorf("write request: %w", err)
 	}
 
 	var res ResObjectHead
 	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
+	if err != nil {
-		return &res, err
+		return nil, err
 	}
 
-	res.idObj = *prm.ObjectID
+	if !apistatus.IsSuccessful(res.st) {
+		return &res, nil
+	}
+
+	_ = res.idObj.ReadFromV2(*prm.addr.GetObjectID())
 
 	switch v := resp.GetBody().GetHeaderPart().(type) {
 	default:
 		return nil, fmt.Errorf("unexpected header type %T", v)
 	case *v2object.SplitInfo:
 		return nil, object.NewSplitInfoError(object.NewSplitInfoFromV2(v))
-	case *v2object.ECInfo:
-		return nil, object.NewECInfoError(object.NewECInfoFromV2(v))
 	case *v2object.HeaderWithSignature:
 		res.hdr = v
 	}
@@ -514,95 +474,29 @@ func (c *Client) ObjectHead(ctx context.Context, prm PrmObjectHead) (*ResObjectH
 
 // PrmObjectRange groups parameters of ObjectRange operation.
 type PrmObjectRange struct {
-	XHeaders []string
+	prmObjectRead
 
-	BearerToken *bearer.Token
+	key *ecdsa.PrivateKey
 
-	Session *session.Object
+	rng v2object.Range
-
-	Raw bool
-
-	Local bool
-
-	ContainerID *cid.ID
-
-	ObjectID *oid.ID
-
-	Key *ecdsa.PrivateKey
-
-	Offset uint64
-
-	Length uint64
 }
 
-func (prm *PrmObjectRange) buildRequest(c *Client) (*v2object.GetRangeRequest, error) {
+// SetOffset sets offset of the payload range to be read.
-	if prm.Length == 0 {
+// Zero by default.
-		return nil, errorZeroRangeLength
+func (x *PrmObjectRange) SetOffset(off uint64) {
-	}
+	x.rng.SetOffset(off)
+}
 
-	if prm.ContainerID == nil {
+// SetLength sets length of the payload range to be read.
-		return nil, errorMissingContainer
+// Must be positive.
-	}
+func (x *PrmObjectRange) SetLength(ln uint64) {
-
+	x.rng.SetLength(ln)
-	if prm.ObjectID == nil {
-		return nil, errorMissingObject
-	}
-
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	if prm.Local {
-		meta.SetTTL(1)
-	}
-
-	addr := new(v2refs.Address)
-
-	cnrV2 := new(v2refs.ContainerID)
-	prm.ContainerID.WriteToV2(cnrV2)
-	addr.SetContainerID(cnrV2)
-
-	objV2 := new(v2refs.ObjectID)
-	prm.ObjectID.WriteToV2(objV2)
-	addr.SetObjectID(objV2)
-
-	rng := new(v2object.Range)
-	rng.SetLength(prm.Length)
-	rng.SetOffset(prm.Offset)
-
-	body := new(v2object.GetRangeRequestBody)
-	body.SetRaw(prm.Raw)
-	body.SetAddress(addr)
-	body.SetRange(rng)
-
-	req := new(v2object.GetRangeRequest)
-	req.SetBody(body)
-	c.prepareRequest(req, meta)
-
-	return req, nil
 }
 
 // UseKey specifies private key to sign the requests.
 // If key is not provided, then Client default key is used.
-//
+func (x *PrmObjectRange) UseKey(key ecdsa.PrivateKey) {
-// Deprecated: Use PrmObjectRange.Key instead.
+	x.key = &key
-func (prm *PrmObjectRange) UseKey(key ecdsa.PrivateKey) {
-	prm.Key = &key
 }
 
 // ResObjectRange groups the final result values of ObjectRange operation.
@@ -668,9 +562,6 @@ func (x *ObjectRangeReader) readChunk(buf []byte) (int, bool) {
 		case *v2object.SplitInfo:
 			x.err = object.NewSplitInfoError(object.NewSplitInfoFromV2(v))
 			return read, false
-		case *v2object.ECInfo:
-			x.err = object.NewECInfoError(object.NewECInfoFromV2(v))
-			return read, false
 		case *v2object.GetRangePartChunk:
 			partChunk = v
 		}
@@ -731,7 +622,6 @@ func (x *ObjectRangeReader) close(ignoreEOF bool) (*ResObjectRange, error) {
 // Return errors:
 //
 //	*object.SplitInfoError (returned on virtual objects with PrmObjectRange.MakeRaw).
-//	*object.ECInfoError (returned on erasure-coded objects with PrmObjectRange.MakeRaw).
 //
 // Return statuses:
 //   - global (see Client docs);
@@ -776,31 +666,51 @@ func (x *ObjectRangeReader) Read(p []byte) (int, error) {
 // Returns an error if parameters are set incorrectly (see PrmObjectRange docs).
 // Context is required and must not be nil. It is used for network communication.
 func (c *Client) ObjectRangeInit(ctx context.Context, prm PrmObjectRange) (*ObjectRangeReader, error) {
-	req, err := prm.buildRequest(c)
+	// check parameters
-	if err != nil {
+	switch {
-		return nil, err
+	case ctx == nil:
+		return nil, errorMissingContext
+	case prm.addr.GetContainerID() == nil:
+		return nil, errorMissingContainer
+	case prm.addr.GetObjectID() == nil:
+		return nil, errorMissingObject
+	case prm.rng.GetLength() == 0:
+		return nil, errorZeroRangeLength
 	}
 
-	key := prm.Key
+	// form request body
+	var body v2object.GetRangeRequestBody
+
+	body.SetRaw(prm.raw)
+	body.SetAddress(&prm.addr)
+	body.SetRange(&prm.rng)
+
+	// form request
+	var req v2object.GetRangeRequest
+
+	req.SetBody(&body)
+	c.prepareRequest(&req, &prm.meta)
+
+	key := prm.key
 	if key == nil {
-		key = &c.prm.Key
+		key = &c.prm.key
 	}
 
-	err = signature.SignServiceMessage(key, req)
+	err := signature.SignServiceMessage(key, &req)
 	if err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
 
 	ctx, cancel := context.WithCancel(ctx)
 
-	stream, err := rpcapi.GetObjectRange(&c.c, req, client.WithContext(ctx))
+	stream, err := rpcapi.GetObjectRange(&c.c, &req, client.WithContext(ctx))
 	if err != nil {
 		cancel()
 		return nil, fmt.Errorf("open stream: %w", err)
 	}
 
 	var r ObjectRangeReader
-	r.remainingPayloadLen = int(prm.Length)
+	r.remainingPayloadLen = int(prm.rng.GetLength())
 	r.cancelCtxStream = cancel
 	r.stream = stream
 	r.client = c

client/object_hash.go

@@ -5,61 +5,129 @@ import (
 	"crypto/ecdsa"
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/acl"
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
+	v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	v2refs "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	v2refs "github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
+	"github.com/TrueCloudLab/frostfs-sdk-go/bearer"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	"github.com/TrueCloudLab/frostfs-sdk-go/session"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
 )
 
 // PrmObjectHash groups parameters of ObjectHash operation.
 type PrmObjectHash struct {
-	XHeaders []string
+	meta v2session.RequestMetaHeader
 
-	BearerToken *bearer.Token
+	body v2object.GetRangeHashRequestBody
 
-	Session *session.Object
+	csAlgo v2refs.ChecksumType
 
-	Local bool
+	addr v2refs.Address
 
-	Ranges []object.Range
+	keySet bool
-
+	key    ecdsa.PrivateKey
-	Salt []byte
-
-	ChecksumType checksum.Type
-
-	ContainerID *cid.ID
-
-	ObjectID *oid.ID
-
-	Key *ecdsa.PrivateKey
 }
 
 // UseKey specifies private key to sign the requests.
 // If key is not provided, then Client default key is used.
+func (x *PrmObjectHash) UseKey(key ecdsa.PrivateKey) {
+	x.keySet = true
+	x.key = key
+}
+
+// MarkLocal tells the server to execute the operation locally.
+func (x *PrmObjectHash) MarkLocal() {
+	x.meta.SetTTL(1)
+}
+
+// WithinSession specifies session within which object should be read.
 //
-// Deprecated: Use PrmObjectHash.Key instead.
+// Creator of the session acquires the authorship of the request.
-func (prm *PrmObjectHash) UseKey(key ecdsa.PrivateKey) {
+// This may affect the execution of an operation (e.g. access control).
-	prm.Key = &key
+//
+// Must be signed.
+func (x *PrmObjectHash) WithinSession(t session.Object) {
+	var tv2 v2session.Token
+	t.WriteToV2(&tv2)
+
+	x.meta.SetSessionToken(&tv2)
+}
+
+// WithBearerToken attaches bearer token to be used for the operation.
+//
+// If set, underlying eACL rules will be used in access control.
+//
+// Must be signed.
+func (x *PrmObjectHash) WithBearerToken(t bearer.Token) {
+	var v2token acl.BearerToken
+	t.WriteToV2(&v2token)
+	x.meta.SetBearerToken(&v2token)
+}
+
+// FromContainer specifies FrostFS container of the object.
+// Required parameter.
+func (x *PrmObjectHash) FromContainer(id cid.ID) {
+	var cidV2 v2refs.ContainerID
+	id.WriteToV2(&cidV2)
+
+	x.addr.SetContainerID(&cidV2)
+}
+
+// ByID specifies identifier of the requested object.
+// Required parameter.
+func (x *PrmObjectHash) ByID(id oid.ID) {
+	var idV2 v2refs.ObjectID
+	id.WriteToV2(&idV2)
+
+	x.addr.SetObjectID(&idV2)
+}
+
+// SetRangeList sets list of ranges in (offset, length) pair format.
+// Required parameter.
+//
+// If passed as slice, then it must not be mutated before the operation completes.
+func (x *PrmObjectHash) SetRangeList(r ...uint64) {
+	ln := len(r)
+	if ln%2 != 0 {
+		panic("odd number of range parameters")
+	}
+
+	rs := make([]v2object.Range, ln/2)
+
+	for i := 0; i < ln/2; i++ {
+		rs[i].SetOffset(r[2*i])
+		rs[i].SetLength(r[2*i+1])
+	}
+
+	x.body.SetRanges(rs)
 }
 
 // TillichZemorAlgo changes the hash function to Tillich-Zemor
 // (https://link.springer.com/content/pdf/10.1007/3-540-48658-5_5.pdf).
 //
-// By default, SHA256 hash function is used/.
+// By default, SHA256 hash function is used.
+func (x *PrmObjectHash) TillichZemorAlgo() {
+	x.csAlgo = v2refs.TillichZemor
+}
+
+// UseSalt sets the salt to XOR the data range before hashing.
 //
-// Deprecated: Use PrmObjectHash.ChecksumType instead.
+// Must not be mutated before the operation completes.
-func (prm *PrmObjectHash) TillichZemorAlgo() {
+func (x *PrmObjectHash) UseSalt(salt []byte) {
-	prm.ChecksumType = checksum.TZ
+	x.body.SetSalt(salt)
+}
+
+// WithXHeaders specifies list of extended headers (string key-value pairs)
+// to be attached to the request. Must have an even length.
+//
+// Slice must not be mutated until the operation completes.
+func (x *PrmObjectHash) WithXHeaders(hs ...string) {
+	writeXHeadersToMeta(hs, &x.meta)
 }
 
 // ResObjectHash groups resulting values of ObjectHash operation.
@@ -74,76 +142,6 @@ func (x ResObjectHash) Checksums() [][]byte {
 	return x.checksums
 }
 
-func (prm *PrmObjectHash) buildRequest(c *Client) (*v2object.GetRangeHashRequest, error) {
-	if prm.ContainerID == nil {
-		return nil, errorMissingContainer
-	}
-
-	if prm.ObjectID == nil {
-		return nil, errorMissingObject
-	}
-
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	if len(prm.Ranges) == 0 {
-		return nil, errorMissingRanges
-	}
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	if prm.Local {
-		meta.SetTTL(1)
-	}
-
-	addr := new(v2refs.Address)
-
-	cnrV2 := new(v2refs.ContainerID)
-	prm.ContainerID.WriteToV2(cnrV2)
-	addr.SetContainerID(cnrV2)
-
-	objV2 := new(v2refs.ObjectID)
-	prm.ObjectID.WriteToV2(objV2)
-	addr.SetObjectID(objV2)
-
-	rs := make([]v2object.Range, len(prm.Ranges))
-	for i := range prm.Ranges {
-		rs[i].SetOffset(prm.Ranges[i].GetOffset())
-		rs[i].SetLength(prm.Ranges[i].GetLength())
-	}
-
-	body := new(v2object.GetRangeHashRequestBody)
-	body.SetAddress(addr)
-	body.SetRanges(rs)
-	body.SetSalt(prm.Salt)
-
-	if prm.ChecksumType == checksum.Unknown {
-		body.SetType(v2refs.SHA256)
-	} else {
-		body.SetType(v2refs.ChecksumType(prm.ChecksumType))
-	}
-
-	req := new(v2object.GetRangeHashRequest)
-	req.SetBody(body)
-	c.prepareRequest(req, meta)
-
-	return req, nil
-}
-
 // ObjectHash requests checksum of the range list of the object payload using
 // FrostFS API protocol.
 //
@@ -152,9 +150,9 @@ func (prm *PrmObjectHash) buildRequest(c *Client) (*v2object.GetRangeHashRequest
 //
 // Exactly one return value is non-nil. By default, server status is returned in res structure.
 // Any client's internal or transport errors are returned as `error`,
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly (see PrmObjectHash docs).
 // Context is required and must not be nil. It is used for network communication.
@@ -167,30 +165,51 @@ func (prm *PrmObjectHash) buildRequest(c *Client) (*v2object.GetRangeHashRequest
 //   - *apistatus.ObjectOutOfRange;
 //   - *apistatus.SessionTokenExpired.
 func (c *Client) ObjectHash(ctx context.Context, prm PrmObjectHash) (*ResObjectHash, error) {
-	req, err := prm.buildRequest(c)
+	switch {
-	if err != nil {
+	case ctx == nil:
-		return nil, err
+		return nil, errorMissingContext
+	case prm.addr.GetContainerID() == nil:
+		return nil, errorMissingContainer
+	case prm.addr.GetObjectID() == nil:
+		return nil, errorMissingObject
+	case len(prm.body.GetRanges()) == 0:
+		return nil, errorMissingRanges
 	}
 
-	key := c.prm.Key
+	prm.body.SetAddress(&prm.addr)
-	if prm.Key != nil {
+	if prm.csAlgo == v2refs.UnknownChecksum {
-		key = *prm.Key
+		prm.body.SetType(v2refs.SHA256)
+	} else {
+		prm.body.SetType(prm.csAlgo)
 	}
 
-	err = signature.SignServiceMessage(&key, req)
+	var req v2object.GetRangeHashRequest
+	c.prepareRequest(&req, &prm.meta)
+	req.SetBody(&prm.body)
+
+	key := c.prm.key
+	if prm.keySet {
+		key = prm.key
+	}
+
+	err := signature.SignServiceMessage(&key, &req)
 	if err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
 
-	resp, err := rpcapi.HashObjectRange(&c.c, req, client.WithContext(ctx))
+	resp, err := rpcapi.HashObjectRange(&c.c, &req, client.WithContext(ctx))
 	if err != nil {
 		return nil, fmt.Errorf("write request: %w", err)
 	}
 
 	var res ResObjectHash
 	res.st, err = c.processResponse(resp)
-	if err != nil || !apistatus.IsSuccessful(res.st) {
+	if err != nil {
-		return &res, err
+		return nil, err
+	}
+
+	if !apistatus.IsSuccessful(res.st) {
+		return &res, nil
 	}
 
 	res.checksums = resp.GetBody().GetHashList()

client/object_patch.go

@@ -1,266 +0,0 @@
-package client
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"errors"
-	"fmt"
-	"io"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
-)
-
-// ObjectPatcher is designed to patch an object.
-//
-// Must be initialized using Client.ObjectPatchInit, any other
-// usage is unsafe.
-type ObjectPatcher interface {
-	// PatchAttributes patches attributes. Attributes can be patched no more than once,
-	// otherwise, the server returns an error.
-	//
-	// Result means success. Failure reason can be received via Close.
-	PatchAttributes(ctx context.Context, newAttrs []object.Attribute, replace bool) bool
-
-	// PatchPayload patches the object's payload.
-	//
-	// PatchPayload receives `payloadReader` and thus the payload of the patch is read and sent by chunks of
-	// `MaxChunkLength` length.
-	//
-	// Result means success. Failure reason can be received via Close.
-	PatchPayload(ctx context.Context, rng *object.Range, payloadReader io.Reader) bool
-
-	// Close ends patching the object and returns the result of the operation
-	// along with the final results. Must be called after using the ObjectPatcher.
-	//
-	// Exactly one return value is non-nil. By default, server status is returned in res structure.
-	// Any client's internal or transport errors are returned as Go built-in error.
-	// If Client is tuned to resolve FrostFS API statuses, then FrostFS failures
-	// codes are returned as error.
-	//
-	// Return statuses:
-	//   - global (see Client docs);
-	//   - *apistatus.ContainerNotFound;
-	//   - *apistatus.ContainerAccessDenied;
-	//   - *apistatus.ObjectAccessDenied;
-	//   - *apistatus.ObjectAlreadyRemoved;
-	//   - *apistatus.ObjectLocked;
-	//   - *apistatus.ObjectOutOfRange;
-	//   - *apistatus.SessionTokenNotFound;
-	//   - *apistatus.SessionTokenExpired.
-	Close(_ context.Context) (*ResObjectPatch, error)
-}
-
-// ResObjectPatch groups resulting values of ObjectPatch operation.
-type ResObjectPatch struct {
-	statusRes
-
-	obj oid.ID
-}
-
-// ObjectID returns an object ID of the patched object.
-func (r ResObjectPatch) ObjectID() oid.ID {
-	return r.obj
-}
-
-// PrmObjectPatch groups parameters of ObjectPatch operation.
-type PrmObjectPatch struct {
-	XHeaders []string
-
-	Address oid.Address
-
-	BearerToken *bearer.Token
-
-	Session *session.Object
-
-	Key *ecdsa.PrivateKey
-
-	MaxChunkLength int
-}
-
-// ObjectPatchInit initializes object patcher.
-func (c *Client) ObjectPatchInit(ctx context.Context, prm PrmObjectPatch) (ObjectPatcher, error) {
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	var objectPatcher objectPatcher
-	stream, err := rpcapi.Patch(&c.c, &objectPatcher.respV2, client.WithContext(ctx))
-	if err != nil {
-		return nil, fmt.Errorf("open stream: %w", err)
-	}
-
-	objectPatcher.addr = prm.Address
-	objectPatcher.key = &c.prm.Key
-	if prm.Key != nil {
-		objectPatcher.key = prm.Key
-	}
-	objectPatcher.client = c
-	objectPatcher.stream = stream
-
-	if prm.MaxChunkLength > 0 {
-		objectPatcher.maxChunkLen = prm.MaxChunkLength
-	} else {
-		objectPatcher.maxChunkLen = defaultGRPCPayloadChunkLen
-	}
-
-	objectPatcher.req.SetBody(&v2object.PatchRequestBody{})
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	c.prepareRequest(&objectPatcher.req, meta)
-
-	return &objectPatcher, nil
-}
-
-type objectPatcher struct {
-	client *Client
-
-	stream interface {
-		Write(*v2object.PatchRequest) error
-		Close() error
-	}
-
-	key *ecdsa.PrivateKey
-	res ResObjectPatch
-	err error
-
-	addr oid.Address
-
-	req    v2object.PatchRequest
-	respV2 v2object.PatchResponse
-
-	maxChunkLen int
-}
-
-func (x *objectPatcher) PatchAttributes(_ context.Context, newAttrs []object.Attribute, replace bool) bool {
-	return x.patch(&object.Patch{
-		Address:           x.addr,
-		NewAttributes:     newAttrs,
-		ReplaceAttributes: replace,
-	})
-}
-
-func (x *objectPatcher) PatchPayload(_ context.Context, rng *object.Range, payloadReader io.Reader) bool {
-	offset := rng.GetOffset()
-
-	buf := make([]byte, x.maxChunkLen)
-
-	for patchIter := 0; ; patchIter++ {
-		n, err := payloadReader.Read(buf)
-		if err != nil && err != io.EOF {
-			x.err = fmt.Errorf("read payload: %w", err)
-			return false
-		}
-		if n == 0 {
-			if patchIter == 0 {
-				if rng.GetLength() == 0 {
-					x.err = errors.New("zero-length empty payload patch can't be applied")
-					return false
-				}
-				if !x.patch(&object.Patch{
-					Address: x.addr,
-					PayloadPatch: &object.PayloadPatch{
-						Range: rng,
-						Chunk: []byte{},
-					},
-				}) {
-					return false
-				}
-			}
-			break
-		}
-
-		rngPart := object.NewRange()
-		if patchIter == 0 {
-			rngPart.SetOffset(offset)
-			rngPart.SetLength(rng.GetLength())
-		} else {
-			rngPart.SetOffset(offset + rng.GetLength())
-		}
-
-		if !x.patch(&object.Patch{
-			Address: x.addr,
-			PayloadPatch: &object.PayloadPatch{
-				Range: rngPart,
-				Chunk: buf[:n],
-			},
-		}) {
-			return false
-		}
-
-		if err == io.EOF {
-			break
-		}
-	}
-
-	return true
-}
-
-func (x *objectPatcher) patch(patch *object.Patch) bool {
-	x.req.SetBody(patch.ToV2())
-	x.req.SetVerificationHeader(nil)
-
-	x.err = signature.SignServiceMessage(x.key, &x.req)
-	if x.err != nil {
-		x.err = fmt.Errorf("sign message: %w", x.err)
-		return false
-	}
-
-	x.err = x.stream.Write(&x.req)
-	return x.err == nil
-}
-
-func (x *objectPatcher) Close(_ context.Context) (*ResObjectPatch, error) {
-	// Ignore io.EOF error, because it is expected error for client-side
-	// stream termination by the server. E.g. when stream contains invalid
-	// message. Server returns an error in response message (in status).
-	if x.err != nil && !errors.Is(x.err, io.EOF) {
-		return nil, x.err
-	}
-
-	if x.err = x.stream.Close(); x.err != nil {
-		return nil, x.err
-	}
-
-	x.res.st, x.err = x.client.processResponse(&x.respV2)
-	if x.err != nil || !apistatus.IsSuccessful(x.res.st) {
-		return &x.res, x.err
-	}
-
-	const fieldID = "ID"
-
-	idV2 := x.respV2.Body.ObjectID
-	if idV2 == nil {
-		return nil, newErrMissingResponseField(fieldID)
-	}
-
-	x.err = x.res.obj.ReadFromV2(*idV2)
-	if x.err != nil {
-		x.err = newErrInvalidResponseField(fieldID, x.err)
-	}
-
-	return &x.res, nil
-}

client/object_patch_test.go

@@ -1,295 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"context"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"testing"
-
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
-	"github.com/stretchr/testify/require"
-)
-
-type mockPatchStream struct {
-	streamedPayloadPatches []*object.PayloadPatch
-}
-
-func (m *mockPatchStream) Write(r *v2object.PatchRequest) error {
-	pp := new(object.PayloadPatch)
-	pp.FromV2(r.GetBody().GetPatch())
-
-	if r.GetBody().GetPatch() != nil {
-		bodyChunk := r.GetBody().GetPatch().Chunk
-		pp.Chunk = make([]byte, len(bodyChunk))
-		copy(pp.Chunk, bodyChunk)
-	}
-
-	m.streamedPayloadPatches = append(m.streamedPayloadPatches, pp)
-
-	return nil
-}
-
-func (m *mockPatchStream) Close() error {
-	return nil
-}
-
-func TestObjectPatcher(t *testing.T) {
-	type part struct {
-		offset int
-		length int
-		chunk  string
-	}
-
-	for _, test := range []struct {
-		name         string
-		patchPayload string
-		rng          *object.Range
-		maxChunkLen  int
-		expectParts  []part
-	}{
-		{
-			name:         "no split payload patch",
-			patchPayload: "011111",
-			rng:          newRange(0, 6),
-			maxChunkLen:  defaultGRPCPayloadChunkLen,
-			expectParts: []part{
-				{
-					offset: 0,
-					length: 6,
-					chunk:  "011111",
-				},
-			},
-		},
-		{
-			name:         "splitted payload patch",
-			patchPayload: "012345",
-			rng:          newRange(0, 6),
-			maxChunkLen:  2,
-			expectParts: []part{
-				{
-					offset: 0,
-					length: 6,
-					chunk:  "01",
-				},
-				{
-					offset: 6,
-					length: 0,
-					chunk:  "23",
-				},
-				{
-					offset: 6,
-					length: 0,
-					chunk:  "45",
-				},
-			},
-		},
-		{
-			name:         "splitted payload patch with zero-length subpatches",
-			patchPayload: "0123456789!@",
-			rng:          newRange(0, 4),
-			maxChunkLen:  2,
-			expectParts: []part{
-				{
-					offset: 0,
-					length: 4,
-					chunk:  "01",
-				},
-				{
-					offset: 4,
-					length: 0,
-					chunk:  "23",
-				},
-				{
-					offset: 4,
-					length: 0,
-					chunk:  "45",
-				},
-				{
-					offset: 4,
-					length: 0,
-					chunk:  "67",
-				},
-				{
-					offset: 4,
-					length: 0,
-					chunk:  "89",
-				},
-				{
-					offset: 4,
-					length: 0,
-					chunk:  "!@",
-				},
-			},
-		},
-		{
-			name:         "splitted payload patch with zero-length subpatches only",
-			patchPayload: "0123456789!@",
-			rng:          newRange(0, 0),
-			maxChunkLen:  2,
-			expectParts: []part{
-				{
-					offset: 0,
-					length: 0,
-					chunk:  "01",
-				},
-				{
-					offset: 0,
-					length: 0,
-					chunk:  "23",
-				},
-				{
-					offset: 0,
-					length: 0,
-					chunk:  "45",
-				},
-				{
-					offset: 0,
-					length: 0,
-					chunk:  "67",
-				},
-				{
-					offset: 0,
-					length: 0,
-					chunk:  "89",
-				},
-				{
-					offset: 0,
-					length: 0,
-					chunk:  "!@",
-				},
-			},
-		},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			m := &mockPatchStream{}
-
-			pk, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-
-			patcher := objectPatcher{
-				client:      &Client{},
-				stream:      m,
-				addr:        oidtest.Address(),
-				key:         pk,
-				maxChunkLen: test.maxChunkLen,
-			}
-
-			success := patcher.PatchAttributes(context.Background(), nil, false)
-			require.True(t, success)
-
-			success = patcher.PatchPayload(context.Background(), test.rng, bytes.NewReader([]byte(test.patchPayload)))
-			require.True(t, success)
-
-			require.Len(t, m.streamedPayloadPatches, len(test.expectParts)+1)
-
-			// m.streamedPayloadPatches[0] is attribute patch, so skip it
-			for i, part := range test.expectParts {
-				requireRangeChunk(t, m.streamedPayloadPatches[i+1], part.offset, part.length, part.chunk)
-			}
-		})
-	}
-}
-
-func TestRepeatPayloadPatch(t *testing.T) {
-	t.Run("no payload patch partioning", func(t *testing.T) {
-		m := &mockPatchStream{}
-
-		pk, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-
-		const maxChunkLen = 20
-
-		patcher := objectPatcher{
-			client:      &Client{},
-			stream:      m,
-			addr:        oidtest.Address(),
-			key:         pk,
-			maxChunkLen: maxChunkLen,
-		}
-
-		for _, pp := range []struct {
-			patchPayload string
-			rng          *object.Range
-		}{
-			{
-				patchPayload: "xxxxxxxxxx",
-				rng:          newRange(1, 6),
-			},
-			{
-				patchPayload: "yyyyyyyyyy",
-				rng:          newRange(5, 9),
-			},
-			{
-				patchPayload: "zzzzzzzzzz",
-				rng:          newRange(10, 0),
-			},
-		} {
-			success := patcher.PatchPayload(context.Background(), pp.rng, bytes.NewReader([]byte(pp.patchPayload)))
-			require.True(t, success)
-		}
-
-		requireRangeChunk(t, m.streamedPayloadPatches[0], 1, 6, "xxxxxxxxxx")
-		requireRangeChunk(t, m.streamedPayloadPatches[1], 5, 9, "yyyyyyyyyy")
-		requireRangeChunk(t, m.streamedPayloadPatches[2], 10, 0, "zzzzzzzzzz")
-	})
-
-	t.Run("payload patch partioning", func(t *testing.T) {
-		m := &mockPatchStream{}
-
-		pk, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-
-		const maxChunkLen = 5
-
-		patcher := objectPatcher{
-			client:      &Client{},
-			stream:      m,
-			addr:        oidtest.Address(),
-			key:         pk,
-			maxChunkLen: maxChunkLen,
-		}
-
-		for _, pp := range []struct {
-			patchPayload string
-			rng          *object.Range
-		}{
-			{
-				patchPayload: "xxxxxxxxxx",
-				rng:          newRange(1, 6),
-			},
-			{
-				patchPayload: "yyyyyyyyyy",
-				rng:          newRange(5, 9),
-			},
-			{
-				patchPayload: "zzzzzzzzzz",
-				rng:          newRange(10, 0),
-			},
-		} {
-			success := patcher.PatchPayload(context.Background(), pp.rng, bytes.NewReader([]byte(pp.patchPayload)))
-			require.True(t, success)
-		}
-
-		requireRangeChunk(t, m.streamedPayloadPatches[0], 1, 6, "xxxxx")
-		requireRangeChunk(t, m.streamedPayloadPatches[1], 7, 0, "xxxxx")
-		requireRangeChunk(t, m.streamedPayloadPatches[2], 5, 9, "yyyyy")
-		requireRangeChunk(t, m.streamedPayloadPatches[3], 14, 0, "yyyyy")
-		requireRangeChunk(t, m.streamedPayloadPatches[4], 10, 0, "zzzzz")
-		requireRangeChunk(t, m.streamedPayloadPatches[5], 10, 0, "zzzzz")
-	})
-}
-
-func requireRangeChunk(t *testing.T, pp *object.PayloadPatch, offset, length int, chunk string) {
-	require.NotNil(t, pp)
-	require.Equal(t, uint64(offset), pp.Range.GetOffset())
-	require.Equal(t, uint64(length), pp.Range.GetLength())
-	require.Equal(t, []byte(chunk), pp.Chunk)
-}
-
-func newRange(offest, length uint64) *object.Range {
-	rng := &object.Range{}
-	rng.SetOffset(offest)
-	rng.SetLength(length)
-	return rng
-}

client/object_put.go

@@ -3,77 +3,40 @@ package client
 import (
 	"context"
 	"crypto/ecdsa"
+	"errors"
+	"fmt"
+	"io"
 
-	buffPool "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/pool"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/acl"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
+	v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/transformer"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-sdk-go/bearer"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
+	"github.com/TrueCloudLab/frostfs-sdk-go/object"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
+	"github.com/TrueCloudLab/frostfs-sdk-go/session"
 )
 
-// defaultGRPCPayloadChunkLen default value for maxChunkLen.
-// See PrmObjectPutInit.SetGRPCPayloadChunkLen for details.
-const defaultGRPCPayloadChunkLen = 3 << 20
-
 // PrmObjectPutInit groups parameters of ObjectPutInit operation.
 type PrmObjectPutInit struct {
-	XHeaders []string
+	copyNum uint32
-
+	key     *ecdsa.PrivateKey
-	BearerToken *bearer.Token
+	meta    v2session.RequestMetaHeader
-
-	Session *session.Object
-
-	Local bool
-
-	CopiesNumber []uint32
-
-	MaxChunkLength int
-
-	MaxSize uint64
-
-	EpochSource transformer.EpochSource
-
-	WithoutHomomorphHash bool
-
-	Key *ecdsa.PrivateKey
-
-	Pool *buffPool.BufferPool
 }
 
 // SetCopiesNumber sets number of object copies that is enough to consider put successful.
-//
-// Deprecated: Use PrmObjectPutInit.CopiesNumber instead.
 func (x *PrmObjectPutInit) SetCopiesNumber(copiesNumber uint32) {
-	x.CopiesNumber = []uint32{copiesNumber}
+	x.copyNum = copiesNumber
-}
-
-// SetCopiesNumberByVectors sets ordered list of minimal required object copies numbers
-// per placement vector. List's length MUST equal container's placement vector number,
-// otherwise request will fail.
-//
-// Deprecated: Use PrmObjectPutInit.CopiesNumber instead.
-func (x *PrmObjectPutInit) SetCopiesNumberByVectors(copiesNumbers []uint32) {
-	x.CopiesNumber = copiesNumbers
-}
-
-// SetGRPCPayloadChunkLen sets maximum chunk length value for gRPC Put request.
-// Maximum chunk length restricts maximum byte length of the chunk
-// transmitted in a single stream message. It depends on
-// server settings and other message fields.
-// If not specified or negative value set, default value of 3MiB will be used.
-//
-// Deprecated: Use PrmObjectPutInit.MaxChunkLength instead.
-func (x *PrmObjectPutInit) SetGRPCPayloadChunkLen(v int) {
-	x.MaxChunkLength = v
 }
 
 // ResObjectPut groups the final result values of ObjectPutInit operation.
 type ResObjectPut struct {
 	statusRes
 
-	obj   oid.ID
+	obj oid.ID
-	epoch uint64
 }
 
 // StoredObjectID returns identifier of the saved object.
@@ -81,104 +44,190 @@ func (x ResObjectPut) StoredObjectID() oid.ID {
 	return x.obj
 }
 
-// StoredEpoch returns creation epoch of the saved object.
+// ObjectWriter is designed to write one object to FrostFS system.
-func (x ResObjectPut) StoredEpoch() uint64 {
-	return x.epoch
-}
-
-// ObjectWriter is designed to write one object or
-// multiple parts of one object to FrostFS system.
 //
 // Must be initialized using Client.ObjectPutInit, any other
 // usage is unsafe.
-type ObjectWriter interface {
+type ObjectWriter struct {
-	// WriteHeader writes header of the object. Result means success.
+	cancelCtxStream context.CancelFunc
-	// Failure reason can be received via Close.
+
-	WriteHeader(context.Context, object.Object) bool
+	client *Client
-	// WritePayloadChunk writes chunk of the object payload. Result means success.
+	stream interface {
-	// Failure reason can be received via Close.
+		Write(*v2object.PutRequest) error
-	WritePayloadChunk(context.Context, []byte) bool
+		Close() error
-	// Close ends writing the object and returns the result of the operation
+	}
-	// along with the final results. Must be called after using the ObjectWriter.
+
-	//
+	key *ecdsa.PrivateKey
-	// Exactly one return value is non-nil. By default, server status is returned in res structure.
+	res ResObjectPut
-	// Any client's internal or transport errors are returned as Go built-in error.
+	err error
-	// If Client is tuned to resolve FrostFS API statuses, then FrostFS failures
+
-	// codes are returned as error.
+	chunkCalled bool
-	//
+
-	// Return statuses:
+	respV2    v2object.PutResponse
-	//   - global (see Client docs);
+	req       v2object.PutRequest
-	//   - *apistatus.ContainerNotFound;
+	partInit  v2object.PutObjectPartInit
-	//   - *apistatus.ObjectAccessDenied;
+	partChunk v2object.PutObjectPartChunk
-	//   - *apistatus.ObjectLocked;
-	//   - *apistatus.LockNonRegularObject;
-	//   - *apistatus.SessionTokenNotFound;
-	//   - *apistatus.SessionTokenExpired.
-	Close(context.Context) (*ResObjectPut, error)
 }
 
 // UseKey specifies private key to sign the requests.
 // If key is not provided, then Client default key is used.
-//
-// Deprecated: Use PrmObjectPutInit.Key instead.
 func (x *PrmObjectPutInit) UseKey(key ecdsa.PrivateKey) {
-	x.Key = &key
+	x.key = &key
 }
 
 // WithBearerToken attaches bearer token to be used for the operation.
 // Should be called once before any writing steps.
-//
-// Deprecated: Use PrmObjectPutInit.BearerToken instead.
 func (x *PrmObjectPutInit) WithBearerToken(t bearer.Token) {
-	x.BearerToken = &t
+	var v2token acl.BearerToken
+	t.WriteToV2(&v2token)
+	x.meta.SetBearerToken(&v2token)
 }
 
 // WithinSession specifies session within which object should be stored.
 // Should be called once before any writing steps.
-//
-// Deprecated: Use PrmObjectPutInit.Session instead.
 func (x *PrmObjectPutInit) WithinSession(t session.Object) {
-	x.Session = &t
+	var tv2 v2session.Token
+	t.WriteToV2(&tv2)
+
+	x.meta.SetSessionToken(&tv2)
 }
 
 // MarkLocal tells the server to execute the operation locally.
-//
-// Deprecated: Use PrmObjectPutInit.Local instead.
 func (x *PrmObjectPutInit) MarkLocal() {
-	x.Local = true
+	x.meta.SetTTL(1)
 }
 
 // WithXHeaders specifies list of extended headers (string key-value pairs)
 // to be attached to the request. Must have an even length.
 //
 // Slice must not be mutated until the operation completes.
-//
-// Deprecated: Use PrmObjectPutInit.XHeaders instead.
 func (x *PrmObjectPutInit) WithXHeaders(hs ...string) {
-	x.XHeaders = hs
+	writeXHeadersToMeta(hs, &x.meta)
 }
 
-// WithObjectMaxSize specifies max object size value and use it during object splitting.
+// WriteHeader writes header of the object. Result means success.
-// When specified, start writing to the stream only after the object is formed.
+// Failure reason can be received via Close.
-// Continue processing the input only when the previous formed object has been successfully written.
+func (x *ObjectWriter) WriteHeader(hdr object.Object) bool {
-//
+	v2Hdr := hdr.ToV2()
-// Deprecated: Use PrmObjectPutInit.MaxSize instead.
+
-func (x *PrmObjectPutInit) WithObjectMaxSize(maxSize uint64) {
+	x.partInit.SetObjectID(v2Hdr.GetObjectID())
-	x.MaxSize = maxSize
+	x.partInit.SetHeader(v2Hdr.GetHeader())
+	x.partInit.SetSignature(v2Hdr.GetSignature())
+
+	x.req.GetBody().SetObjectPart(&x.partInit)
+	x.req.SetVerificationHeader(nil)
+
+	x.err = signature.SignServiceMessage(x.key, &x.req)
+	if x.err != nil {
+		x.err = fmt.Errorf("sign message: %w", x.err)
+		return false
+	}
+
+	x.err = x.stream.Write(&x.req)
+	return x.err == nil
 }
 
-// WithoutHomomorphicHash if set to true do not use Tillich-Zémor hash for payload.
+// WritePayloadChunk writes chunk of the object payload. Result means success.
-//
+// Failure reason can be received via Close.
-// Deprecated: Use PrmObjectPutInit.WithoutHomomorphHash instead.
+func (x *ObjectWriter) WritePayloadChunk(chunk []byte) bool {
-func (x *PrmObjectPutInit) WithoutHomomorphicHash(v bool) {
+	if !x.chunkCalled {
-	x.WithoutHomomorphHash = v
+		x.chunkCalled = true
+		x.req.GetBody().SetObjectPart(&x.partChunk)
+	}
+
+	for ln := len(chunk); ln > 0; ln = len(chunk) {
+		// maxChunkLen restricts maximum byte length of the chunk
+		// transmitted in a single stream message. It depends on
+		// server settings and other message fields, but for now
+		// we simply assume that 3MB is large enough to reduce the
+		// number of messages, and not to exceed the limit
+		// (4MB by default for gRPC servers).
+		const maxChunkLen = 3 << 20
+		if ln > maxChunkLen {
+			ln = maxChunkLen
+		}
+
+		// we deal with size limit overflow above, but there is another case:
+		// what if method is called with "small" chunk many times? We write
+		// a message to the stream on each call. Alternatively, we could use buffering.
+		// In most cases, the chunk length does not vary between calls. Given this
+		// assumption, as well as the length of the payload from the header, it is
+		// possible to buffer the data of intermediate chunks, and send a message when
+		// the allocated buffer is filled, or when the last chunk is received.
+		// It is mentally assumed that allocating and filling the buffer is better than
+		// synchronous sending, but this needs to be tested.
+		x.partChunk.SetChunk(chunk[:ln])
+		x.req.SetVerificationHeader(nil)
+
+		x.err = signature.SignServiceMessage(x.key, &x.req)
+		if x.err != nil {
+			x.err = fmt.Errorf("sign message: %w", x.err)
+			return false
+		}
+
+		x.err = x.stream.Write(&x.req)
+		if x.err != nil {
+			return false
+		}
+
+		chunk = chunk[ln:]
+	}
+
+	return true
 }
 
-// WithEpochSource specifies epoch for object when split it on client side.
+// Close ends writing the object and returns the result of the operation
+// along with the final results. Must be called after using the ObjectWriter.
 //
-// Deprecated: Use PrmObjectPutInit.EpochSource instead.
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
-func (x *PrmObjectPutInit) WithEpochSource(es transformer.EpochSource) {
+// Any client's internal or transport errors are returned as Go built-in error.
-	x.EpochSource = es
+// If Client is tuned to resolve FrostFS API statuses, then FrostFS failures
+// codes are returned as error.
+//
+// Return statuses:
+//   - global (see Client docs);
+//   - *apistatus.ContainerNotFound;
+//   - *apistatus.ObjectAccessDenied;
+//   - *apistatus.ObjectLocked;
+//   - *apistatus.LockNonRegularObject;
+//   - *apistatus.SessionTokenNotFound;
+//   - *apistatus.SessionTokenExpired.
+func (x *ObjectWriter) Close() (*ResObjectPut, error) {
+	defer x.cancelCtxStream()
+
+	// Ignore io.EOF error, because it is expected error for client-side
+	// stream termination by the server. E.g. when stream contains invalid
+	// message. Server returns an error in response message (in status).
+	if x.err != nil && !errors.Is(x.err, io.EOF) {
+		return nil, x.err
+	}
+
+	if x.err = x.stream.Close(); x.err != nil {
+		return nil, x.err
+	}
+
+	x.res.st, x.err = x.client.processResponse(&x.respV2)
+	if x.err != nil {
+		return nil, x.err
+	}
+
+	if !apistatus.IsSuccessful(x.res.st) {
+		return &x.res, nil
+	}
+
+	const fieldID = "ID"
+
+	idV2 := x.respV2.GetBody().GetObjectID()
+	if idV2 == nil {
+		return nil, newErrMissingResponseField(fieldID)
+	}
+
+	x.err = x.res.obj.ReadFromV2(*idV2)
+	if x.err != nil {
+		x.err = newErrInvalidResponseField(fieldID, x.err)
+	}
+
+	return &x.res, nil
 }
 
 // ObjectPutInit initiates writing an object through a remote server using FrostFS API protocol.
@@ -188,9 +237,31 @@ func (x *PrmObjectPutInit) WithEpochSource(es transformer.EpochSource) {
 //
 // Returns an error if parameters are set incorrectly.
 // Context is required and must not be nil. It is used for network communication.
-func (c *Client) ObjectPutInit(ctx context.Context, prm PrmObjectPutInit) (ObjectWriter, error) {
+func (c *Client) ObjectPutInit(ctx context.Context, prm PrmObjectPutInit) (*ObjectWriter, error) {
-	if prm.MaxSize > 0 {
+	// check parameters
-		return c.objectPutInitTransformer(prm)
+	if ctx == nil {
+		return nil, errorMissingContext
 	}
-	return c.objectPutInitRaw(ctx, prm)
+
+	var w ObjectWriter
+
+	ctx, cancel := context.WithCancel(ctx)
+	stream, err := rpcapi.PutObject(&c.c, &w.respV2, client.WithContext(ctx))
+	if err != nil {
+		cancel()
+		return nil, fmt.Errorf("open stream: %w", err)
+	}
+
+	w.key = &c.prm.key
+	if prm.key != nil {
+		w.key = prm.key
+	}
+	w.cancelCtxStream = cancel
+	w.client = c
+	w.stream = stream
+	w.partInit.SetCopiesNumber(prm.copyNum)
+	w.req.SetBody(new(v2object.PutRequestBody))
+	c.prepareRequest(&w.req, &prm.meta)
+
+	return &w, nil
 }

client/object_put_raw.go

@@ -1,177 +0,0 @@
-package client
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"errors"
-	"fmt"
-	"io"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-)
-
-func (c *Client) objectPutInitRaw(ctx context.Context, prm PrmObjectPutInit) (*objectWriterRaw, error) {
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	var w objectWriterRaw
-	stream, err := rpcapi.PutObject(&c.c, &w.respV2, client.WithContext(ctx))
-	if err != nil {
-		return nil, fmt.Errorf("open stream: %w", err)
-	}
-
-	w.key = &c.prm.Key
-	if prm.Key != nil {
-		w.key = prm.Key
-	}
-	w.client = c
-	w.stream = stream
-	w.partInit.SetCopiesNumber(prm.CopiesNumber)
-	w.req.SetBody(new(v2object.PutRequestBody))
-	if prm.MaxChunkLength > 0 {
-		w.maxChunkLen = prm.MaxChunkLength
-	} else {
-		w.maxChunkLen = defaultGRPCPayloadChunkLen
-	}
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	if prm.Local {
-		meta.SetTTL(1)
-	}
-
-	c.prepareRequest(&w.req, meta)
-	return &w, nil
-}
-
-type objectWriterRaw struct {
-	client *Client
-	stream interface {
-		Write(*v2object.PutRequest) error
-		Close() error
-	}
-
-	key         *ecdsa.PrivateKey
-	res         ResObjectPut
-	err         error
-	chunkCalled bool
-	respV2      v2object.PutResponse
-	req         v2object.PutRequest
-	partInit    v2object.PutObjectPartInit
-	partChunk   v2object.PutObjectPartChunk
-	maxChunkLen int
-}
-
-func (x *objectWriterRaw) WriteHeader(_ context.Context, hdr object.Object) bool {
-	v2Hdr := hdr.ToV2()
-
-	x.partInit.SetObjectID(v2Hdr.GetObjectID())
-	x.partInit.SetHeader(v2Hdr.GetHeader())
-	x.partInit.SetSignature(v2Hdr.GetSignature())
-
-	x.req.GetBody().SetObjectPart(&x.partInit)
-	x.req.SetVerificationHeader(nil)
-
-	x.err = signature.SignServiceMessage(x.key, &x.req)
-	if x.err != nil {
-		x.err = fmt.Errorf("sign message: %w", x.err)
-		return false
-	}
-
-	x.err = x.stream.Write(&x.req)
-	return x.err == nil
-}
-
-func (x *objectWriterRaw) WritePayloadChunk(_ context.Context, chunk []byte) bool {
-	if !x.chunkCalled {
-		x.chunkCalled = true
-		x.req.GetBody().SetObjectPart(&x.partChunk)
-	}
-
-	for ln := len(chunk); ln > 0; ln = len(chunk) {
-		if ln > x.maxChunkLen {
-			ln = x.maxChunkLen
-		}
-
-		// we deal with size limit overflow above, but there is another case:
-		// what if method is called with "small" chunk many times? We write
-		// a message to the stream on each call. Alternatively, we could use buffering.
-		// In most cases, the chunk length does not vary between calls. Given this
-		// assumption, as well as the length of the payload from the header, it is
-		// possible to buffer the data of intermediate chunks, and send a message when
-		// the allocated buffer is filled, or when the last chunk is received.
-		// It is mentally assumed that allocating and filling the buffer is better than
-		// synchronous sending, but this needs to be tested.
-		x.partChunk.SetChunk(chunk[:ln])
-		x.req.SetVerificationHeader(nil)
-
-		x.err = signature.SignServiceMessage(x.key, &x.req)
-		if x.err != nil {
-			x.err = fmt.Errorf("sign message: %w", x.err)
-			return false
-		}
-
-		x.err = x.stream.Write(&x.req)
-		if x.err != nil {
-			return false
-		}
-
-		chunk = chunk[ln:]
-	}
-
-	return true
-}
-
-func (x *objectWriterRaw) Close(_ context.Context) (*ResObjectPut, error) {
-	// Ignore io.EOF error, because it is expected error for client-side
-	// stream termination by the server. E.g. when stream contains invalid
-	// message. Server returns an error in response message (in status).
-	if x.err != nil && !errors.Is(x.err, io.EOF) {
-		return nil, x.err
-	}
-
-	if x.err = x.stream.Close(); x.err != nil {
-		return nil, x.err
-	}
-
-	x.res.st, x.err = x.client.processResponse(&x.respV2)
-	if x.err != nil || !apistatus.IsSuccessful(x.res.st) {
-		return &x.res, x.err
-	}
-
-	const fieldID = "ID"
-
-	idV2 := x.respV2.GetBody().GetObjectID()
-	if idV2 == nil {
-		return nil, newErrMissingResponseField(fieldID)
-	}
-
-	x.err = x.res.obj.ReadFromV2(*idV2)
-	if x.err != nil {
-		x.err = newErrInvalidResponseField(fieldID, x.err)
-	}
-	x.res.epoch = x.respV2.GetMetaHeader().GetEpoch()
-
-	return &x.res, nil
-}

client/object_put_single.go

@@ -1,175 +0,0 @@
-package client
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"fmt"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
-)
-
-// PrmObjectPutSingle groups parameters of PutSingle operation.
-type PrmObjectPutSingle struct {
-	XHeaders []string
-
-	BearerToken *bearer.Token
-
-	Session *session.Object
-
-	Local bool
-
-	CopiesNumber []uint32
-
-	Object *object.Object
-
-	Key *ecdsa.PrivateKey
-}
-
-// SetCopiesNumber sets ordered list of minimal required object copies numbers
-// per placement vector. List's length MUST equal container's placement vector number,
-// otherwise request will fail.
-//
-// Deprecated: Use PrmObjectPutSingle.CopiesNumber instead.
-func (prm *PrmObjectPutSingle) SetCopiesNumber(v []uint32) {
-	prm.CopiesNumber = v
-}
-
-// UseKey specifies private key to sign the requests.
-// If key is not provided, then Client default key is used.
-//
-// Deprecated: Use PrmObjectPutSingle.Key instead.
-func (prm *PrmObjectPutSingle) UseKey(key *ecdsa.PrivateKey) {
-	prm.Key = key
-}
-
-// WithBearerToken attaches bearer token to be used for the operation.
-// Should be called once before any writing steps.
-//
-// Deprecated: Use PrmObjectPutSingle.BearerToken instead.
-func (prm *PrmObjectPutSingle) WithBearerToken(t bearer.Token) {
-	prm.BearerToken = &t
-}
-
-// WithinSession specifies session within which object should be stored.
-// Should be called once before any writing steps.
-//
-// Deprecated: Use PrmObjectPutSingle.Session instead.
-func (prm *PrmObjectPutSingle) WithinSession(t session.Object) {
-	prm.Session = &t
-}
-
-// ExecuteLocal tells the server to execute the operation locally.
-//
-// Deprecated: Use PrmObjectPutSingle.Local instead.
-func (prm *PrmObjectPutSingle) ExecuteLocal() {
-	prm.Local = true
-}
-
-// WithXHeaders specifies list of extended headers (string key-value pairs)
-// to be attached to the request. Must have an even length.
-//
-// Slice must not be mutated until the operation completes.
-//
-// Deprecated: Use PrmObjectPutSingle.XHeaders instead.
-func (prm *PrmObjectPutSingle) WithXHeaders(hs ...string) {
-	prm.XHeaders = hs
-}
-
-// SetObject specifies prepared object to put.
-//
-// Deprecated: Use PrmObjectPutSingle.Object instead.
-func (prm *PrmObjectPutSingle) SetObject(o *v2object.Object) {
-	prm.Object = object.NewFromV2(o)
-}
-
-// ResObjectPutSingle groups resulting values of PutSingle operation.
-type ResObjectPutSingle struct {
-	statusRes
-
-	epoch uint64
-}
-
-// Epoch returns creation epoch of the saved object.
-func (r *ResObjectPutSingle) Epoch() uint64 {
-	return r.epoch
-}
-
-func (prm *PrmObjectPutSingle) buildRequest(c *Client) (*v2object.PutSingleRequest, error) {
-	if len(prm.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	body := new(v2object.PutSingleRequestBody)
-	body.SetCopiesNumber(prm.CopiesNumber)
-	body.SetObject(prm.Object.ToV2())
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(prm.XHeaders, meta)
-
-	if prm.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		prm.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if prm.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		prm.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	if prm.Local {
-		meta.SetTTL(1)
-	}
-
-	req := &v2object.PutSingleRequest{}
-	req.SetBody(body)
-	c.prepareRequest(req, meta)
-
-	return req, nil
-}
-
-// ObjectPutSingle writes prepared object to FrostFS.
-// Object must have payload, also containerID, objectID, ownerID, payload hash, payload length of an object must be set.
-// Exactly one return value is non-nil. By default, server status is returned in res structure.
-// Any client's internal or transport errors are returned as Go built-in error.
-// If Client is tuned to resolve FrostFS API statuses, then FrostFS failures
-// codes are returned as error.
-func (c *Client) ObjectPutSingle(ctx context.Context, prm PrmObjectPutSingle) (*ResObjectPutSingle, error) {
-	req, err := prm.buildRequest(c)
-	if err != nil {
-		return nil, err
-	}
-
-	key := &c.prm.Key
-	if prm.Key != nil {
-		key = prm.Key
-	}
-
-	err = signature.SignServiceMessage(key, req)
-	if err != nil {
-		return nil, fmt.Errorf("sign request: %w", err)
-	}
-
-	resp, err := rpcapi.PutSingleObject(&c.c, req, client.WithContext(ctx))
-	if err != nil {
-		return nil, err
-	}
-
-	var res ResObjectPutSingle
-	res.st, err = c.processResponse(resp)
-	if err != nil {
-		return &res, err
-	}
-	res.epoch = resp.GetMetaHeader().GetEpoch()
-
-	return &res, nil
-}

client/object_put_transformer.go

@@ -1,144 +0,0 @@
-package client
-
-import (
-	"context"
-
-	buffPool "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/util/pool"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/transformer"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-func (c *Client) objectPutInitTransformer(prm PrmObjectPutInit) (*objectWriterTransformer, error) {
-	var w objectWriterTransformer
-	w.it = internalTarget{
-		client: c,
-		prm:    prm,
-	}
-	key := &c.prm.Key
-	if prm.Key != nil {
-		key = prm.Key
-	}
-	w.ot = transformer.NewPayloadSizeLimiter(transformer.Params{
-		Key:                    key,
-		NextTargetInit:         func() transformer.ObjectWriter { return &w.it },
-		MaxSize:                prm.MaxSize,
-		WithoutHomomorphicHash: prm.WithoutHomomorphHash,
-		NetworkState:           prm.EpochSource,
-		Pool:                   prm.Pool,
-	})
-	return &w, nil
-}
-
-type objectWriterTransformer struct {
-	ot  transformer.ChunkedObjectWriter
-	it  internalTarget
-	err error
-}
-
-func (x *objectWriterTransformer) WriteHeader(ctx context.Context, hdr object.Object) bool {
-	x.err = x.ot.WriteHeader(ctx, &hdr)
-	return x.err == nil
-}
-
-func (x *objectWriterTransformer) WritePayloadChunk(ctx context.Context, chunk []byte) bool {
-	_, x.err = x.ot.Write(ctx, chunk)
-	return x.err == nil
-}
-
-func (x *objectWriterTransformer) Close(ctx context.Context) (*ResObjectPut, error) {
-	if x.err != nil {
-		return nil, x.err
-	}
-
-	ai, err := x.ot.Close(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	if ai != nil {
-		x.it.res.epoch = ai.Epoch
-		if ai.ParentID != nil {
-			x.it.res.obj = *ai.ParentID
-		}
-	}
-	return x.it.res, nil
-}
-
-type internalTarget struct {
-	client    *Client
-	res       *ResObjectPut
-	prm       PrmObjectPutInit
-	useStream bool
-}
-
-func (it *internalTarget) WriteObject(ctx context.Context, o *object.Object) error {
-	putSingleImplemented, err := it.tryPutSingle(ctx, o)
-	if putSingleImplemented {
-		return err
-	}
-	it.useStream = true
-	return it.putAsStream(ctx, o)
-}
-
-func (it *internalTarget) putAsStream(ctx context.Context, o *object.Object) error {
-	wrt, err := it.client.objectPutInitRaw(ctx, it.prm)
-	if err != nil {
-		return err
-	}
-	if wrt.WriteHeader(ctx, *o) {
-		wrt.WritePayloadChunk(ctx, o.Payload())
-	}
-	it.res, err = wrt.Close(ctx)
-	if err == nil && it.client.prm.DisableFrostFSErrorResolution && !apistatus.IsSuccessful(it.res.st) {
-		err = apistatus.ErrFromStatus(it.res.st)
-	}
-	return err
-}
-
-func (it *internalTarget) tryPutSingle(ctx context.Context, o *object.Object) (bool, error) {
-	if it.useStream {
-		return false, nil
-	}
-
-	prm := PrmObjectPutSingle{
-		XHeaders:     it.prm.XHeaders,
-		BearerToken:  it.prm.BearerToken,
-		Session:      it.prm.Session,
-		Local:        it.prm.Local,
-		CopiesNumber: it.prm.CopiesNumber,
-		Object:       o,
-		Key:          it.prm.Key,
-	}
-
-	res, err := it.client.ObjectPutSingle(ctx, prm)
-	if err != nil && status.Code(err) == codes.Unimplemented {
-		return false, err
-	}
-
-	if err == nil {
-		it.returnBuffPool(o.Payload())
-		id, _ := o.ID()
-		it.res = &ResObjectPut{
-			statusRes: res.statusRes,
-			obj:       id,
-			epoch:     res.epoch,
-		}
-		if it.client.prm.DisableFrostFSErrorResolution && !apistatus.IsSuccessful(it.res.st) {
-			return true, apistatus.ErrFromStatus(it.res.st)
-		}
-		return true, nil
-	}
-	return true, err
-}
-
-func (it *internalTarget) returnBuffPool(playback []byte) {
-	if it.prm.Pool == nil {
-		return
-	}
-	var buffer buffPool.Buffer
-	buffer.Data = playback
-	it.prm.Pool.Put(&buffer)
-}

client/object_search.go

@@ -7,43 +7,36 @@ import (
 	"fmt"
 	"io"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/acl"
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
+	v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	v2refs "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	v2refs "github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
+	"github.com/TrueCloudLab/frostfs-sdk-go/bearer"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
+	"github.com/TrueCloudLab/frostfs-sdk-go/object"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session"
+	"github.com/TrueCloudLab/frostfs-sdk-go/session"
 )
 
 // PrmObjectSearch groups parameters of ObjectSearch operation.
 type PrmObjectSearch struct {
-	XHeaders []string
+	meta v2session.RequestMetaHeader
 
-	Local bool
+	key *ecdsa.PrivateKey
 
-	BearerToken *bearer.Token
+	cnrSet bool
+	cnrID  cid.ID
 
-	Session *session.Object
+	filters object.SearchFilters
-
-	ContainerID *cid.ID
-
-	Key *ecdsa.PrivateKey
-
-	Filters object.SearchFilters
 }
 
 // MarkLocal tells the server to execute the operation locally.
-//
-// Deprecated: Use PrmObjectSearch.Local instead.
 func (x *PrmObjectSearch) MarkLocal() {
-	x.Local = true
+	x.meta.SetTTL(1)
 }
 
 // WithinSession specifies session within which the search query must be executed.
@@ -52,10 +45,10 @@ func (x *PrmObjectSearch) MarkLocal() {
 // This may affect the execution of an operation (e.g. access control).
 //
 // Must be signed.
-//
-// Deprecated: Use PrmObjectSearch.Session instead.
 func (x *PrmObjectSearch) WithinSession(t session.Object) {
-	x.Session = &t
+	var tokv2 v2session.Token
+	t.WriteToV2(&tokv2)
+	x.meta.SetSessionToken(&tokv2)
 }
 
 // WithBearerToken attaches bearer token to be used for the operation.
@@ -63,44 +56,37 @@ func (x *PrmObjectSearch) WithinSession(t session.Object) {
 // If set, underlying eACL rules will be used in access control.
 //
 // Must be signed.
-//
-// Deprecated: Use PrmObjectSearch.BearerToken instead.
 func (x *PrmObjectSearch) WithBearerToken(t bearer.Token) {
-	x.BearerToken = &t
+	var v2token acl.BearerToken
+	t.WriteToV2(&v2token)
+	x.meta.SetBearerToken(&v2token)
 }
 
 // WithXHeaders specifies list of extended headers (string key-value pairs)
 // to be attached to the request. Must have an even length.
 //
 // Slice must not be mutated until the operation completes.
-//
-// Deprecated: Use PrmObjectSearch.XHeaders instead.
 func (x *PrmObjectSearch) WithXHeaders(hs ...string) {
-	x.XHeaders = hs
+	writeXHeadersToMeta(hs, &x.meta)
 }
 
 // UseKey specifies private key to sign the requests.
 // If key is not provided, then Client default key is used.
-//
-// Deprecated: Use PrmObjectSearch.Key instead.
 func (x *PrmObjectSearch) UseKey(key ecdsa.PrivateKey) {
-	x.Key = &key
+	x.key = &key
 }
 
 // InContainer specifies the container in which to look for objects.
 // Required parameter.
-//
-// Deprecated: Use PrmObjectSearch.ContainerID instead.
 func (x *PrmObjectSearch) InContainer(id cid.ID) {
-	x.ContainerID = &id
+	x.cnrID = id
+	x.cnrSet = true
 }
 
 // SetFilters sets filters by which to select objects. All container objects
 // match unset/empty filters.
-//
-// Deprecated: Use PrmObjectSearch.Filters instead.
 func (x *PrmObjectSearch) SetFilters(filters object.SearchFilters) {
-	x.Filters = filters
+	x.filters = filters
 }
 
 // ResObjectSearch groups the final result values of ObjectSearch operation.
@@ -220,54 +206,12 @@ func (x *ObjectListReader) Close() (*ResObjectSearch, error) {
 	defer x.cancelCtxStream()
 
 	if x.err != nil && !errors.Is(x.err, io.EOF) {
-		return &x.res, x.err
+		return nil, x.err
 	}
 
 	return &x.res, nil
 }
 
-func (x *PrmObjectSearch) buildRequest(c *Client) (*v2object.SearchRequest, error) {
-	if x.ContainerID == nil {
-		return nil, errorMissingContainer
-	}
-
-	if len(x.XHeaders)%2 != 0 {
-		return nil, errorInvalidXHeaders
-	}
-
-	meta := new(v2session.RequestMetaHeader)
-	writeXHeadersToMeta(x.XHeaders, meta)
-
-	if x.BearerToken != nil {
-		v2BearerToken := new(acl.BearerToken)
-		x.BearerToken.WriteToV2(v2BearerToken)
-		meta.SetBearerToken(v2BearerToken)
-	}
-
-	if x.Session != nil {
-		v2SessionToken := new(v2session.Token)
-		x.Session.WriteToV2(v2SessionToken)
-		meta.SetSessionToken(v2SessionToken)
-	}
-
-	if x.Local {
-		meta.SetTTL(1)
-	}
-	cnrV2 := new(v2refs.ContainerID)
-	x.ContainerID.WriteToV2(cnrV2)
-
-	body := new(v2object.SearchRequestBody)
-	body.SetVersion(1)
-	body.SetContainerID(cnrV2)
-	body.SetFilters(x.Filters.ToV2())
-
-	req := new(v2object.SearchRequest)
-	req.SetBody(body)
-	c.prepareRequest(req, meta)
-
-	return req, nil
-}
-
 // ObjectSearchInit initiates object selection through a remote server using FrostFS API protocol.
 //
 // The call only opens the transmission channel, explicit fetching of matched objects
@@ -277,17 +221,33 @@ func (x *PrmObjectSearch) buildRequest(c *Client) (*v2object.SearchRequest, erro
 // Returns an error if parameters are set incorrectly (see PrmObjectSearch docs).
 // Context is required and must not be nil. It is used for network communication.
 func (c *Client) ObjectSearchInit(ctx context.Context, prm PrmObjectSearch) (*ObjectListReader, error) {
-	req, err := prm.buildRequest(c)
+	// check parameters
-	if err != nil {
+	switch {
-		return nil, err
+	case ctx == nil:
+		return nil, errorMissingContext
+	case !prm.cnrSet:
+		return nil, errorMissingContainer
 	}
 
-	key := prm.Key
+	var cidV2 v2refs.ContainerID
+	prm.cnrID.WriteToV2(&cidV2)
+
+	var body v2object.SearchRequestBody
+	body.SetVersion(1)
+	body.SetContainerID(&cidV2)
+	body.SetFilters(prm.filters.ToV2())
+
+	// init reader
+	var req v2object.SearchRequest
+	req.SetBody(&body)
+	c.prepareRequest(&req, &prm.meta)
+
+	key := prm.key
 	if key == nil {
-		key = &c.prm.Key
+		key = &c.prm.key
 	}
 
-	err = signature.SignServiceMessage(key, req)
+	err := signature.SignServiceMessage(key, &req)
 	if err != nil {
 		return nil, fmt.Errorf("sign request: %w", err)
 	}
@@ -295,7 +255,7 @@ func (c *Client) ObjectSearchInit(ctx context.Context, prm PrmObjectSearch) (*Ob
 	var r ObjectListReader
 	ctx, r.cancelCtxStream = context.WithCancel(ctx)
 
-	r.stream, err = rpcapi.SearchObjects(&c.c, req, client.WithContext(ctx))
+	r.stream, err = rpcapi.SearchObjects(&c.c, &req, client.WithContext(ctx))
 	if err != nil {
 		return nil, fmt.Errorf("open stream: %w", err)
 	}

client/object_search_test.go

@@ -7,11 +7,11 @@ import (
 	"io"
 	"testing"
 
-	v2object "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
+	v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	signatureV2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	signatureV2 "github.com/TrueCloudLab/frostfs-api-go/v2/signature"
-	oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id"
+	oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
-	oidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id/test"
+	oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/stretchr/testify/require"
 )

client/reputation.go

@@ -0,0 +1,200 @@
+package client
+
+import (
+	"context"
+
+	v2reputation "github.com/TrueCloudLab/frostfs-api-go/v2/reputation"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-sdk-go/reputation"
+)
+
+// PrmAnnounceLocalTrust groups parameters of AnnounceLocalTrust operation.
+type PrmAnnounceLocalTrust struct {
+	prmCommonMeta
+
+	epoch uint64
+
+	trusts []reputation.Trust
+}
+
+// SetEpoch sets number of FrostFS epoch in which the trust was assessed.
+// Required parameter, must not be zero.
+func (x *PrmAnnounceLocalTrust) SetEpoch(epoch uint64) {
+	x.epoch = epoch
+}
+
+// SetValues sets values describing trust of the client to the FrostFS network participants.
+// Required parameter. Must not be empty.
+//
+// Must not be mutated before the end of the operation.
+func (x *PrmAnnounceLocalTrust) SetValues(trusts []reputation.Trust) {
+	x.trusts = trusts
+}
+
+// ResAnnounceLocalTrust groups results of AnnounceLocalTrust operation.
+type ResAnnounceLocalTrust struct {
+	statusRes
+}
+
+// AnnounceLocalTrust sends client's trust values to the FrostFS network participants.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Returns an error if parameters are set incorrectly (see PrmAnnounceLocalTrust docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs).
+func (c *Client) AnnounceLocalTrust(ctx context.Context, prm PrmAnnounceLocalTrust) (*ResAnnounceLocalTrust, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case prm.epoch == 0:
+		return nil, errorZeroEpoch
+	case len(prm.trusts) == 0:
+		return nil, errorMissingTrusts
+	}
+
+	// form request body
+	reqBody := new(v2reputation.AnnounceLocalTrustRequestBody)
+	reqBody.SetEpoch(prm.epoch)
+
+	trusts := make([]v2reputation.Trust, len(prm.trusts))
+
+	for i := range prm.trusts {
+		prm.trusts[i].WriteToV2(&trusts[i])
+	}
+
+	reqBody.SetTrusts(trusts)
+
+	// form request
+	var req v2reputation.AnnounceLocalTrustRequest
+
+	req.SetBody(reqBody)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResAnnounceLocalTrust
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.AnnounceLocalTrust(&c.c, &req, client.WithContext(ctx))
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}
+
+// PrmAnnounceIntermediateTrust groups parameters of AnnounceIntermediateTrust operation.
+type PrmAnnounceIntermediateTrust struct {
+	prmCommonMeta
+
+	epoch uint64
+
+	iter uint32
+
+	trustSet bool
+	trust    reputation.PeerToPeerTrust
+}
+
+// SetEpoch sets number of FrostFS epoch with which client's calculation algorithm is initialized.
+// Required parameter, must not be zero.
+func (x *PrmAnnounceIntermediateTrust) SetEpoch(epoch uint64) {
+	x.epoch = epoch
+}
+
+// SetIteration sets current sequence number of the client's calculation algorithm.
+// By default, corresponds to initial (zero) iteration.
+func (x *PrmAnnounceIntermediateTrust) SetIteration(iter uint32) {
+	x.iter = iter
+}
+
+// SetCurrentValue sets current global trust value computed at the specified iteration
+// of the client's calculation algorithm. Required parameter.
+func (x *PrmAnnounceIntermediateTrust) SetCurrentValue(trust reputation.PeerToPeerTrust) {
+	x.trust = trust
+	x.trustSet = true
+}
+
+// ResAnnounceIntermediateTrust groups results of AnnounceIntermediateTrust operation.
+type ResAnnounceIntermediateTrust struct {
+	statusRes
+}
+
+// AnnounceIntermediateTrust sends global trust values calculated for the specified FrostFS network participants
+// at some stage of client's calculation algorithm.
+//
+// Exactly one return value is non-nil. By default, server status is returned in res structure.
+// Any client's internal or transport errors are returned as `error`.
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
+// FrostFS status codes are returned as `error`, otherwise, are included
+// in the returned result structure.
+//
+// Returns an error if parameters are set incorrectly (see PrmAnnounceIntermediateTrust docs).
+// Context is required and must not be nil. It is used for network communication.
+//
+// Return statuses:
+//   - global (see Client docs).
+func (c *Client) AnnounceIntermediateTrust(ctx context.Context, prm PrmAnnounceIntermediateTrust) (*ResAnnounceIntermediateTrust, error) {
+	// check parameters
+	switch {
+	case ctx == nil:
+		return nil, errorMissingContext
+	case prm.epoch == 0:
+		return nil, errorZeroEpoch
+	case !prm.trustSet:
+		return nil, errorTrustNotSet
+	}
+
+	var trust v2reputation.PeerToPeerTrust
+	prm.trust.WriteToV2(&trust)
+
+	// form request body
+	reqBody := new(v2reputation.AnnounceIntermediateResultRequestBody)
+	reqBody.SetEpoch(prm.epoch)
+	reqBody.SetIteration(prm.iter)
+	reqBody.SetTrust(&trust)
+
+	// form request
+	var req v2reputation.AnnounceIntermediateResultRequest
+
+	req.SetBody(reqBody)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResAnnounceIntermediateTrust
+	)
+
+	c.initCallContext(&cc)
+	cc.meta = prm.prmCommonMeta
+	cc.req = &req
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.AnnounceIntermediateResult(&c.c, &req, client.WithContext(ctx))
+	}
+
+	// process call
+	if !cc.processCall() {
+		return nil, cc.err
+	}
+
+	return &res, nil
+}

client/response.go

@@ -1,6 +1,6 @@
 package client
 
-import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+import "github.com/TrueCloudLab/frostfs-api-go/v2/session"
 
 // ResponseMetaInfo groups meta information about any FrostFS API response.
 type ResponseMetaInfo struct {

client/session.go

@@ -3,63 +3,34 @@ package client
 import (
 	"context"
 	"crypto/ecdsa"
-	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
+	rpcapi "github.com/TrueCloudLab/frostfs-api-go/v2/rpc"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client"
-	v2session "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	v2session "github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/signature"
+	"github.com/TrueCloudLab/frostfs-sdk-go/user"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
 )
 
 // PrmSessionCreate groups parameters of SessionCreate operation.
 type PrmSessionCreate struct {
-	XHeaders []string
+	prmCommonMeta
 
-	Expiration uint64
+	exp uint64
 
-	Key *ecdsa.PrivateKey
+	keySet bool
+	key    ecdsa.PrivateKey
 }
 
 // SetExp sets number of the last NepFS epoch in the lifetime of the session after which it will be expired.
-//
-// Deprecated: Use PrmSessionCreate.Expiration instead.
 func (x *PrmSessionCreate) SetExp(exp uint64) {
-	x.Expiration = exp
+	x.exp = exp
 }
 
 // UseKey specifies private key to sign the requests and compute token owner.
 // If key is not provided, then Client default key is used.
-//
-// Deprecated: Use PrmSessionCreate.Key instead.
 func (x *PrmSessionCreate) UseKey(key ecdsa.PrivateKey) {
-	x.Key = &key
+	x.keySet = true
-}
+	x.key = key
-
-func (x *PrmSessionCreate) buildRequest(c *Client) (*v2session.CreateRequest, error) {
-	ownerKey := c.prm.Key.PublicKey
-	if x.Key != nil {
-		ownerKey = x.Key.PublicKey
-	}
-	var ownerID user.ID
-	user.IDFromKey(&ownerID, ownerKey)
-
-	var ownerIDV2 refs.OwnerID
-	ownerID.WriteToV2(&ownerIDV2)
-
-	reqBody := new(v2session.CreateRequestBody)
-	reqBody.SetOwnerID(&ownerIDV2)
-	reqBody.SetExpiration(x.Expiration)
-
-	var meta v2session.RequestMetaHeader
-	writeXHeadersToMeta(x.XHeaders, &meta)
-
-	var req v2session.CreateRequest
-	req.SetBody(reqBody)
-	c.prepareRequest(&req, &meta)
-	return &req, nil
 }
 
 // ResSessionCreate groups resulting values of SessionCreate operation.
@@ -71,6 +42,10 @@ type ResSessionCreate struct {
 	sessionKey []byte
 }
 
+func (x *ResSessionCreate) setID(id []byte) {
+	x.id = id
+}
+
 // ID returns identifier of the opened session in a binary FrostFS API protocol format.
 //
 // Client doesn't retain value so modification is safe.
@@ -78,6 +53,10 @@ func (x ResSessionCreate) ID() []byte {
 	return x.id
 }
 
+func (x *ResSessionCreate) setSessionKey(key []byte) {
+	x.sessionKey = key
+}
+
 // PublicKey returns public key of the opened session in a binary FrostFS API protocol format.
 func (x ResSessionCreate) PublicKey() []byte {
 	return x.sessionKey
@@ -89,9 +68,9 @@ func (x ResSessionCreate) PublicKey() []byte {
 //
 // Exactly one return value is non-nil. By default, server status is returned in res structure.
 // Any client's internal or transport errors are returned as `error`.
-// If PrmInit.DisableFrostFSFailuresResolution has been called, unsuccessful
+// If PrmInit.ResolveFrostFSFailures has been called, unsuccessful
-// FrostFS status codes are included in the returned result structure,
+// FrostFS status codes are returned as `error`, otherwise, are included
-// otherwise, are also returned as `error`.
+// in the returned result structure.
 //
 // Returns an error if parameters are set incorrectly (see PrmSessionCreate docs).
 // Context is required and must not be nil. It is used for network communication.
@@ -99,28 +78,62 @@ func (x ResSessionCreate) PublicKey() []byte {
 // Return statuses:
 //   - global (see Client docs).
 func (c *Client) SessionCreate(ctx context.Context, prm PrmSessionCreate) (*ResSessionCreate, error) {
-	req, err := prm.buildRequest(c)
+	// check context
-	if err != nil {
+	if ctx == nil {
-		return nil, err
+		return nil, errorMissingContext
 	}
 
-	if err := signature.SignServiceMessage(&c.prm.Key, req); err != nil {
+	ownerKey := c.prm.key.PublicKey
-		return nil, fmt.Errorf("sign request: %w", err)
+	if prm.keySet {
+		ownerKey = prm.key.PublicKey
+	}
+	var ownerID user.ID
+	user.IDFromKey(&ownerID, ownerKey)
+
+	var ownerIDV2 refs.OwnerID
+	ownerID.WriteToV2(&ownerIDV2)
+
+	// form request body
+	reqBody := new(v2session.CreateRequestBody)
+	reqBody.SetOwnerID(&ownerIDV2)
+	reqBody.SetExpiration(prm.exp)
+
+	// for request
+	var req v2session.CreateRequest
+
+	req.SetBody(reqBody)
+
+	// init call context
+
+	var (
+		cc  contextCall
+		res ResSessionCreate
+	)
+
+	c.initCallContext(&cc)
+	if prm.keySet {
+		cc.key = prm.key
 	}
 
-	resp, err := rpcapi.CreateSession(&c.c, req, client.WithContext(ctx))
+	cc.meta = prm.prmCommonMeta
-	if err != nil {
+	cc.req = &req
-		return nil, err
+	cc.statusRes = &res
+	cc.call = func() (responseV2, error) {
+		return rpcapi.CreateSession(&c.c, &req, client.WithContext(ctx))
+	}
+	cc.result = func(r responseV2) {
+		resp := r.(*v2session.CreateResponse)
+
+		body := resp.GetBody()
+
+		res.setID(body.GetID())
+		res.setSessionKey(body.GetSessionKey())
 	}
 
-	var res ResSessionCreate
+	// process call
-	res.st, err = c.processResponse(resp)
+	if !cc.processCall() {
-	if err != nil || !apistatus.IsSuccessful(res.st) {
+		return nil, cc.err
-		return &res, err
 	}
 
-	body := resp.GetBody()
-	res.id = body.GetID()
-	res.sessionKey = body.GetSessionKey()
 	return &res, nil
 }

client/status/apemanager.go

@@ -1,53 +0,0 @@
-package apistatus
-
-import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/apemanager"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
-)
-
-// APEManagerAccessDenied describes status of the failure because of the access control violation.
-// Instances provide Status and StatusV2 interfaces.
-type APEManagerAccessDenied struct {
-	v2 status.Status
-}
-
-const defaultAPEManagerAccessDeniedMsg = "apemanager access denied"
-
-func (x *APEManagerAccessDenied) Error() string {
-	msg := x.v2.Message()
-	if msg == "" {
-		msg = defaultAPEManagerAccessDeniedMsg
-	}
-
-	return errMessageStatusV2(
-		globalizeCodeV2(apemanager.StatusAPEManagerAccessDenied, apemanager.GlobalizeFail),
-		msg,
-	)
-}
-
-func (x *APEManagerAccessDenied) fromStatusV2(st *status.Status) {
-	x.v2 = *st
-}
-
-// ToStatusV2 converts APEManagerAccessDenied to v2's Status.
-// If the value was returned by FromStatusV2, returns the source message.
-// Otherwise, returns message with
-//   - code: APE_MANAGER_ACCESS_DENIED;
-//   - string message: "apemanager access denied";
-//   - details: empty.
-func (x APEManagerAccessDenied) ToStatusV2() *status.Status {
-	x.v2.SetCode(globalizeCodeV2(apemanager.StatusAPEManagerAccessDenied, apemanager.GlobalizeFail))
-	x.v2.SetMessage(defaultAPEManagerAccessDeniedMsg)
-	return &x.v2
-}
-
-// WriteReason writes human-readable access rejection reason.
-func (x *APEManagerAccessDenied) WriteReason(reason string) {
-	apemanager.WriteAccessDeniedDesc(&x.v2, reason)
-}
-
-// Reason returns human-readable access rejection reason returned by the server.
-// Returns empty value is reason is not presented.
-func (x APEManagerAccessDenied) Reason() string {
-	return apemanager.ReadAccessDeniedDesc(x.v2)
-}

client/status/common.go

@@ -3,7 +3,7 @@ package apistatus
 import (
 	"encoding/binary"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
 )
 
 // ServerInternal describes failure statuses related to internal server errors.
@@ -14,7 +14,7 @@ type ServerInternal struct {
 	v2 status.Status
 }
 
-func (x *ServerInternal) Error() string {
+func (x ServerInternal) Error() string {
 	return errMessageStatusV2(
 		globalizeCodeV2(status.Internal, status.GlobalizeCommonFail),
 		x.v2.Message(),
@@ -62,7 +62,7 @@ type WrongMagicNumber struct {
 	v2 status.Status
 }
 
-func (x *WrongMagicNumber) Error() string {
+func (x WrongMagicNumber) Error() string {
 	return errMessageStatusV2(
 		globalizeCodeV2(status.WrongMagicNumber, status.GlobalizeCommonFail),
 		x.v2.Message(),
@@ -132,7 +132,7 @@ type SignatureVerification struct {
 
 const defaultSignatureVerificationMsg = "signature verification failed"
 
-func (x *SignatureVerification) Error() string {
+func (x SignatureVerification) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultSignatureVerificationMsg
@@ -191,7 +191,7 @@ type NodeUnderMaintenance struct {
 const defaultNodeUnderMaintenanceMsg = "node is under maintenance"
 
 // Error implements the error interface.
-func (x *NodeUnderMaintenance) Error() string {
+func (x NodeUnderMaintenance) Error() string {
 	msg := x.Message()
 	if msg == "" {
 		msg = defaultNodeUnderMaintenanceMsg
@@ -238,61 +238,3 @@ func (x *NodeUnderMaintenance) SetMessage(v string) {
 func (x NodeUnderMaintenance) Message() string {
 	return x.v2.Message()
 }
-
-// InvalidArgument describes failure status related to invalid argument.
-// Instances provide Status and StatusV2 interfaces.
-type InvalidArgument struct {
-	v2 status.Status
-}
-
-const defaultInvalidArgumentMsg = "argument is invalid"
-
-// Error implements the error interface.
-func (x *InvalidArgument) Error() string {
-	msg := x.v2.Message()
-	if msg == "" {
-		msg = defaultInvalidArgumentMsg
-	}
-
-	return errMessageStatusV2(
-		globalizeCodeV2(status.InvalidArgument, status.GlobalizeCommonFail),
-		msg,
-	)
-}
-
-// implements local interface defined in FromStatusV2 func.
-func (x *InvalidArgument) fromStatusV2(st *status.Status) {
-	x.v2 = *st
-}
-
-// ToStatusV2 implements StatusV2 interface method.
-// If the value was returned by FromStatusV2, returns the source message.
-// Otherwise, returns message with
-//   - code: INVALID_ARGUMENT;
-//   - string message: written message via SetMessage or
-//     "argument is invalid" as a default message;
-//   - details: empty.
-func (x InvalidArgument) ToStatusV2() *status.Status {
-	x.v2.SetCode(globalizeCodeV2(status.InvalidArgument, status.GlobalizeCommonFail))
-	if x.v2.Message() == "" {
-		x.v2.SetMessage(defaultInvalidArgumentMsg)
-	}
-
-	return &x.v2
-}
-
-// SetMessage writes invalid argument failure message.
-// Message should be used for debug purposes only.
-//
-// See also Message.
-func (x *InvalidArgument) SetMessage(v string) {
-	x.v2.SetMessage(v)
-}
-
-// Message returns status message. Zero status returns empty message.
-// Message should be used for debug purposes only.
-//
-// See also SetMessage.
-func (x InvalidArgument) Message() string {
-	return x.v2.Message()
-}

client/status/common_test.go

@@ -3,8 +3,8 @@ package apistatus_test
 import (
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
 	"github.com/stretchr/testify/require"
 )
 
@@ -114,7 +114,7 @@ func TestNodeUnderMaintenance(t *testing.T) {
 
 		stV2 := st.ToStatusV2()
 
-		require.Equal(t, "node is under maintenance", stV2.Message())
+		require.Empty(t, "", stV2.Message())
 	})
 
 	t.Run("non-empty to V2", func(t *testing.T) {
@@ -128,42 +128,3 @@ func TestNodeUnderMaintenance(t *testing.T) {
 		require.Equal(t, msg, stV2.Message())
 	})
 }
-
-func TestInvalidArgument(t *testing.T) {
-	t.Run("default", func(t *testing.T) {
-		var st apistatus.InvalidArgument
-
-		require.Empty(t, st.Message())
-	})
-
-	t.Run("custom message", func(t *testing.T) {
-		var st apistatus.InvalidArgument
-		msg := "some message"
-
-		st.SetMessage(msg)
-
-		stV2 := st.ToStatusV2()
-
-		require.Equal(t, msg, st.Message())
-		require.Equal(t, msg, stV2.Message())
-	})
-
-	t.Run("empty to V2", func(t *testing.T) {
-		var st apistatus.InvalidArgument
-
-		stV2 := st.ToStatusV2()
-
-		require.Equal(t, "argument is invalid", stV2.Message())
-	})
-
-	t.Run("non-empty to V2", func(t *testing.T) {
-		var st apistatus.InvalidArgument
-		msg := "some other msg"
-
-		st.SetMessage(msg)
-
-		stV2 := st.ToStatusV2()
-
-		require.Equal(t, msg, stV2.Message())
-	})
-}

client/status/container.go

@@ -1,8 +1,8 @@
 package apistatus
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
 )
 
 // ContainerNotFound describes status of the failure because of the missing container.
@@ -13,7 +13,7 @@ type ContainerNotFound struct {
 
 const defaultContainerNotFoundMsg = "container not found"
 
-func (x *ContainerNotFound) Error() string {
+func (x ContainerNotFound) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultContainerNotFoundMsg
@@ -51,7 +51,7 @@ type EACLNotFound struct {
 
 const defaultEACLNotFoundMsg = "eACL not found"
 
-func (x *EACLNotFound) Error() string {
+func (x EACLNotFound) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultEACLNotFoundMsg

client/status/object.go

@@ -1,8 +1,8 @@
 package apistatus
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
 )
 
 // ObjectLocked describes status of the failure because of the locked object.
@@ -13,7 +13,7 @@ type ObjectLocked struct {
 
 const defaultObjectLockedMsg = "object is locked"
 
-func (x *ObjectLocked) Error() string {
+func (x ObjectLocked) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultObjectLockedMsg
@@ -50,7 +50,7 @@ type LockNonRegularObject struct {
 
 const defaultLockNonRegularObjectMsg = "locking non-regular object is forbidden"
 
-func (x *LockNonRegularObject) Error() string {
+func (x LockNonRegularObject) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultLockNonRegularObjectMsg
@@ -87,7 +87,7 @@ type ObjectAccessDenied struct {
 
 const defaultObjectAccessDeniedMsg = "access to object operation denied"
 
-func (x *ObjectAccessDenied) Error() string {
+func (x ObjectAccessDenied) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultObjectAccessDeniedMsg
@@ -135,7 +135,7 @@ type ObjectNotFound struct {
 
 const defaultObjectNotFoundMsg = "object not found"
 
-func (x *ObjectNotFound) Error() string {
+func (x ObjectNotFound) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultObjectNotFoundMsg
@@ -172,7 +172,7 @@ type ObjectAlreadyRemoved struct {
 
 const defaultObjectAlreadyRemovedMsg = "object already removed"
 
-func (x *ObjectAlreadyRemoved) Error() string {
+func (x ObjectAlreadyRemoved) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultObjectAlreadyRemovedMsg
@@ -210,7 +210,7 @@ type ObjectOutOfRange struct {
 
 const defaultObjectOutOfRangeMsg = "out of range"
 
-func (x *ObjectOutOfRange) Error() string {
+func (x ObjectOutOfRange) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultObjectOutOfRangeMsg

client/status/object_test.go

@@ -3,7 +3,7 @@ package apistatus_test
 import (
 	"testing"
 
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
 	"github.com/stretchr/testify/require"
 )
 

client/status/session.go

@@ -1,8 +1,8 @@
 package apistatus
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
 )
 
 // SessionTokenNotFound describes status of the failure because of the missing session token.
@@ -13,7 +13,7 @@ type SessionTokenNotFound struct {
 
 const defaultSessionTokenNotFoundMsg = "session token not found"
 
-func (x *SessionTokenNotFound) Error() string {
+func (x SessionTokenNotFound) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultSessionTokenNotFoundMsg
@@ -50,7 +50,7 @@ type SessionTokenExpired struct {
 
 const defaultSessionTokenExpiredMsg = "expired session token"
 
-func (x *SessionTokenExpired) Error() string {
+func (x SessionTokenExpired) Error() string {
 	msg := x.v2.Message()
 	if msg == "" {
 		msg = defaultSessionTokenExpiredMsg

client/status/status.go

@@ -15,7 +15,7 @@ package apistatus
 // It should be noted that using direct typecasting is not a compatible approach.
 //
 // To transport statuses using the FrostFS API V2 protocol, see StatusV2 interface and FromStatusV2 and ToStatusV2 functions.
-type Status any
+type Status interface{}
 
 // ErrFromStatus converts Status instance to error if it is failed. Returns nil on successful Status.
 //

client/status/status_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
 	"github.com/stretchr/testify/require"
 )
 

client/status/success.go

@@ -1,7 +1,7 @@
 package apistatus
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
 )
 
 // SuccessDefaultV2 represents Status instance of default success. Implements StatusV2.

client/status/unrecognized.go

@@ -1,14 +1,14 @@
 package apistatus
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
 )
 
 type unrecognizedStatusV2 struct {
 	v2 status.Status
 }
 
-func (x *unrecognizedStatusV2) Error() string {
+func (x unrecognizedStatusV2) Error() string {
 	return errMessageStatusV2("unrecognized", x.v2.Message())
 }
 

client/status/v2.go

@@ -3,11 +3,10 @@ package apistatus
 import (
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/apemanager"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/object"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/session"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/status"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status"
 )
 
 // StatusV2 defines a variety of Status instances compatible with FrostFS API V2 protocol.
@@ -16,7 +15,7 @@ import (
 type StatusV2 interface {
 	Status
 
-	// ToStatusV2 returns the status as git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/status.Status message structure.
+	// ToStatusV2 returns the status as github.com/TrueCloudLab/frostfs-api-go/v2/status.Status message structure.
 	ToStatusV2() *status.Status
 }
 
@@ -33,29 +32,12 @@ type StatusV2 interface {
 //
 // Common failures:
 //   - status.Internal: *ServerInternal;
-//   - status.WrongMagicNumber: *WrongMagicNumber;
+//   - status.SignatureVerificationFail: *SignatureVerification.
-//   - status.SignatureVerificationFail: *SignatureVerification;
-//   - status.NodeUnderMaintenance: *NodeUnderMaintenance;
-//   - status.InvalidArgument: *InvalidArgument.
 //
 // Object failures:
 //   - object.StatusLocked: *ObjectLocked;
-//   - object.StatusLockNonRegularObject: *LockNonRegularObject;
+//   - object.StatusLockNonRegularObject: *LockNonRegularObject.
-//   - object.StatusAccessDenied: *ObjectAccessDenied;
+//   - object.StatusAccessDenied: *ObjectAccessDenied.
-//   - object.StatusNotFound: *ObjectNotFound;
-//   - object.StatusAlreadyRemoved: *ObjectAlreadyRemoved;
-//   - object.StatusOutOfRange: *ObjectOutOfRange.
-//
-// Container failures:
-//   - container.StatusNotFound: *ContainerNotFound;
-//   - container.StatusEACLNotFound: *EACLNotFound.
-//
-// Session failures:
-//   - session.StatusTokenNotFound: *SessionTokenNotFound;
-//   - session.StatusTokenExpired: *SessionTokenExpired.
-//
-// APE Manager failures
-//   - apemanager.StatusAPEManagerAccessDenied: *APEManagerAccessDenied.
 func FromStatusV2(st *status.Status) Status {
 	var decoder interface {
 		fromStatusV2(*status.Status)
@@ -78,8 +60,6 @@ func FromStatusV2(st *status.Status) Status {
 			decoder = new(SignatureVerification)
 		case status.NodeUnderMaintenance:
 			decoder = new(NodeUnderMaintenance)
-		case status.InvalidArgument:
-			decoder = new(InvalidArgument)
 		}
 	case object.LocalizeFailStatus(&code):
 		switch code {
@@ -112,12 +92,6 @@ func FromStatusV2(st *status.Status) Status {
 		case session.StatusTokenExpired:
 			decoder = new(SessionTokenExpired)
 		}
-	case apemanager.LocalizeFailStatus(&code):
-		//nolint:exhaustive
-		switch code {
-		case apemanager.StatusAPEManagerAccessDenied:
-			decoder = new(APEManagerAccessDenied)
-		}
 	}
 
 	if decoder == nil {
@@ -149,7 +123,7 @@ func ToStatusV2(st Status) *status.Status {
 	return internalErrorStatus
 }
 
-func errMessageStatusV2(code any, msg string) string {
+func errMessageStatusV2(code interface{}, msg string) string {
 	const (
 		noMsgFmt = "status: code = %v"
 		msgFmt   = noMsgFmt + " message = %s"

client/status/v2_test.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
+	apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status"
 	"github.com/stretchr/testify/require"
 )
 
@@ -12,7 +12,7 @@ func TestToStatusV2(t *testing.T) {
 	type statusConstructor func() apistatus.Status
 
 	for _, testItem := range [...]struct {
-		status    any // Status or statusConstructor
+		status    interface{} // Status or statusConstructor
 		codeV2    uint64
 		messageV2 string
 	}{
@@ -61,24 +61,6 @@ func TestToStatusV2(t *testing.T) {
 			}),
 			codeV2: 1025,
 		},
-		{
-			status: (statusConstructor)(func() apistatus.Status {
-				return new(apistatus.SignatureVerification)
-			}),
-			codeV2: 1026,
-		},
-		{
-			status: (statusConstructor)(func() apistatus.Status {
-				return new(apistatus.NodeUnderMaintenance)
-			}),
-			codeV2: 1027,
-		},
-		{
-			status: (statusConstructor)(func() apistatus.Status {
-				return new(apistatus.InvalidArgument)
-			}),
-			codeV2: 1028,
-		},
 		{
 			status: (statusConstructor)(func() apistatus.Status {
 				return new(apistatus.ObjectLocked)
@@ -145,9 +127,9 @@ func TestToStatusV2(t *testing.T) {
 		},
 		{
 			status: (statusConstructor)(func() apistatus.Status {
-				return new(apistatus.APEManagerAccessDenied)
+				return new(apistatus.NodeUnderMaintenance)
 			}),
-			codeV2: 5120,
+			codeV2: 1027,
 		},
 	} {
 		var st apistatus.Status
@@ -183,7 +165,7 @@ func TestFromStatusV2(t *testing.T) {
 	type statusConstructor func() apistatus.Status
 
 	for _, testItem := range [...]struct {
-		status    any // Status or statusConstructor
+		status    interface{} // Status or statusConstructor
 		codeV2    uint64
 		messageV2 string
 	}{
@@ -296,12 +278,6 @@ func TestFromStatusV2(t *testing.T) {
 			}),
 			codeV2: 4097,
 		},
-		{
-			status: (statusConstructor)(func() apistatus.Status {
-				return new(apistatus.APEManagerAccessDenied)
-			}),
-			codeV2: 5120,
-		},
 		{
 			status: (statusConstructor)(func() apistatus.Status {
 				return new(apistatus.NodeUnderMaintenance)

container/acl/acl.go

@@ -9,7 +9,6 @@ import "strconv"
 // use corresponding constants and/or methods instead.
 type Op uint32
 
-// nolint: unused
 const (
 	opZero Op = iota // extreme value for testing
 
@@ -54,7 +53,6 @@ func (x Op) String() string {
 // use corresponding constants and/or methods instead.
 type Role uint32
 
-// nolint: unused
 const (
 	roleZero Role = iota // extreme value for testing
 

container/acl/util.go

@@ -7,6 +7,14 @@ func setBit(num *uint32, n uint8) {
 	*num |= 1 << n
 }
 
+// resets n-th bit in num (starting at 0).
+func resetBit(num *uint32, n uint8) {
+	var mask uint32
+	setBit(&mask, n)
+
+	*num &= ^mask
+}
+
 // checks if n-th bit in num is set (starting at 0).
 func isBitSet(num uint32, n uint8) bool {
 	mask := uint32(1 << n)

container/acl/util_test.go

@@ -22,6 +22,9 @@ func TestBits(t *testing.T) {
 
 	setBit(&num, 6)
 	require.EqualValues(t, 0b1011110, num)
+
+	resetBit(&num, 1)
+	require.EqualValues(t, 0b1011100, num)
 }
 
 func TestOpBits(t *testing.T) {

container/container.go

@@ -6,19 +6,19 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
-	"strings"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/container"
-	v2netmap "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
+	v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
+	"github.com/TrueCloudLab/frostfs-sdk-go/container/acl"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
+	frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
-	frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
+	frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
+	"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user"
+	subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
+	"github.com/TrueCloudLab/frostfs-sdk-go/user"
+	"github.com/TrueCloudLab/frostfs-sdk-go/version"
 	"github.com/google/uuid"
 )
 
@@ -37,7 +37,7 @@ import (
 // Instances for existing containers can be initialized using decoding methods
 // (e.g Unmarshal).
 //
-// Container is mutually compatible with git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container.Container
+// Container is mutually compatible with github.com/TrueCloudLab/frostfs-api-go/v2/container.Container
 // message. See ReadFromV2 / WriteToV2 methods.
 type Container struct {
 	v2 container.Container
@@ -96,16 +96,6 @@ func (x *Container) readFromV2(m container.Container, checkFieldPresence bool) e
 		return errors.New("missing placement policy")
 	}
 
-	if err := checkAttributes(m); err != nil {
-		return err
-	}
-
-	x.v2 = m
-
-	return nil
-}
-
-func checkAttributes(m container.Container) error {
 	attrs := m.GetAttributes()
 	mAttr := make(map[string]struct{}, len(attrs))
 	var key, val string
@@ -127,8 +117,10 @@ func checkAttributes(m container.Container) error {
 			return fmt.Errorf("empty attribute value %s", key)
 		}
 
-		var err error
+		switch key {
-		if key == attributeTimestamp {
+		case container.SysAttributeSubnet:
+			err = new(subnetid.ID).DecodeString(val)
+		case attributeTimestamp:
 			_, err = strconv.ParseInt(val, 10, 64)
 		}
 
@@ -138,6 +130,9 @@ func checkAttributes(m container.Container) error {
 
 		mAttr[key] = struct{}{}
 	}
+
+	x.v2 = m
+
 	return nil
 }
 
@@ -297,7 +292,7 @@ func (x Container) PlacementPolicy() (res netmap.PlacementPolicy) {
 //
 // SetAttribute overwrites existing attribute value.
 //
-// See also Attribute, IterateAttributes, IterateUserAttributes.
+// See also Attribute, IterateAttributes.
 func (x *Container) SetAttribute(key, value string) {
 	if key == "" {
 		panic("empty attribute key")
@@ -308,7 +303,7 @@ func (x *Container) SetAttribute(key, value string) {
 	attrs := x.v2.GetAttributes()
 	ln := len(attrs)
 
-	for i := range ln {
+	for i := 0; i < ln; i++ {
 		if attrs[i].GetKey() == key {
 			attrs[i].SetValue(value)
 			return
@@ -325,7 +320,7 @@ func (x *Container) SetAttribute(key, value string) {
 // Attribute reads value of the Container attribute by key. Empty result means
 // attribute absence.
 //
-// See also SetAttribute, IterateAttributes, IterateUserAttributes.
+// See also SetAttribute, IterateAttributes.
 func (x Container) Attribute(key string) string {
 	attrs := x.v2.GetAttributes()
 	for i := range attrs {
@@ -348,20 +343,6 @@ func (x Container) IterateAttributes(f func(key, val string)) {
 	}
 }
 
-// IterateUserAttributes iterates over user Container attributes and passes them
-// into f. The handler MUST NOT be nil.
-//
-// See also SetAttribute, Attribute.
-func (x Container) IterateUserAttributes(f func(key, val string)) {
-	attrs := x.v2.GetAttributes()
-	for _, attr := range attrs {
-		key := attr.GetKey()
-		if !strings.HasPrefix(key, container.SysAttributePrefix) {
-			f(key, attr.GetValue())
-		}
-	}
-}
-
 // SetName sets human-readable name of the Container. Name MUST NOT be empty.
 //
 // See also Name.
@@ -402,6 +383,28 @@ func CreatedAt(cnr Container) time.Time {
 	return time.Unix(sec, 0)
 }
 
+// SetSubnet places the Container on the specified FrostFS subnet. If called,
+// container nodes will only be selected from the given subnet, otherwise from
+// the entire network.
+func SetSubnet(cnr *Container, subNet subnetid.ID) {
+	cnr.SetAttribute(container.SysAttributeSubnet, subNet.EncodeToString())
+}
+
+// Subnet return container subnet set using SetSubnet.
+//
+// Zero Container is bound to zero subnet.
+func Subnet(cnr Container) (res subnetid.ID) {
+	val := cnr.Attribute(container.SysAttributeSubnet)
+	if val != "" {
+		err := res.DecodeString(val)
+		if err != nil {
+			panic(fmt.Sprintf("invalid subnet attribute: %s (%v)", val, err))
+		}
+	}
+
+	return
+}
+
 const attributeHomoHashEnabled = "true"
 
 // DisableHomomorphicHashing sets flag to disable homomorphic hashing of the
@@ -462,7 +465,8 @@ func WriteDomain(cnr *Container, domain Domain) {
 // ReadDomain reads Domain from the Container. Returns value with empty name
 // if domain is not specified.
 func ReadDomain(cnr Container) (res Domain) {
-	if name := cnr.Attribute(container.SysAttributeName); name != "" {
+	name := cnr.Attribute(container.SysAttributeName)
+	if name != "" {
 		res.SetName(name)
 		res.SetZone(cnr.Attribute(container.SysAttributeZone))
 	}

container/container_test.go

@@ -6,17 +6,19 @@ import (
 	"testing"
 	"time"
 
-	v2container "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
+	v2container "github.com/TrueCloudLab/frostfs-api-go/v2/container"
-	v2netmap "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/netmap"
+	v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap"
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
+	"github.com/TrueCloudLab/frostfs-sdk-go/container"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
+	cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
-	containertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/test"
+	containertest "github.com/TrueCloudLab/frostfs-sdk-go/container/test"
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
+	frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
-	netmaptest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap/test"
+	netmaptest "github.com/TrueCloudLab/frostfs-sdk-go/netmap/test"
-	usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test"
+	subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version"
+	subnetidtest "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id/test"
+	usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test"
+	"github.com/TrueCloudLab/frostfs-sdk-go/version"
 	"github.com/google/uuid"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/stretchr/testify/require"
@@ -78,7 +80,7 @@ func TestContainer_Owner(t *testing.T) {
 
 	val = containertest.Container()
 
-	owner := usertest.ID()
+	owner := *usertest.ID()
 
 	val.SetOwner(owner)
 
@@ -150,7 +152,7 @@ func assertContainsAttribute(t *testing.T, m v2container.Container, key, val str
 }
 
 func TestContainer_Attribute(t *testing.T) {
-	const attrKey1, attrKey2 = v2container.SysAttributePrefix + "key1", v2container.SysAttributePrefix + "key2"
+	const attrKey1, attrKey2 = "key1", "key2"
 	const attrVal1, attrVal2 = "val1", "val2"
 
 	val := containertest.Container()
@@ -158,12 +160,6 @@ func TestContainer_Attribute(t *testing.T) {
 	val.SetAttribute(attrKey1, attrVal1)
 	val.SetAttribute(attrKey2, attrVal2)
 
-	var i int
-	val.IterateUserAttributes(func(key, val string) {
-		i++
-	})
-	require.Equal(t, 1, i)
-
 	var msg v2container.Container
 	val.WriteToV2(&msg)
 
@@ -237,6 +233,28 @@ func TestSetCreationTime(t *testing.T) {
 	require.Equal(t, creat.Unix(), container.CreatedAt(val2).Unix())
 }
 
+func TestSetSubnet(t *testing.T) {
+	var val container.Container
+
+	require.True(t, subnetid.IsZero(container.Subnet(val)))
+
+	val = containertest.Container()
+
+	sub := subnetidtest.ID()
+
+	container.SetSubnet(&val, sub)
+
+	var msg v2container.Container
+	val.WriteToV2(&msg)
+
+	assertContainsAttribute(t, msg, v2container.SysAttributeSubnet, sub.EncodeToString())
+
+	var val2 container.Container
+	require.NoError(t, val2.ReadFromV2(msg))
+
+	require.Equal(t, sub, container.Subnet(val))
+}
+
 func TestDisableHomomorphicHashing(t *testing.T) {
 	var val container.Container
 

container/doc.go

@@ -23,11 +23,11 @@ it using the instance of Container types
 	// process the container data
 
 Instances can be also used to process FrostFS API V2 protocol messages
-(see neo.fs.v2.container package in https://git.frostfs.info/TrueCloudLab/frostfs-api).
+(see neo.fs.v2.container package in https://github.com/TrueCloudLab/frostfs-api).
 
 On client side:
 
-	import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container"
+	import "github.com/TrueCloudLab/frostfs-api-go/v2/container"
 
 	var msg container.Container
 	cnr.WriteToV2(&msg)

container/id/id.go

@@ -4,13 +4,13 @@ import (
 	"crypto/sha256"
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
 	"github.com/mr-tron/base58"
 )
 
 // ID represents FrostFS container identifier.
 //
-// ID is mutually compatible with git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs.ContainerID
+// ID is mutually compatible with github.com/TrueCloudLab/frostfs-api-go/v2/refs.ContainerID
 // message. See ReadFromV2 / WriteToV2 methods.
 //
 // Instances can be created using built-in var declaration.

container/id/id_test.go

@@ -1,13 +1,13 @@
 package cid_test
 
 import (
-	"crypto/rand"
 	"crypto/sha256"
+	"math/rand"
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
-	cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
+	cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
 	"github.com/mr-tron/base58"
 	"github.com/stretchr/testify/require"
 )

container/id/test/doc.go

@@ -5,7 +5,7 @@ Note that importing the package into source files is highly discouraged.
 
 Random instance generation functions can be useful when testing expects any value, e.g.:
 
-	import cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test"
+	import cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
 
 	cid := cidtest.ID()
 	// test the value

container/id/test/id.go

@@ -1,17 +1,17 @@
 package cidtest
 
 import (
-	"crypto/rand"
 	"crypto/sha256"
+	"math/rand"
 
-	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
 )
 
 // ID returns random cid.ID.
 func ID() cid.ID {
 	checksum := [sha256.Size]byte{}
 
-	_, _ = rand.Read(checksum[:])
+	rand.Read(checksum[:])
 
 	return IDWithChecksum(checksum)
 }

container/network.go

@@ -1,7 +1,7 @@
 package container
 
 import (
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
+	"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
 )
 
 // ApplyNetworkConfig applies network configuration to the

container/network_test.go

@@ -3,9 +3,9 @@ package container_test
 import (
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
+	"github.com/TrueCloudLab/frostfs-sdk-go/container"
-	containertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/test"
+	containertest "github.com/TrueCloudLab/frostfs-sdk-go/container/test"
-	netmaptest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap/test"
+	netmaptest "github.com/TrueCloudLab/frostfs-sdk-go/netmap/test"
 	"github.com/stretchr/testify/require"
 )
 

container/size.go

@@ -0,0 +1,104 @@
+package container
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/TrueCloudLab/frostfs-api-go/v2/container"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
+)
+
+// SizeEstimation groups information about estimation of the size of the data
+// stored in the FrostFS container.
+//
+// SizeEstimation is mutually compatible with github.com/TrueCloudLab/frostfs-api-go/v2/container.UsedSpaceAnnouncement
+// message. See ReadFromV2 / WriteToV2 methods.
+type SizeEstimation struct {
+	m container.UsedSpaceAnnouncement
+}
+
+// ReadFromV2 reads SizeEstimation from the container.UsedSpaceAnnouncement message.
+// Checks if the message conforms to FrostFS API V2 protocol.
+//
+// See also WriteToV2.
+func (x *SizeEstimation) ReadFromV2(m container.UsedSpaceAnnouncement) error {
+	cnrV2 := m.GetContainerID()
+	if cnrV2 == nil {
+		return errors.New("missing container")
+	}
+
+	var cnr cid.ID
+
+	err := cnr.ReadFromV2(*cnrV2)
+	if err != nil {
+		return fmt.Errorf("invalid container: %w", err)
+	}
+
+	x.m = m
+
+	return nil
+}
+
+// WriteToV2 writes SizeEstimation into the container.UsedSpaceAnnouncement message.
+// The message MUST NOT be nil.
+//
+// See also ReadFromV2.
+func (x SizeEstimation) WriteToV2(m *container.UsedSpaceAnnouncement) {
+	*m = x.m
+}
+
+// SetEpoch sets epoch when estimation of the container data size was calculated.
+//
+// See also Epoch.
+func (x *SizeEstimation) SetEpoch(epoch uint64) {
+	x.m.SetEpoch(epoch)
+}
+
+// Epoch return epoch set using SetEpoch.
+//
+// Zero SizeEstimation represents estimation in zero epoch.
+func (x SizeEstimation) Epoch() uint64 {
+	return x.m.GetEpoch()
+}
+
+// SetContainer specifies the container for which the amount of data is estimated.
+// Required by the FrostFS API protocol.
+//
+// See also Container.
+func (x *SizeEstimation) SetContainer(cnr cid.ID) {
+	var cidV2 refs.ContainerID
+	cnr.WriteToV2(&cidV2)
+
+	x.m.SetContainerID(&cidV2)
+}
+
+// Container returns container set using SetContainer.
+//
+// Zero SizeEstimation is not bound to any container (returns zero) which is
+// incorrect according to FrostFS API protocol.
+func (x SizeEstimation) Container() (res cid.ID) {
+	m := x.m.GetContainerID()
+	if m != nil {
+		err := res.ReadFromV2(*m)
+		if err != nil {
+			panic(fmt.Errorf("unexpected error from cid.ID.ReadFromV2: %w", err))
+		}
+	}
+
+	return
+}
+
+// SetValue sets estimated amount of data (in bytes) in the specified container.
+//
+// See also Value.
+func (x *SizeEstimation) SetValue(value uint64) {
+	x.m.SetUsedSpace(value)
+}
+
+// Value returns data size estimation set using SetValue.
+//
+// Zero SizeEstimation has zero value.
+func (x SizeEstimation) Value() uint64 {
+	return x.m.GetUsedSpace()
+}

container/size_test.go

@@ -0,0 +1,94 @@
+package container_test
+
+import (
+	"crypto/sha256"
+	"testing"
+
+	v2container "github.com/TrueCloudLab/frostfs-api-go/v2/container"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-sdk-go/container"
+	cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
+	cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSizeEstimation_Epoch(t *testing.T) {
+	var val container.SizeEstimation
+
+	require.Zero(t, val.Epoch())
+
+	const epoch = 123
+
+	val.SetEpoch(epoch)
+	require.EqualValues(t, epoch, val.Epoch())
+
+	var msg v2container.UsedSpaceAnnouncement
+	val.WriteToV2(&msg)
+
+	require.EqualValues(t, epoch, msg.GetEpoch())
+}
+
+func TestSizeEstimation_Container(t *testing.T) {
+	var val container.SizeEstimation
+
+	require.Zero(t, val.Container())
+
+	cnr := cidtest.ID()
+
+	val.SetContainer(cnr)
+	require.True(t, val.Container().Equals(cnr))
+
+	var msg v2container.UsedSpaceAnnouncement
+	val.WriteToV2(&msg)
+
+	var msgCnr refs.ContainerID
+	cnr.WriteToV2(&msgCnr)
+
+	require.Equal(t, &msgCnr, msg.GetContainerID())
+}
+
+func TestSizeEstimation_Value(t *testing.T) {
+	var val container.SizeEstimation
+
+	require.Zero(t, val.Value())
+
+	const value = 876
+
+	val.SetValue(value)
+	require.EqualValues(t, value, val.Value())
+
+	var msg v2container.UsedSpaceAnnouncement
+	val.WriteToV2(&msg)
+
+	require.EqualValues(t, value, msg.GetUsedSpace())
+}
+
+func TestSizeEstimation_ReadFromV2(t *testing.T) {
+	const epoch = 654
+	const value = 903
+	var cnrMsg refs.ContainerID
+
+	var msg v2container.UsedSpaceAnnouncement
+
+	var val container.SizeEstimation
+
+	require.Error(t, val.ReadFromV2(msg))
+
+	msg.SetContainerID(&cnrMsg)
+
+	require.Error(t, val.ReadFromV2(msg))
+
+	cnrMsg.SetValue(make([]byte, sha256.Size))
+
+	var cnr cid.ID
+	require.NoError(t, cnr.ReadFromV2(cnrMsg))
+
+	msg.SetEpoch(epoch)
+	msg.SetUsedSpace(value)
+
+	require.NoError(t, val.ReadFromV2(msg))
+
+	require.EqualValues(t, epoch, val.Epoch())
+	require.EqualValues(t, value, val.Value())
+	require.EqualValues(t, cnr, val.Container())
+}

container/test/generate.go

@@ -3,10 +3,11 @@ package containertest
 import (
 	"math/rand"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
+	"github.com/TrueCloudLab/frostfs-sdk-go/container"
-	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl"
+	"github.com/TrueCloudLab/frostfs-sdk-go/container/acl"
-	netmaptest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap/test"
+	cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
-	usertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user/test"
+	netmaptest "github.com/TrueCloudLab/frostfs-sdk-go/netmap/test"
+	usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test"
 )
 
 // Container returns random container.Container.
@@ -15,13 +16,22 @@ func Container() (x container.Container) {
 
 	x.Init()
 	x.SetAttribute("some attribute", "value")
-	x.SetOwner(owner)
+	x.SetOwner(*owner)
 	x.SetBasicACL(BasicACL())
 	x.SetPlacementPolicy(netmaptest.PlacementPolicy())
 
 	return x
 }
 
+// SizeEstimation returns random container.SizeEstimation.
+func SizeEstimation() (x container.SizeEstimation) {
+	x.SetContainer(cidtest.ID())
+	x.SetEpoch(rand.Uint64())
+	x.SetValue(rand.Uint64())
+
+	return x
+}
+
 // BasicACL returns random acl.Basic.
 func BasicACL() (x acl.Basic) {
 	x.FromBits(rand.Uint32())

crypto/crypto_test.go

@@ -1,12 +1,12 @@
 package frostfscrypto_test
 
 import (
-	"crypto/rand"
+	"math/rand"
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	"github.com/TrueCloudLab/frostfs-api-go/v2/refs"
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
+	frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
-	frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
+	frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/stretchr/testify/require"
 )

crypto/doc.go

@@ -25,11 +25,11 @@ PublicKey allows to verify signatures.
 	// ...
 
 Signature can be also used to process FrostFS API V2 protocol messages
-(see neo.fs.v2.refs package in https://git.frostfs.info/TrueCloudLab/frostfs-api).
+(see neo.fs.v2.refs package in https://github.com/TrueCloudLab/frostfs-api).
 
 On client side:
 
-	import "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
+	import "github.com/TrueCloudLab/frostfs-api-go/v2/refs"
 
 	var msg refs.Signature
 	sig.WriteToV2(&msg)

crypto/ecdsa/init.go

@@ -1,6 +1,6 @@
 package frostfsecdsa
 
-import frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
+import frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
 
 func init() {
 	frostfscrypto.RegisterScheme(frostfscrypto.ECDSA_SHA512, func() frostfscrypto.PublicKey {

crypto/ecdsa/signer.go

@@ -6,7 +6,7 @@ import (
 	"crypto/rand"
 	"crypto/sha512"
 
-	frostfscrypto "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto"
+	frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto"
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 )