forked from TrueCloudLab/frostfs-node
[#1384] neofs-cli: move storagegroup command to a separate package
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov
parent
a219e3a667
commit
fd48b96082
8 changed files with 381 additions and 343 deletions
|
|
@ -16,6 +16,7 @@ import (
|
||||||
netmapCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/netmap"
|
netmapCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/netmap"
|
||||||
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
||||||
sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session"
|
sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session"
|
||||||
|
sgCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/storagegroup"
|
||||||
utilCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util"
|
utilCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util"
|
||||||
"github.com/nspcc-dev/neofs-node/misc"
|
"github.com/nspcc-dev/neofs-node/misc"
|
||||||
"github.com/nspcc-dev/neofs-node/pkg/util/gendoc"
|
"github.com/nspcc-dev/neofs-node/pkg/util/gendoc"
|
||||||
|
|
@ -80,6 +81,7 @@ func init() {
|
||||||
rootCmd.AddCommand(utilCli.Cmd)
|
rootCmd.AddCommand(utilCli.Cmd)
|
||||||
rootCmd.AddCommand(netmapCli.Cmd)
|
rootCmd.AddCommand(netmapCli.Cmd)
|
||||||
rootCmd.AddCommand(objectCli.Cmd)
|
rootCmd.AddCommand(objectCli.Cmd)
|
||||||
|
rootCmd.AddCommand(sgCli.Cmd)
|
||||||
rootCmd.AddCommand(gendoc.Command(rootCmd))
|
rootCmd.AddCommand(gendoc.Command(rootCmd))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,343 +0,0 @@
|
||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"crypto/ecdsa"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
|
|
||||||
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
|
|
||||||
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
|
|
||||||
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
|
|
||||||
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
|
||||||
sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session"
|
|
||||||
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/storagegroup"
|
|
||||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/object"
|
|
||||||
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
|
||||||
storagegroupAPI "github.com/nspcc-dev/neofs-sdk-go/storagegroup"
|
|
||||||
"github.com/nspcc-dev/neofs-sdk-go/user"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
// storagegroupCmd represents the storagegroup command
|
|
||||||
var storagegroupCmd = &cobra.Command{
|
|
||||||
Use: "storagegroup",
|
|
||||||
Short: "Operations with Storage Groups",
|
|
||||||
Long: `Operations with Storage Groups`,
|
|
||||||
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
|
||||||
// bind exactly that cmd's flags to
|
|
||||||
// the viper before execution
|
|
||||||
commonflags.Bind(cmd)
|
|
||||||
commonflags.BindAPI(cmd)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var sgPutCmd = &cobra.Command{
|
|
||||||
Use: "put",
|
|
||||||
Short: "Put storage group to NeoFS",
|
|
||||||
Long: "Put storage group to NeoFS",
|
|
||||||
Run: putSG,
|
|
||||||
}
|
|
||||||
|
|
||||||
var sgGetCmd = &cobra.Command{
|
|
||||||
Use: "get",
|
|
||||||
Short: "Get storage group from NeoFS",
|
|
||||||
Long: "Get storage group from NeoFS",
|
|
||||||
Run: getSG,
|
|
||||||
}
|
|
||||||
|
|
||||||
var sgListCmd = &cobra.Command{
|
|
||||||
Use: "list",
|
|
||||||
Short: "List storage groups in NeoFS container",
|
|
||||||
Long: "List storage groups in NeoFS container",
|
|
||||||
Run: listSG,
|
|
||||||
}
|
|
||||||
|
|
||||||
var sgDelCmd = &cobra.Command{
|
|
||||||
Use: "delete",
|
|
||||||
Short: "Delete storage group from NeoFS",
|
|
||||||
Long: "Delete storage group from NeoFS",
|
|
||||||
Run: delSG,
|
|
||||||
}
|
|
||||||
|
|
||||||
const (
|
|
||||||
sgMembersFlag = "members"
|
|
||||||
sgIDFlag = "id"
|
|
||||||
sgRawFlag = "raw"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
sgMembers []string
|
|
||||||
sgID string
|
|
||||||
)
|
|
||||||
|
|
||||||
func initSGPutCmd() {
|
|
||||||
commonflags.Init(sgPutCmd)
|
|
||||||
|
|
||||||
flags := sgPutCmd.Flags()
|
|
||||||
|
|
||||||
flags.String("cid", "", "Container ID")
|
|
||||||
_ = sgPutCmd.MarkFlagRequired("cid")
|
|
||||||
|
|
||||||
flags.StringSliceVarP(&sgMembers, sgMembersFlag, "m", nil, "ID list of storage group members")
|
|
||||||
_ = sgPutCmd.MarkFlagRequired(sgMembersFlag)
|
|
||||||
}
|
|
||||||
|
|
||||||
func initSGGetCmd() {
|
|
||||||
commonflags.Init(sgGetCmd)
|
|
||||||
|
|
||||||
flags := sgGetCmd.Flags()
|
|
||||||
|
|
||||||
flags.String("cid", "", "Container ID")
|
|
||||||
_ = sgGetCmd.MarkFlagRequired("cid")
|
|
||||||
|
|
||||||
flags.StringVarP(&sgID, sgIDFlag, "", "", "storage group identifier")
|
|
||||||
_ = sgGetCmd.MarkFlagRequired(sgIDFlag)
|
|
||||||
|
|
||||||
flags.Bool(sgRawFlag, false, "Set raw request option")
|
|
||||||
}
|
|
||||||
|
|
||||||
func initSGListCmd() {
|
|
||||||
commonflags.Init(sgListCmd)
|
|
||||||
|
|
||||||
sgListCmd.Flags().String("cid", "", "Container ID")
|
|
||||||
_ = sgListCmd.MarkFlagRequired("cid")
|
|
||||||
}
|
|
||||||
|
|
||||||
func initSGDeleteCmd() {
|
|
||||||
commonflags.Init(sgDelCmd)
|
|
||||||
|
|
||||||
flags := sgDelCmd.Flags()
|
|
||||||
|
|
||||||
flags.String("cid", "", "Container ID")
|
|
||||||
_ = sgDelCmd.MarkFlagRequired("cid")
|
|
||||||
|
|
||||||
flags.StringVarP(&sgID, sgIDFlag, "", "", "storage group identifier")
|
|
||||||
_ = sgDelCmd.MarkFlagRequired(sgIDFlag)
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
storageGroupChildCommands := []*cobra.Command{
|
|
||||||
sgPutCmd,
|
|
||||||
sgGetCmd,
|
|
||||||
sgListCmd,
|
|
||||||
sgDelCmd,
|
|
||||||
}
|
|
||||||
|
|
||||||
rootCmd.AddCommand(storagegroupCmd)
|
|
||||||
storagegroupCmd.AddCommand(storageGroupChildCommands...)
|
|
||||||
|
|
||||||
for _, sgCommand := range storageGroupChildCommands {
|
|
||||||
objectCli.InitBearer(sgCommand)
|
|
||||||
commonflags.InitAPI(sgCommand)
|
|
||||||
}
|
|
||||||
|
|
||||||
initSGPutCmd()
|
|
||||||
initSGGetCmd()
|
|
||||||
initSGListCmd()
|
|
||||||
initSGDeleteCmd()
|
|
||||||
}
|
|
||||||
|
|
||||||
type sgHeadReceiver struct {
|
|
||||||
cmd *cobra.Command
|
|
||||||
key *ecdsa.PrivateKey
|
|
||||||
ownerID user.ID
|
|
||||||
prm internalclient.HeadObjectPrm
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c sgHeadReceiver) Head(addr oid.Address) (interface{}, error) {
|
|
||||||
obj := addr.Object()
|
|
||||||
|
|
||||||
sessionCli.Prepare(c.cmd, addr.Container(), &obj, c.key, &c.prm)
|
|
||||||
c.prm.SetAddress(addr)
|
|
||||||
|
|
||||||
res, err := internalclient.HeadObject(c.prm)
|
|
||||||
|
|
||||||
var errSplitInfo *object.SplitInfoError
|
|
||||||
|
|
||||||
switch {
|
|
||||||
default:
|
|
||||||
return nil, err
|
|
||||||
case err == nil:
|
|
||||||
return res.Header(), nil
|
|
||||||
case errors.As(err, &errSplitInfo):
|
|
||||||
return errSplitInfo.SplitInfo(), nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func putSG(cmd *cobra.Command, _ []string) {
|
|
||||||
pk := key.GetOrGenerate(cmd)
|
|
||||||
|
|
||||||
var ownerID user.ID
|
|
||||||
user.IDFromKey(&ownerID, pk.PublicKey)
|
|
||||||
|
|
||||||
var cnr cid.ID
|
|
||||||
|
|
||||||
err := readCID(cmd, &cnr)
|
|
||||||
common.ExitOnErr(cmd, "", err)
|
|
||||||
|
|
||||||
members := make([]oid.ID, len(sgMembers))
|
|
||||||
|
|
||||||
for i := range sgMembers {
|
|
||||||
err = members[i].DecodeString(sgMembers[i])
|
|
||||||
common.ExitOnErr(cmd, "could not parse object ID: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
headPrm internalclient.HeadObjectPrm
|
|
||||||
putPrm internalclient.PutObjectPrm
|
|
||||||
)
|
|
||||||
|
|
||||||
sessionCli.Prepare(cmd, cnr, nil, pk, &putPrm)
|
|
||||||
objectCli.Prepare(cmd, &headPrm, &putPrm)
|
|
||||||
|
|
||||||
headPrm.SetRawFlag(true)
|
|
||||||
|
|
||||||
sg, err := storagegroup.CollectMembers(sgHeadReceiver{
|
|
||||||
cmd: cmd,
|
|
||||||
key: pk,
|
|
||||||
ownerID: ownerID,
|
|
||||||
prm: headPrm,
|
|
||||||
}, cnr, members)
|
|
||||||
common.ExitOnErr(cmd, "could not collect storage group members: %w", err)
|
|
||||||
|
|
||||||
sgContent, err := sg.Marshal()
|
|
||||||
common.ExitOnErr(cmd, "could not marshal storage group: %w", err)
|
|
||||||
|
|
||||||
obj := object.New()
|
|
||||||
obj.SetContainerID(cnr)
|
|
||||||
obj.SetOwnerID(&ownerID)
|
|
||||||
obj.SetType(object.TypeStorageGroup)
|
|
||||||
|
|
||||||
putPrm.SetHeader(obj)
|
|
||||||
putPrm.SetPayloadReader(bytes.NewReader(sgContent))
|
|
||||||
|
|
||||||
res, err := internalclient.PutObject(putPrm)
|
|
||||||
common.ExitOnErr(cmd, "rpc error: %w", err)
|
|
||||||
|
|
||||||
cmd.Println("Storage group successfully stored")
|
|
||||||
cmd.Printf(" ID: %s\n CID: %s\n", res.ID(), cnr)
|
|
||||||
}
|
|
||||||
|
|
||||||
func getSGID() (*oid.ID, error) {
|
|
||||||
var obj oid.ID
|
|
||||||
err := obj.DecodeString(sgID)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("could not parse storage group ID: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return &obj, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getSG(cmd *cobra.Command, _ []string) {
|
|
||||||
var cnr cid.ID
|
|
||||||
|
|
||||||
err := readCID(cmd, &cnr)
|
|
||||||
common.ExitOnErr(cmd, "", err)
|
|
||||||
|
|
||||||
id, err := getSGID()
|
|
||||||
common.ExitOnErr(cmd, "", err)
|
|
||||||
|
|
||||||
var addr oid.Address
|
|
||||||
addr.SetContainer(cnr)
|
|
||||||
addr.SetObject(*id)
|
|
||||||
|
|
||||||
buf := bytes.NewBuffer(nil)
|
|
||||||
|
|
||||||
pk := key.GetOrGenerate(cmd)
|
|
||||||
|
|
||||||
var prm internalclient.GetObjectPrm
|
|
||||||
sessionCli.Prepare(cmd, cnr, id, pk, &prm)
|
|
||||||
objectCli.Prepare(cmd, &prm)
|
|
||||||
|
|
||||||
raw, _ := cmd.Flags().GetBool(sgRawFlag)
|
|
||||||
prm.SetRawFlag(raw)
|
|
||||||
prm.SetAddress(addr)
|
|
||||||
prm.SetPayloadWriter(buf)
|
|
||||||
|
|
||||||
_, err = internalclient.GetObject(prm)
|
|
||||||
common.ExitOnErr(cmd, "rpc error: %w", err)
|
|
||||||
|
|
||||||
var sg storagegroupAPI.StorageGroup
|
|
||||||
|
|
||||||
err = sg.Unmarshal(buf.Bytes())
|
|
||||||
common.ExitOnErr(cmd, "could not unmarshal storage group: %w", err)
|
|
||||||
|
|
||||||
cmd.Printf("Expiration epoch: %d\n", sg.ExpirationEpoch())
|
|
||||||
cmd.Printf("Group size: %d\n", sg.ValidationDataSize())
|
|
||||||
common.PrintChecksum(cmd, "Group hash", sg.ValidationDataHash)
|
|
||||||
|
|
||||||
if members := sg.Members(); len(members) > 0 {
|
|
||||||
cmd.Println("Members:")
|
|
||||||
|
|
||||||
for i := range members {
|
|
||||||
cmd.Printf("\t%s\n", members[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func listSG(cmd *cobra.Command, _ []string) {
|
|
||||||
var cnr cid.ID
|
|
||||||
|
|
||||||
err := readCID(cmd, &cnr)
|
|
||||||
common.ExitOnErr(cmd, "", err)
|
|
||||||
|
|
||||||
pk := key.GetOrGenerate(cmd)
|
|
||||||
|
|
||||||
var prm internalclient.SearchObjectsPrm
|
|
||||||
sessionCli.Prepare(cmd, cnr, nil, pk, &prm)
|
|
||||||
objectCli.Prepare(cmd, &prm)
|
|
||||||
prm.SetContainerID(cnr)
|
|
||||||
prm.SetFilters(storagegroup.SearchQuery())
|
|
||||||
|
|
||||||
res, err := internalclient.SearchObjects(prm)
|
|
||||||
common.ExitOnErr(cmd, "rpc error: %w", err)
|
|
||||||
|
|
||||||
ids := res.IDList()
|
|
||||||
|
|
||||||
cmd.Printf("Found %d storage groups.\n", len(ids))
|
|
||||||
|
|
||||||
for i := range ids {
|
|
||||||
cmd.Println(ids[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func delSG(cmd *cobra.Command, _ []string) {
|
|
||||||
var cnr cid.ID
|
|
||||||
|
|
||||||
err := readCID(cmd, &cnr)
|
|
||||||
common.ExitOnErr(cmd, "", err)
|
|
||||||
|
|
||||||
id, err := getSGID()
|
|
||||||
common.ExitOnErr(cmd, "", err)
|
|
||||||
|
|
||||||
var addr oid.Address
|
|
||||||
addr.SetContainer(cnr)
|
|
||||||
addr.SetObject(*id)
|
|
||||||
|
|
||||||
var prm internalclient.DeleteObjectPrm
|
|
||||||
|
|
||||||
pk := key.GetOrGenerate(cmd)
|
|
||||||
sessionCli.Prepare(cmd, cnr, id, pk, &prm)
|
|
||||||
objectCli.Prepare(cmd, &prm)
|
|
||||||
prm.SetAddress(addr)
|
|
||||||
|
|
||||||
res, err := internalclient.DeleteObject(prm)
|
|
||||||
common.ExitOnErr(cmd, "rpc error: %w", err)
|
|
||||||
|
|
||||||
tomb := res.Tombstone()
|
|
||||||
|
|
||||||
cmd.Println("Storage group removed successfully.")
|
|
||||||
cmd.Printf(" Tombstone: %s\n", tomb)
|
|
||||||
}
|
|
||||||
|
|
||||||
func readCID(cmd *cobra.Command, cnr *cid.ID) error {
|
|
||||||
err := cnr.DecodeString(cmd.Flag("cid").Value.String())
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("decode container ID string: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
54
cmd/neofs-cli/modules/storagegroup/delete.go
Normal file
54
cmd/neofs-cli/modules/storagegroup/delete.go
Normal file
|
|
@ -0,0 +1,54 @@
|
||||||
|
package storagegroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
|
||||||
|
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
||||||
|
sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session"
|
||||||
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
var sgDelCmd = &cobra.Command{
|
||||||
|
Use: "delete",
|
||||||
|
Short: "Delete storage group from NeoFS",
|
||||||
|
Long: "Delete storage group from NeoFS",
|
||||||
|
Run: delSG,
|
||||||
|
}
|
||||||
|
|
||||||
|
func initSGDeleteCmd() {
|
||||||
|
commonflags.Init(sgDelCmd)
|
||||||
|
|
||||||
|
flags := sgDelCmd.Flags()
|
||||||
|
|
||||||
|
flags.String("cid", "", "Container ID")
|
||||||
|
_ = sgDelCmd.MarkFlagRequired("cid")
|
||||||
|
|
||||||
|
flags.StringVarP(&sgID, sgIDFlag, "", "", "storage group identifier")
|
||||||
|
_ = sgDelCmd.MarkFlagRequired(sgIDFlag)
|
||||||
|
}
|
||||||
|
|
||||||
|
func delSG(cmd *cobra.Command, _ []string) {
|
||||||
|
pk := key.GetOrGenerate(cmd)
|
||||||
|
|
||||||
|
var cnr cid.ID
|
||||||
|
var obj oid.ID
|
||||||
|
|
||||||
|
addr := readObjectAddress(cmd, &cnr, &obj)
|
||||||
|
|
||||||
|
var prm internalclient.DeleteObjectPrm
|
||||||
|
sessionCli.Prepare(cmd, cnr, &obj, pk, &prm)
|
||||||
|
objectCli.Prepare(cmd, &prm)
|
||||||
|
prm.SetAddress(addr)
|
||||||
|
|
||||||
|
res, err := internalclient.DeleteObject(prm)
|
||||||
|
common.ExitOnErr(cmd, "rpc error: %w", err)
|
||||||
|
|
||||||
|
tombstone := res.Tombstone()
|
||||||
|
|
||||||
|
cmd.Println("Storage group removed successfully.")
|
||||||
|
cmd.Printf(" Tombstone: %s\n", tombstone)
|
||||||
|
}
|
||||||
82
cmd/neofs-cli/modules/storagegroup/get.go
Normal file
82
cmd/neofs-cli/modules/storagegroup/get.go
Normal file
|
|
@ -0,0 +1,82 @@
|
||||||
|
package storagegroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
|
||||||
|
internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
|
||||||
|
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
||||||
|
sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session"
|
||||||
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
|
storagegroupAPI "github.com/nspcc-dev/neofs-sdk-go/storagegroup"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
sgIDFlag = "id"
|
||||||
|
sgRawFlag = "raw"
|
||||||
|
)
|
||||||
|
|
||||||
|
var sgID string
|
||||||
|
|
||||||
|
var sgGetCmd = &cobra.Command{
|
||||||
|
Use: "get",
|
||||||
|
Short: "Get storage group from NeoFS",
|
||||||
|
Long: "Get storage group from NeoFS",
|
||||||
|
Run: getSG,
|
||||||
|
}
|
||||||
|
|
||||||
|
func initSGGetCmd() {
|
||||||
|
commonflags.Init(sgGetCmd)
|
||||||
|
|
||||||
|
flags := sgGetCmd.Flags()
|
||||||
|
|
||||||
|
flags.String("cid", "", "Container ID")
|
||||||
|
_ = sgGetCmd.MarkFlagRequired("cid")
|
||||||
|
|
||||||
|
flags.StringVarP(&sgID, sgIDFlag, "", "", "storage group identifier")
|
||||||
|
_ = sgGetCmd.MarkFlagRequired(sgIDFlag)
|
||||||
|
|
||||||
|
flags.Bool(sgRawFlag, false, "Set raw request option")
|
||||||
|
}
|
||||||
|
|
||||||
|
func getSG(cmd *cobra.Command, _ []string) {
|
||||||
|
var cnr cid.ID
|
||||||
|
var obj oid.ID
|
||||||
|
|
||||||
|
addr := readObjectAddress(cmd, &cnr, &obj)
|
||||||
|
pk := key.GetOrGenerate(cmd)
|
||||||
|
buf := bytes.NewBuffer(nil)
|
||||||
|
|
||||||
|
var prm internalclient.GetObjectPrm
|
||||||
|
sessionCli.Prepare(cmd, cnr, &obj, pk, &prm)
|
||||||
|
objectCli.Prepare(cmd, &prm)
|
||||||
|
|
||||||
|
raw, _ := cmd.Flags().GetBool(sgRawFlag)
|
||||||
|
prm.SetRawFlag(raw)
|
||||||
|
prm.SetAddress(addr)
|
||||||
|
prm.SetPayloadWriter(buf)
|
||||||
|
|
||||||
|
_, err := internalclient.GetObject(prm)
|
||||||
|
common.ExitOnErr(cmd, "rpc error: %w", err)
|
||||||
|
|
||||||
|
var sg storagegroupAPI.StorageGroup
|
||||||
|
|
||||||
|
err = sg.Unmarshal(buf.Bytes())
|
||||||
|
common.ExitOnErr(cmd, "could not unmarshal storage group: %w", err)
|
||||||
|
|
||||||
|
cmd.Printf("Expiration epoch: %d\n", sg.ExpirationEpoch())
|
||||||
|
cmd.Printf("Group size: %d\n", sg.ValidationDataSize())
|
||||||
|
common.PrintChecksum(cmd, "Group hash", sg.ValidationDataHash)
|
||||||
|
|
||||||
|
if members := sg.Members(); len(members) > 0 {
|
||||||
|
cmd.Println("Members:")
|
||||||
|
|
||||||
|
for i := range members {
|
||||||
|
cmd.Printf("\t%s\n", members[i].String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
51
cmd/neofs-cli/modules/storagegroup/list.go
Normal file
51
cmd/neofs-cli/modules/storagegroup/list.go
Normal file
|
|
@ -0,0 +1,51 @@
|
||||||
|
package storagegroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
|
||||||
|
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
||||||
|
sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session"
|
||||||
|
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/storagegroup"
|
||||||
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
var sgListCmd = &cobra.Command{
|
||||||
|
Use: "list",
|
||||||
|
Short: "List storage groups in NeoFS container",
|
||||||
|
Long: "List storage groups in NeoFS container",
|
||||||
|
Run: listSG,
|
||||||
|
}
|
||||||
|
|
||||||
|
func initSGListCmd() {
|
||||||
|
commonflags.Init(sgListCmd)
|
||||||
|
|
||||||
|
sgListCmd.Flags().String("cid", "", "Container ID")
|
||||||
|
_ = sgListCmd.MarkFlagRequired("cid")
|
||||||
|
}
|
||||||
|
|
||||||
|
func listSG(cmd *cobra.Command, _ []string) {
|
||||||
|
var cnr cid.ID
|
||||||
|
readCID(cmd, &cnr)
|
||||||
|
|
||||||
|
pk := key.GetOrGenerate(cmd)
|
||||||
|
|
||||||
|
var prm internalclient.SearchObjectsPrm
|
||||||
|
sessionCli.Prepare(cmd, cnr, nil, pk, &prm)
|
||||||
|
objectCli.Prepare(cmd, &prm)
|
||||||
|
prm.SetContainerID(cnr)
|
||||||
|
prm.SetFilters(storagegroup.SearchQuery())
|
||||||
|
|
||||||
|
res, err := internalclient.SearchObjects(prm)
|
||||||
|
common.ExitOnErr(cmd, "rpc error: %w", err)
|
||||||
|
|
||||||
|
ids := res.IDList()
|
||||||
|
|
||||||
|
cmd.Printf("Found %d storage groups.\n", len(ids))
|
||||||
|
|
||||||
|
for i := range ids {
|
||||||
|
cmd.Println(ids[i].String())
|
||||||
|
}
|
||||||
|
}
|
||||||
123
cmd/neofs-cli/modules/storagegroup/put.go
Normal file
123
cmd/neofs-cli/modules/storagegroup/put.go
Normal file
|
|
@ -0,0 +1,123 @@
|
||||||
|
package storagegroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"crypto/ecdsa"
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
|
||||||
|
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
||||||
|
sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session"
|
||||||
|
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/storagegroup"
|
||||||
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/object"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
|
oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
|
"github.com/nspcc-dev/neofs-sdk-go/user"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
const sgMembersFlag = "members"
|
||||||
|
|
||||||
|
var sgMembers []string
|
||||||
|
|
||||||
|
var sgPutCmd = &cobra.Command{
|
||||||
|
Use: "put",
|
||||||
|
Short: "Put storage group to NeoFS",
|
||||||
|
Long: "Put storage group to NeoFS",
|
||||||
|
Run: putSG,
|
||||||
|
}
|
||||||
|
|
||||||
|
func initSGPutCmd() {
|
||||||
|
commonflags.Init(sgPutCmd)
|
||||||
|
|
||||||
|
flags := sgPutCmd.Flags()
|
||||||
|
|
||||||
|
flags.String("cid", "", "Container ID")
|
||||||
|
_ = sgPutCmd.MarkFlagRequired("cid")
|
||||||
|
|
||||||
|
flags.StringSliceVarP(&sgMembers, sgMembersFlag, "m", nil, "ID list of storage group members")
|
||||||
|
_ = sgPutCmd.MarkFlagRequired(sgMembersFlag)
|
||||||
|
}
|
||||||
|
|
||||||
|
func putSG(cmd *cobra.Command, _ []string) {
|
||||||
|
pk := key.GetOrGenerate(cmd)
|
||||||
|
|
||||||
|
var ownerID user.ID
|
||||||
|
user.IDFromKey(&ownerID, pk.PublicKey)
|
||||||
|
|
||||||
|
var cnr cid.ID
|
||||||
|
readCID(cmd, &cnr)
|
||||||
|
|
||||||
|
members := make([]oidSDK.ID, len(sgMembers))
|
||||||
|
|
||||||
|
for i := range sgMembers {
|
||||||
|
err := members[i].DecodeString(sgMembers[i])
|
||||||
|
common.ExitOnErr(cmd, "could not parse object ID: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
headPrm internalclient.HeadObjectPrm
|
||||||
|
putPrm internalclient.PutObjectPrm
|
||||||
|
)
|
||||||
|
|
||||||
|
sessionCli.Prepare(cmd, cnr, nil, pk, &putPrm)
|
||||||
|
objectCli.Prepare(cmd, &headPrm, &putPrm)
|
||||||
|
|
||||||
|
headPrm.SetRawFlag(true)
|
||||||
|
|
||||||
|
sg, err := storagegroup.CollectMembers(sgHeadReceiver{
|
||||||
|
cmd: cmd,
|
||||||
|
key: pk,
|
||||||
|
ownerID: &ownerID,
|
||||||
|
prm: headPrm,
|
||||||
|
}, cnr, members)
|
||||||
|
common.ExitOnErr(cmd, "could not collect storage group members: %w", err)
|
||||||
|
|
||||||
|
sgContent, err := sg.Marshal()
|
||||||
|
common.ExitOnErr(cmd, "could not marshal storage group: %w", err)
|
||||||
|
|
||||||
|
obj := object.New()
|
||||||
|
obj.SetContainerID(cnr)
|
||||||
|
obj.SetOwnerID(&ownerID)
|
||||||
|
obj.SetType(object.TypeStorageGroup)
|
||||||
|
|
||||||
|
putPrm.SetHeader(obj)
|
||||||
|
putPrm.SetPayloadReader(bytes.NewReader(sgContent))
|
||||||
|
|
||||||
|
res, err := internalclient.PutObject(putPrm)
|
||||||
|
common.ExitOnErr(cmd, "rpc error: %w", err)
|
||||||
|
|
||||||
|
cmd.Println("Storage group successfully stored")
|
||||||
|
cmd.Printf(" ID: %s\n CID: %s\n", res.ID(), cnr)
|
||||||
|
}
|
||||||
|
|
||||||
|
type sgHeadReceiver struct {
|
||||||
|
cmd *cobra.Command
|
||||||
|
key *ecdsa.PrivateKey
|
||||||
|
ownerID *user.ID
|
||||||
|
prm internalclient.HeadObjectPrm
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c sgHeadReceiver) Head(addr oid.Address) (interface{}, error) {
|
||||||
|
obj := addr.Object()
|
||||||
|
|
||||||
|
sessionCli.Prepare(c.cmd, addr.Container(), &obj, c.key, &c.prm)
|
||||||
|
c.prm.SetAddress(addr)
|
||||||
|
|
||||||
|
res, err := internalclient.HeadObject(c.prm)
|
||||||
|
|
||||||
|
var errSplitInfo *object.SplitInfoError
|
||||||
|
|
||||||
|
switch {
|
||||||
|
default:
|
||||||
|
return nil, err
|
||||||
|
case err == nil:
|
||||||
|
return res.Header(), nil
|
||||||
|
case errors.As(err, &errSplitInfo):
|
||||||
|
return errSplitInfo.SplitInfo(), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
41
cmd/neofs-cli/modules/storagegroup/root.go
Normal file
41
cmd/neofs-cli/modules/storagegroup/root.go
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
package storagegroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
|
||||||
|
objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Cmd represents the storagegroup command
|
||||||
|
var Cmd = &cobra.Command{
|
||||||
|
Use: "storagegroup",
|
||||||
|
Short: "Operations with Storage Groups",
|
||||||
|
Long: `Operations with Storage Groups`,
|
||||||
|
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
||||||
|
// bind exactly that cmd's flags to
|
||||||
|
// the viper before execution
|
||||||
|
commonflags.Bind(cmd)
|
||||||
|
commonflags.BindAPI(cmd)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
storageGroupChildCommands := []*cobra.Command{
|
||||||
|
sgPutCmd,
|
||||||
|
sgGetCmd,
|
||||||
|
sgListCmd,
|
||||||
|
sgDelCmd,
|
||||||
|
}
|
||||||
|
|
||||||
|
Cmd.AddCommand(storageGroupChildCommands...)
|
||||||
|
|
||||||
|
for _, sgCommand := range storageGroupChildCommands {
|
||||||
|
objectCli.InitBearer(sgCommand)
|
||||||
|
commonflags.InitAPI(sgCommand)
|
||||||
|
}
|
||||||
|
|
||||||
|
initSGPutCmd()
|
||||||
|
initSGGetCmd()
|
||||||
|
initSGListCmd()
|
||||||
|
initSGDeleteCmd()
|
||||||
|
}
|
||||||
28
cmd/neofs-cli/modules/storagegroup/util.go
Normal file
28
cmd/neofs-cli/modules/storagegroup/util.go
Normal file
|
|
@ -0,0 +1,28 @@
|
||||||
|
package storagegroup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
|
||||||
|
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||||
|
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
)
|
||||||
|
|
||||||
|
func readObjectAddress(cmd *cobra.Command, cnr *cid.ID, obj *oid.ID) oid.Address {
|
||||||
|
readCID(cmd, cnr)
|
||||||
|
readSGID(cmd, obj)
|
||||||
|
|
||||||
|
var addr oid.Address
|
||||||
|
addr.SetContainer(*cnr)
|
||||||
|
addr.SetObject(*obj)
|
||||||
|
return addr
|
||||||
|
}
|
||||||
|
|
||||||
|
func readCID(cmd *cobra.Command, id *cid.ID) {
|
||||||
|
err := id.DecodeString(cmd.Flag("cid").Value.String())
|
||||||
|
common.ExitOnErr(cmd, "decode container ID string: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func readSGID(cmd *cobra.Command, id *oid.ID) {
|
||||||
|
err := id.DecodeString(cmd.Flag("oid").Value.String())
|
||||||
|
common.ExitOnErr(cmd, "decode storage group ID string: %w", err)
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue