[#1614] adm/frostfsid: Add 'set-kv'
Signed-off-by: Alexander Chuprov <a.chuprov@yadro.com>
This commit is contained in:
parent
9b113c3156
commit
d76fd9ac75
4 changed files with 100 additions and 0 deletions
26
cmd/frostfs-adm/internal/commonflags/auto_complete.go
Normal file
26
cmd/frostfs-adm/internal/commonflags/auto_complete.go
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
package commonflags
|
||||||
|
|
||||||
|
import (
|
||||||
|
"slices"
|
||||||
|
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
"github.com/spf13/pflag"
|
||||||
|
)
|
||||||
|
|
||||||
|
func AutoCompleteFlags(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
|
||||||
|
var availableFlags []string
|
||||||
|
cmd.Flags().VisitAll(func(f *pflag.Flag) {
|
||||||
|
availableFlags = append(availableFlags, f.Name)
|
||||||
|
})
|
||||||
|
|
||||||
|
var usedFlags []string
|
||||||
|
cmd.Flags().Visit(func(f *pflag.Flag) {
|
||||||
|
usedFlags = append(usedFlags, f.Name)
|
||||||
|
})
|
||||||
|
|
||||||
|
unusedFlags := slices.DeleteFunc(availableFlags, func(name string) bool {
|
||||||
|
return slices.Contains(usedFlags, name)
|
||||||
|
})
|
||||||
|
|
||||||
|
return unusedFlags, cobra.ShellCompDirectiveDefault
|
||||||
|
}
|
|
@ -16,6 +16,13 @@ const (
|
||||||
EndpointFlagDesc = "N3 RPC node endpoint"
|
EndpointFlagDesc = "N3 RPC node endpoint"
|
||||||
EndpointFlagShort = "r"
|
EndpointFlagShort = "r"
|
||||||
|
|
||||||
|
WalletPath = "wallet"
|
||||||
|
WalletPathShorthand = "w"
|
||||||
|
WalletPathUsage = "Path to the wallet"
|
||||||
|
|
||||||
|
AdminWalletPath = "wallet-admin"
|
||||||
|
AdminWalletUsage = "Path to the admin wallet"
|
||||||
|
|
||||||
AlphabetWalletsFlag = "alphabet-wallets"
|
AlphabetWalletsFlag = "alphabet-wallets"
|
||||||
AlphabetWalletsFlagDesc = "Path to alphabet wallets dir"
|
AlphabetWalletsFlagDesc = "Path to alphabet wallets dir"
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
package frostfsid
|
package frostfsid
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math/big"
|
"math/big"
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
frostfsidclient "git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
|
frostfsidclient "git.frostfs.info/TrueCloudLab/frostfs-contract/frostfsid/client"
|
||||||
|
"git.frostfs.info/TrueCloudLab/frostfs-contract/nns"
|
||||||
frostfsidrpclient "git.frostfs.info/TrueCloudLab/frostfs-contract/rpcclient/frostfsid"
|
frostfsidrpclient "git.frostfs.info/TrueCloudLab/frostfs-contract/rpcclient/frostfsid"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags"
|
||||||
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/constants"
|
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/constants"
|
||||||
|
@ -38,6 +40,11 @@ const (
|
||||||
groupIDFlag = "group-id"
|
groupIDFlag = "group-id"
|
||||||
|
|
||||||
rootNamespacePlaceholder = "<root>"
|
rootNamespacePlaceholder = "<root>"
|
||||||
|
|
||||||
|
keyFlag = "key"
|
||||||
|
keyDescFlag = "Key for storing a value in the subject's KV storage"
|
||||||
|
valueFlag = "value"
|
||||||
|
valueDescFlag = "Value to be stored in the subject's KV storage"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -151,6 +158,15 @@ var (
|
||||||
},
|
},
|
||||||
Run: frostfsidListGroupSubjects,
|
Run: frostfsidListGroupSubjects,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
frostfsidSetKVCmd = &cobra.Command{
|
||||||
|
Use: "set-kv",
|
||||||
|
Short: "Store a key-value pair in the subject's KV storage",
|
||||||
|
PreRun: func(cmd *cobra.Command, _ []string) {
|
||||||
|
_ = viper.BindPFlag(commonflags.EndpointFlag, cmd.Flags().Lookup(commonflags.EndpointFlag))
|
||||||
|
},
|
||||||
|
Run: frostfsidSetKV,
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func initFrostfsIDCreateNamespaceCmd() {
|
func initFrostfsIDCreateNamespaceCmd() {
|
||||||
|
@ -236,6 +252,25 @@ func initFrostfsIDListGroupSubjectsCmd() {
|
||||||
frostfsidListGroupSubjectsCmd.Flags().Bool(includeNamesFlag, false, "Whether include subject name (require additional requests)")
|
frostfsidListGroupSubjectsCmd.Flags().Bool(includeNamesFlag, false, "Whether include subject name (require additional requests)")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func initFrostfsIDSetKVCmd() {
|
||||||
|
Cmd.AddCommand(frostfsidSetKVCmd)
|
||||||
|
frostfsidSetKVCmd.Flags().StringP(commonflags.EndpointFlag, commonflags.EndpointFlagShort, "", commonflags.EndpointFlagDesc)
|
||||||
|
frostfsidSetKVCmd.Flags().String(subjectAddressFlag, "", "Subject address")
|
||||||
|
frostfsidSetKVCmd.Flags().String(keyFlag, "", keyDescFlag)
|
||||||
|
frostfsidSetKVCmd.Flags().String(valueFlag, "", valueDescFlag)
|
||||||
|
|
||||||
|
frostfsidSetKVCmd.ValidArgsFunction = commonflags.AutoCompleteFlags
|
||||||
|
|
||||||
|
_ = frostfsidSetKVCmd.RegisterFlagCompletionFunc(keyFlag, func(_ *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
|
||||||
|
flags := make([]string, 0, len(wellKnownFlags))
|
||||||
|
for k := range wellKnownFlags {
|
||||||
|
flags = append(flags, k)
|
||||||
|
}
|
||||||
|
|
||||||
|
return flags, cobra.ShellCompDirectiveDefault
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func frostfsidCreateNamespace(cmd *cobra.Command, _ []string) {
|
func frostfsidCreateNamespace(cmd *cobra.Command, _ []string) {
|
||||||
ns := getFrostfsIDNamespace(cmd)
|
ns := getFrostfsIDNamespace(cmd)
|
||||||
|
|
||||||
|
@ -403,6 +438,37 @@ func frostfsidRemoveSubjectFromGroup(cmd *cobra.Command, _ []string) {
|
||||||
commonCmd.ExitOnErr(cmd, "remove subject from group error: %w", err)
|
commonCmd.ExitOnErr(cmd, "remove subject from group error: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var wellKnownFlags = map[string]string{
|
||||||
|
nns.FrostfsIDNNSTLDPermissionKey: nns.FrostfsIDTLDRegistrationAllowed,
|
||||||
|
}
|
||||||
|
|
||||||
|
func frostfsidSetKV(cmd *cobra.Command, _ []string) {
|
||||||
|
subjectAddress := getFrostfsIDSubjectAddress(cmd)
|
||||||
|
key, _ := cmd.Flags().GetString(keyFlag)
|
||||||
|
value, _ := cmd.Flags().GetString(valueFlag)
|
||||||
|
|
||||||
|
for wellKnownKey, wellKnownValue := range wellKnownFlags {
|
||||||
|
if key == wellKnownKey && value == "" {
|
||||||
|
value = wellKnownValue
|
||||||
|
cmd.Println("Use the default value for a well-known flag.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if key == "" {
|
||||||
|
commonCmd.ExitOnErr(cmd, "", errors.New("key can't be empty"))
|
||||||
|
}
|
||||||
|
|
||||||
|
ffsid, err := newFrostfsIDClient(cmd)
|
||||||
|
commonCmd.ExitOnErr(cmd, "init contract client: %w", err)
|
||||||
|
|
||||||
|
method, args := ffsid.roCli.SetSubjectKVCall(subjectAddress, key, value)
|
||||||
|
|
||||||
|
ffsid.addCall(method, args)
|
||||||
|
|
||||||
|
err = ffsid.sendWait()
|
||||||
|
commonCmd.ExitOnErr(cmd, "failed to set: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
func frostfsidListGroupSubjects(cmd *cobra.Command, _ []string) {
|
func frostfsidListGroupSubjects(cmd *cobra.Command, _ []string) {
|
||||||
ns := getFrostfsIDNamespace(cmd)
|
ns := getFrostfsIDNamespace(cmd)
|
||||||
groupID := getFrostfsIDGroupID(cmd)
|
groupID := getFrostfsIDGroupID(cmd)
|
||||||
|
|
|
@ -12,6 +12,7 @@ func init() {
|
||||||
initFrostfsIDAddSubjectToGroupCmd()
|
initFrostfsIDAddSubjectToGroupCmd()
|
||||||
initFrostfsIDRemoveSubjectFromGroupCmd()
|
initFrostfsIDRemoveSubjectFromGroupCmd()
|
||||||
initFrostfsIDListGroupSubjectsCmd()
|
initFrostfsIDListGroupSubjectsCmd()
|
||||||
|
initFrostfsIDSetKVCmd()
|
||||||
initFrostfsIDAddSubjectKeyCmd()
|
initFrostfsIDAddSubjectKeyCmd()
|
||||||
initFrostfsIDRemoveSubjectKeyCmd()
|
initFrostfsIDRemoveSubjectKeyCmd()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue