realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#1131] *: Adopt SDK changes

Browse source 
`object.Address` has been moved to `object/address`
`object.ID` has been moved to `object/id`

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-01-26 15:11:13 +03:00 • committed by Alex Vanin
parent 1c821d6c36
commit 1667ec9e6d
139 changed files with 652 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/neofs-cli/modules/control.go
View file

@ -11,7 +11,7 @@ import (
ircontrolsrv "github.com/nspcc-dev/neofs-node/pkg/services/control/ir/server"
controlSvc "github.com/nspcc-dev/neofs-node/pkg/services/control/server"
"github.com/nspcc-dev/neofs-sdk-go/client"
"github.com/nspcc-dev/neofs-sdk-go/object"
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
"github.com/nspcc-dev/neofs-sdk-go/util/signature"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@ -325,7 +325,7 @@ var dropObjectsCmd = &cobra.Command{
binAddrList := make([][]byte, 0, len(dropObjectsList))
for i := range dropObjectsList {
a := object.NewAddress()
a := addressSDK.NewAddress()
err := a.Parse(dropObjectsList[i])
if err != nil {

12
cmd/neofs-cli/modules/object.go
View file

@ -17,6 +17,8 @@ import (
"github.com/nspcc-dev/neofs-sdk-go/checksum"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
"github.com/nspcc-dev/neofs-sdk-go/object"
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
"github.com/nspcc-dev/neofs-sdk-go/owner"
"github.com/nspcc-dev/neofs-sdk-go/session"
"github.com/nspcc-dev/neofs-sdk-go/token"
@ -669,7 +671,7 @@ func parseSearchFilters(cmd *cobra.Command) (object.SearchFilters, error) {
oid, _ := cmd.Flags().GetString(searchOIDFlag)
if oid != "" {
id := object.NewID()
id := oidSDK.NewID()
if err := id.Parse(oid); err != nil {
return nil, fmt.Errorf("could not parse object ID: %w", err)
}
@ -731,8 +733,8 @@ func getCID(cmd *cobra.Command) (*cid.ID, error) {
return id, nil
}
func getOID(cmd *cobra.Command) (*object.ID, error) {
oid := object.NewID()
func getOID(cmd *cobra.Command) (*oidSDK.ID, error) {
oid := oidSDK.NewID()
err := oid.Parse(cmd.Flag("oid").Value.String())
if err != nil {
@ -742,7 +744,7 @@ func getOID(cmd *cobra.Command) (*object.ID, error) {
return oid, nil
}
func getObjectAddress(cmd *cobra.Command) (*object.Address, error) {
func getObjectAddress(cmd *cobra.Command) (*addressSDK.Address, error) {
cid, err := getCID(cmd)
if err != nil {
return nil, err
@ -752,7 +754,7 @@ func getObjectAddress(cmd *cobra.Command) (*object.Address, error) {
return nil, err
}
objAddr := object.NewAddress()
objAddr := addressSDK.NewAddress()
objAddr.SetContainerID(cid)
objAddr.SetObjectID(oid)
return objAddr, nil

16
cmd/neofs-cli/modules/storagegroup.go
View file

@ -9,6 +9,8 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/storagegroup"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
storagegroupAPI "github.com/nspcc-dev/neofs-sdk-go/storagegroup"
"github.com/spf13/cobra"
)
@ -136,7 +138,7 @@ type sgHeadReceiver struct {
prm internalclient.HeadObjectPrm
}
func (c sgHeadReceiver) Head(addr *objectSDK.Address) (interface{}, error) {
func (c sgHeadReceiver) Head(addr *addressSDK.Address) (interface{}, error) {
c.prm.SetAddress(addr)
res, err := internalclient.HeadObject(c.prm)
@ -163,10 +165,10 @@ func putSG(cmd *cobra.Command, _ []string) {
cid, err := getCID(cmd)
exitOnErr(cmd, err)
members := make([]*objectSDK.ID, 0, len(sgMembers))
members := make([]*oidSDK.ID, 0, len(sgMembers))
for i := range sgMembers {
id := objectSDK.NewID()
id := oidSDK.NewID()
err = id.Parse(sgMembers[i])
exitOnErr(cmd, errf("could not parse object ID: %w", err))
@ -207,8 +209,8 @@ func putSG(cmd *cobra.Command, _ []string) {
cmd.Printf(" ID: %s\n CID: %s\n", res.ID(), cid)
}
func getSGID() (*objectSDK.ID, error) {
oid := objectSDK.NewID()
func getSGID() (*oidSDK.ID, error) {
oid := oidSDK.NewID()
err := oid.Parse(sgID)
if err != nil {
return nil, fmt.Errorf("could not parse storage group ID: %w", err)
@ -224,7 +226,7 @@ func getSG(cmd *cobra.Command, _ []string) {
id, err := getSGID()
exitOnErr(cmd, err)
addr := objectSDK.NewAddress()
addr := addressSDK.NewAddress()
addr.SetContainerID(cid)
addr.SetObjectID(id)
@ -288,7 +290,7 @@ func delSG(cmd *cobra.Command, _ []string) {
id, err := getSGID()
exitOnErr(cmd, err)
addr := objectSDK.NewAddress()
addr := addressSDK.NewAddress()
addr.SetContainerID(cid)
addr.SetObjectID(id)