From daea5570f4bef62eea45a1fdd3dfa0c5db1ae931 Mon Sep 17 00:00:00 2001
From: aarifullin <a.arifullin@yadro.com>
Date: Wed, 1 Nov 2023 18:18:28 +0300
Subject: [PATCH] [#777] client: Refactor PrmContainerList, PrmObjectSearch 
 usage

Signed-off-by: Airat Arifullin <a.arifullin@yadro.com>
---
 cmd/frostfs-cli/internal/client/client.go     |  23 +++++-----------
 cmd/frostfs-cli/modules/container/list.go     |   2 +-
 go.mod                                        |   2 +-
 go.sum                                        | Bin 164535 -> 164535 bytes
 pkg/services/object/internal/client/client.go |  26 +++++-------------
 5 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/cmd/frostfs-cli/internal/client/client.go b/cmd/frostfs-cli/internal/client/client.go
index b370ff3aa..9807e111c 100644
--- a/cmd/frostfs-cli/internal/client/client.go
+++ b/cmd/frostfs-cli/internal/client/client.go
@@ -689,24 +689,15 @@ func (x SearchObjectsRes) IDList() []oid.ID {
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func SearchObjects(ctx context.Context, prm SearchObjectsPrm) (*SearchObjectsRes, error) {
-	var cliPrm client.PrmObjectSearch
-	cliPrm.InContainer(prm.cnrID)
-	cliPrm.SetFilters(prm.filters)
-
-	if prm.sessionToken != nil {
-		cliPrm.WithinSession(*prm.sessionToken)
+	cliPrm := client.PrmObjectSearch{
+		XHeaders:    prm.xHeaders,
+		Local:       prm.local,
+		BearerToken: prm.bearerToken,
+		Session:     prm.sessionToken,
+		ContainerID: &prm.cnrID,
+		Filters:     prm.filters,
 	}
 
-	if prm.bearerToken != nil {
-		cliPrm.WithBearerToken(*prm.bearerToken)
-	}
-
-	if prm.local {
-		cliPrm.MarkLocal()
-	}
-
-	cliPrm.WithXHeaders(prm.xHeaders...)
-
 	rdr, err := prm.cli.ObjectSearchInit(ctx, cliPrm)
 	if err != nil {
 		return nil, fmt.Errorf("init object search: %w", err)
diff --git a/cmd/frostfs-cli/modules/container/list.go b/cmd/frostfs-cli/modules/container/list.go
index 1c7787760..1e7ba96ea 100644
--- a/cmd/frostfs-cli/modules/container/list.go
+++ b/cmd/frostfs-cli/modules/container/list.go
@@ -47,7 +47,7 @@ var listContainersCmd = &cobra.Command{
 
 		var prm internalclient.ListContainersPrm
 		prm.SetClient(cli)
-		prm.SetAccount(idUser)
+		prm.Account = &idUser
 
 		res, err := internalclient.ListContainers(cmd.Context(), prm)
 		commonCmd.ExitOnErr(cmd, "rpc error: %w", err)
diff --git a/go.mod b/go.mod
index 0c6731363..4422a3041 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.0
 	git.frostfs.info/TrueCloudLab/frostfs-contract v0.18.0
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20231027075445-a02c0bfac885
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20231101144515-6fbe1595cb3d
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	github.com/cheggaaa/pb v1.0.29
diff --git a/go.sum b/go.sum
index 6fb57f4f4d7136de07c8b6b5fa78ca85a6d603e3..aee734c23cd036cedf0134da9a9d4c2d1dd82d4d 100644
GIT binary patch
delta 119
zcmdnq%C)_fYeQVWtD%9Rp^1s9p{cG}T2iW^sikRhl5vVchM|>rm`AZ+v1@*6N}!>3
zns%y7p@oH`n|HQPYJhuMUS)cTNm6oXV3BirK>6g0JsOj}`-R1@o7ViLfBTny#>1Zg
D_*E#Q

delta 119
zcmdnq%C)_fYeQVWtAUZZfw`%PiK%X)fl;zSQd(lNg@vg?hM`qSl7DD=exjdoX|Y>K
zsH0`JnNgLcS!tk4ke^p*W|d_~MU_{Pp<_v~TmIyWJsOj}`-R1@o7ViLfBTny#>1Zg
D1g$8h

diff --git a/pkg/services/object/internal/client/client.go b/pkg/services/object/internal/client/client.go
index e0a7e562a..dd2de0fd1 100644
--- a/pkg/services/object/internal/client/client.go
+++ b/pkg/services/object/internal/client/client.go
@@ -474,12 +474,12 @@ type SearchObjectsPrm struct {
 //
 // Required parameter.
 func (x *SearchObjectsPrm) SetContainerID(id cid.ID) {
-	x.cliPrm.InContainer(id)
+	x.cliPrm.ContainerID = &id
 }
 
 // SetFilters sets search filters.
 func (x *SearchObjectsPrm) SetFilters(fs objectSDK.SearchFilters) {
-	x.cliPrm.SetFilters(fs)
+	x.cliPrm.Filters = fs
 }
 
 // SearchObjectsRes groups the resulting values of SearchObjects operation.
@@ -496,23 +496,11 @@ func (x SearchObjectsRes) IDList() []oid.ID {
 //
 // Returns any error which prevented the operation from completing correctly in error return.
 func SearchObjects(ctx context.Context, prm SearchObjectsPrm) (*SearchObjectsRes, error) {
-	if prm.local {
-		prm.cliPrm.MarkLocal()
-	}
-
-	if prm.tokenSession != nil {
-		prm.cliPrm.WithinSession(*prm.tokenSession)
-	}
-
-	if prm.tokenBearer != nil {
-		prm.cliPrm.WithBearerToken(*prm.tokenBearer)
-	}
-
-	prm.cliPrm.WithXHeaders(prm.xHeaders...)
-
-	if prm.key != nil {
-		prm.cliPrm.UseKey(*prm.key)
-	}
+	prm.cliPrm.Local = prm.local
+	prm.cliPrm.Session = prm.tokenSession
+	prm.cliPrm.BearerToken = prm.tokenBearer
+	prm.cliPrm.XHeaders = prm.xHeaders
+	prm.cliPrm.Key = prm.key
 
 	rdr, err := prm.cli.ObjectSearchInit(ctx, prm.cliPrm)
 	if err != nil {