a-savchuk/frostfs-sdk-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-sdk-go
Code Pull requests Activity

[#48] client: Refactor ContainerGet()

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2023-04-13 08:58:14 +03:00
parent 8852b262f2
commit 8e2f77890f
1 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
client/container_get.go
View file

@ -9,6 +9,9 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs"
rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc" rpcapi "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc"
"git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/rpc/client" "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" "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
) )
@ -28,7 +31,7 @@ func (x *PrmContainerGet) SetContainer(id cid.ID) {
x.idSet = true x.idSet = true
} }
func (x *PrmContainerGet) formRequest(_ *Client) (*v2container.GetRequest, error) { func (x *PrmContainerGet) formRequest(c *Client) (*v2container.GetRequest, error) {
if !x.idSet { if !x.idSet {
return nil, errorMissingContainer return nil, errorMissingContainer
} }
@ -41,6 +44,7 @@ func (x *PrmContainerGet) formRequest(_ *Client) (*v2container.GetRequest, error
var req v2container.GetRequest var req v2container.GetRequest
req.SetBody(reqBody) req.SetBody(reqBody)
c.prepareRequest(&req, new(v2session.RequestMetaHeader))
return &req, nil return &req, nil
} }
@ -78,39 +82,27 @@ func (c *Client) ContainerGet(ctx context.Context, prm PrmContainerGet) (*ResCon
return nil, err return nil, err
} }
// init call context if err := signature.SignServiceMessage(&c.prm.key, req); err != nil {
return nil, fmt.Errorf("sign request: %w", err)
var ( }
cc contextCall
res ResContainerGet resp, err := rpcapi.GetContainer(&c.c, req, client.WithContext(ctx))
) if err != nil {
return nil, err
c.initCallContext(&cc) }
cc.meta = prm.prmCommonMeta
cc.req = req var res ResContainerGet
cc.statusRes = &res res.st, err = c.processResponse(resp)
cc.call = func() (responseV2, error) { if err != nil || !apistatus.IsSuccessful(res.st) {
return rpcapi.GetContainer(&c.c, req, client.WithContext(ctx)) return &res, err
} }
cc.result = func(r responseV2) {
resp := r.(*v2container.GetResponse)
cnrV2 := resp.GetBody().GetContainer() cnrV2 := resp.GetBody().GetContainer()
if cnrV2 == nil { if cnrV2 == nil {
cc.err = errors.New("missing container in response") return &res, errors.New("missing container in response")
return
} }
if err := res.cnr.ReadFromV2(*cnrV2); err != nil {
cc.err = res.cnr.ReadFromV2(*cnrV2) return &res, fmt.Errorf("invalid container in response: %w", err)
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 return &res, nil
} }