forked from TrueCloudLab/frostfs-node
[#1556] Upgrade NeoFS SDK Go with changed container API
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich
LeL
parent
f699e82ea7
commit
c165d1a9b5
36 changed files with 207 additions and 480 deletions
|
|
@ -4,11 +4,9 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
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"
|
||||
|
|
@ -19,13 +17,11 @@ import (
|
|||
"github.com/nspcc-dev/neofs-sdk-go/session"
|
||||
subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
|
||||
"github.com/nspcc-dev/neofs-sdk-go/user"
|
||||
versionSDK "github.com/nspcc-dev/neofs-sdk-go/version"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var (
|
||||
containerACL string
|
||||
containerNonce string
|
||||
containerPolicy string
|
||||
containerAttributes []string
|
||||
containerAwait bool
|
||||
|
|
@ -52,18 +48,17 @@ It will be stored in sidechain when inner ring will accepts it.`,
|
|||
placementPolicy.RestrictSubnet(subnetID)
|
||||
}
|
||||
|
||||
attributes, err := parseAttributes(containerAttributes)
|
||||
var cnr container.Container
|
||||
cnr.Init()
|
||||
|
||||
err = parseAttributes(&cnr, containerAttributes)
|
||||
common.ExitOnErr(cmd, "", err)
|
||||
|
||||
var basicACL acl.Basic
|
||||
common.ExitOnErr(cmd, "decode basic ACL string: %w", basicACL.DecodeString(containerACL))
|
||||
|
||||
nonce, err := parseNonce(containerNonce)
|
||||
common.ExitOnErr(cmd, "", err)
|
||||
|
||||
key := key.GetOrGenerate(cmd)
|
||||
|
||||
cnr := container.New()
|
||||
var tok *session.Container
|
||||
|
||||
sessionTokenPath, _ := cmd.Flags().GetString(commonflags.SessionToken)
|
||||
|
|
@ -72,27 +67,22 @@ It will be stored in sidechain when inner ring will accepts it.`,
|
|||
common.ReadSessionToken(cmd, tok, sessionTokenPath)
|
||||
|
||||
issuer := tok.Issuer()
|
||||
cnr.SetOwnerID(&issuer)
|
||||
cnr.SetOwner(issuer)
|
||||
} else {
|
||||
var idOwner user.ID
|
||||
user.IDFromKey(&idOwner, key.PublicKey)
|
||||
|
||||
cnr.SetOwnerID(&idOwner)
|
||||
cnr.SetOwner(idOwner)
|
||||
}
|
||||
|
||||
ver := versionSDK.Current()
|
||||
|
||||
cnr.SetVersion(&ver)
|
||||
cnr.SetPlacementPolicy(placementPolicy)
|
||||
cnr.SetPlacementPolicy(*placementPolicy)
|
||||
cnr.SetBasicACL(basicACL)
|
||||
cnr.SetAttributes(attributes)
|
||||
cnr.SetNonceUUID(nonce)
|
||||
|
||||
cli := internalclient.GetSDKClientByFlag(cmd, key, commonflags.RPC)
|
||||
|
||||
var putPrm internalclient.PutContainerPrm
|
||||
putPrm.SetClient(cli)
|
||||
putPrm.SetContainer(*cnr)
|
||||
putPrm.SetContainer(cnr)
|
||||
|
||||
if tok != nil {
|
||||
putPrm.WithinSession(*tok)
|
||||
|
|
@ -137,7 +127,6 @@ func initContainerCreateCmd() {
|
|||
))
|
||||
flags.StringVarP(&containerPolicy, "policy", "p", "", "QL-encoded or JSON-encoded placement policy or path to file with it")
|
||||
flags.StringSliceVarP(&containerAttributes, "attributes", "a", nil, "comma separated pairs of container attributes in form of Key1=Value1,Key2=Value2")
|
||||
flags.StringVarP(&containerNonce, "nonce", "n", "", "UUIDv4 nonce value for container")
|
||||
flags.BoolVar(&containerAwait, "await", false, "block execution until container is persisted")
|
||||
flags.StringVar(&containerName, "name", "", "container name attribute")
|
||||
flags.BoolVar(&containerNoTimestamp, "disable-timestamp", false, "disable timestamp container attribute")
|
||||
|
|
@ -173,48 +162,23 @@ func parseContainerPolicy(policyString string) (*netmap.PlacementPolicy, error)
|
|||
return nil, errors.New("can't parse placement policy")
|
||||
}
|
||||
|
||||
func parseAttributes(attributes []string) ([]container.Attribute, error) {
|
||||
result := make([]container.Attribute, len(attributes), len(attributes)+2) // name + timestamp attributes
|
||||
|
||||
func parseAttributes(dst *container.Container, attributes []string) error {
|
||||
for i := range attributes {
|
||||
kvPair := strings.Split(attributes[i], attributeDelimiter)
|
||||
if len(kvPair) != 2 {
|
||||
return nil, errors.New("invalid container attribute")
|
||||
return errors.New("invalid container attribute")
|
||||
}
|
||||
|
||||
result[i].SetKey(kvPair[0])
|
||||
result[i].SetValue(kvPair[1])
|
||||
dst.SetAttribute(kvPair[0], kvPair[1])
|
||||
}
|
||||
|
||||
if !containerNoTimestamp {
|
||||
index := len(result)
|
||||
result = append(result, container.Attribute{})
|
||||
result[index].SetKey(container.AttributeTimestamp)
|
||||
result[index].SetValue(strconv.FormatInt(time.Now().Unix(), 10))
|
||||
container.SetCreationTime(dst, time.Now())
|
||||
}
|
||||
|
||||
if containerName != "" {
|
||||
index := len(result)
|
||||
result = append(result, container.Attribute{})
|
||||
result[index].SetKey(container.AttributeName)
|
||||
result[index].SetValue(containerName)
|
||||
container.SetName(dst, containerName)
|
||||
}
|
||||
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func parseNonce(nonce string) (uuid.UUID, error) {
|
||||
if nonce == "" {
|
||||
result := uuid.New()
|
||||
common.PrintVerbose("Generating container nonce: %s", result)
|
||||
|
||||
return result, nil
|
||||
}
|
||||
|
||||
uid, err := uuid.Parse(nonce)
|
||||
if err != nil {
|
||||
return uuid.UUID{}, fmt.Errorf("could not parse nonce: %w", err)
|
||||
}
|
||||
|
||||
return uid, nil
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import (
|
|||
"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
|
||||
"github.com/nspcc-dev/neofs-sdk-go/container"
|
||||
"github.com/nspcc-dev/neofs-sdk-go/container/acl"
|
||||
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
@ -26,13 +27,12 @@ var getContainerInfoCmd = &cobra.Command{
|
|||
Short: "Get container field info",
|
||||
Long: `Get container field info`,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
var cnr *container.Container
|
||||
var cnr container.Container
|
||||
|
||||
if containerPathFrom != "" {
|
||||
data, err := os.ReadFile(containerPathFrom)
|
||||
common.ExitOnErr(cmd, "can't read file: %w", err)
|
||||
|
||||
cnr = container.New()
|
||||
err = cnr.Unmarshal(data)
|
||||
common.ExitOnErr(cmd, "can't unmarshal container: %w", err)
|
||||
} else {
|
||||
|
|
@ -62,8 +62,7 @@ var getContainerInfoCmd = &cobra.Command{
|
|||
data, err = cnr.MarshalJSON()
|
||||
common.ExitOnErr(cmd, "can't JSON encode container: %w", err)
|
||||
} else {
|
||||
data, err = cnr.Marshal()
|
||||
common.ExitOnErr(cmd, "can't binary encode container: %w", err)
|
||||
data = cnr.Marshal()
|
||||
}
|
||||
|
||||
err = os.WriteFile(containerPathTo, data, 0644)
|
||||
|
|
@ -90,11 +89,7 @@ func (x *stringWriter) WriteString(s string) (n int, err error) {
|
|||
return len(s), nil
|
||||
}
|
||||
|
||||
func prettyPrintContainer(cmd *cobra.Command, cnr *container.Container, jsonEncoding bool) {
|
||||
if cnr == nil {
|
||||
return
|
||||
}
|
||||
|
||||
func prettyPrintContainer(cmd *cobra.Command, cnr container.Container, jsonEncoding bool) {
|
||||
if jsonEncoding {
|
||||
data, err := cnr.MarshalJSON()
|
||||
if err != nil {
|
||||
|
|
@ -111,45 +106,25 @@ func prettyPrintContainer(cmd *cobra.Command, cnr *container.Container, jsonEnco
|
|||
return
|
||||
}
|
||||
|
||||
id := container.CalculateID(cnr)
|
||||
var id cid.ID
|
||||
container.CalculateID(&id, cnr)
|
||||
cmd.Println("container ID:", id)
|
||||
|
||||
v := cnr.Version()
|
||||
cmd.Printf("version: %d.%d\n", v.Major(), v.Minor())
|
||||
|
||||
cmd.Println("owner ID:", cnr.OwnerID())
|
||||
cmd.Println("owner ID:", cnr.Owner())
|
||||
|
||||
basicACL := cnr.BasicACL()
|
||||
prettyPrintBasicACL(cmd, basicACL)
|
||||
|
||||
for _, attribute := range cnr.Attributes() {
|
||||
if attribute.Key() == container.AttributeTimestamp {
|
||||
cmd.Printf("attribute: %s=%s (%s)\n",
|
||||
attribute.Key(),
|
||||
attribute.Value(),
|
||||
common.PrettyPrintUnixTime(attribute.Value()))
|
||||
cmd.Println("created:", container.CreatedAt(cnr))
|
||||
|
||||
continue
|
||||
}
|
||||
cmd.Println("attributes:")
|
||||
cnr.IterateAttributes(func(key, val string) {
|
||||
cmd.Printf("\t%s=%s\n", key, val)
|
||||
})
|
||||
|
||||
cmd.Printf("attribute: %s=%s\n", attribute.Key(), attribute.Value())
|
||||
}
|
||||
|
||||
nonce, err := cnr.NonceUUID()
|
||||
if err == nil {
|
||||
cmd.Println("nonce:", nonce)
|
||||
} else {
|
||||
cmd.Println("invalid nonce:", err)
|
||||
}
|
||||
|
||||
pp := cnr.PlacementPolicy()
|
||||
if pp == nil {
|
||||
cmd.Println("missing placement policy")
|
||||
} else {
|
||||
cmd.Println("placement policy:")
|
||||
common.ExitOnErr(cmd, "write policy: %w", pp.WriteStringTo((*stringWriter)(cmd)))
|
||||
cmd.Println()
|
||||
}
|
||||
cmd.Println("placement policy:")
|
||||
common.ExitOnErr(cmd, "write policy: %w", cnr.PlacementPolicy().WriteStringTo((*stringWriter)(cmd)))
|
||||
cmd.Println()
|
||||
}
|
||||
|
||||
func prettyPrintBasicACL(cmd *cobra.Command, basicACL acl.Basic) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue