adm: Add get/set-admin
commands #880
4 changed files with 63 additions and 1 deletions
|
@ -7,6 +7,7 @@ import (
|
||||||
parseutil "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util"
|
parseutil "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util"
|
||||||
commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
|
commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
|
||||||
apechain "git.frostfs.info/TrueCloudLab/policy-engine/pkg/chain"
|
apechain "git.frostfs.info/TrueCloudLab/policy-engine/pkg/chain"
|
||||||
|
"github.com/nspcc-dev/neo-go/pkg/util"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
)
|
)
|
||||||
|
@ -26,6 +27,8 @@ const (
|
||||||
targetNameDesc = "Resource name in APE resource name format"
|
targetNameDesc = "Resource name in APE resource name format"
|
||||||
targetTypeFlag = "target-type"
|
targetTypeFlag = "target-type"
|
||||||
targetTypeDesc = "Resource type(container/namespace)"
|
targetTypeDesc = "Resource type(container/namespace)"
|
||||||
|
addrAdminFlag = "addr"
|
||||||
|
addrAdminDesc = "The address of the admins wallet"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -63,6 +66,26 @@ var (
|
||||||
},
|
},
|
||||||
Run: listRuleChains,
|
Run: listRuleChains,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setAdminCmd = &cobra.Command{
|
||||||
|
Use: "set-admin",
|
||||||
|
Short: "Set admin",
|
||||||
|
PreRun: func(cmd *cobra.Command, _ []string) {
|
||||||
|
_ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag))
|
||||||
|
_ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag))
|
||||||
|
},
|
||||||
|
Run: setAdmin,
|
||||||
|
}
|
||||||
|
|
||||||
|
getAdminCmd = &cobra.Command{
|
||||||
|
Use: "get-admin",
|
||||||
|
Short: "Get admin",
|
||||||
|
PreRun: func(cmd *cobra.Command, _ []string) {
|
||||||
|
_ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag))
|
||||||
|
_ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag))
|
||||||
|
},
|
||||||
|
Run: getAdmin,
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func initAddRuleChainCmd() {
|
func initAddRuleChainCmd() {
|
||||||
|
@ -110,6 +133,22 @@ func initListRuleChainsCmd() {
|
||||||
listRuleChainsCmd.Flags().Bool(jsonFlag, false, jsonFlagDesc)
|
listRuleChainsCmd.Flags().Bool(jsonFlag, false, jsonFlagDesc)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func initSetAdminCmd() {
|
||||||
|
apeCmd.AddCommand(setAdminCmd)
|
||||||
|
|
||||||
|
setAdminCmd.Flags().StringP(endpointFlag, endpointFlagShort, "", endpointFlagDesc)
|
||||||
|
setAdminCmd.Flags().String(alphabetWalletsFlag, "", alphabetWalletsFlagDesc)
|
||||||
|
setAdminCmd.Flags().String(addrAdminFlag, "", addrAdminDesc)
|
||||||
|
_ = setAdminCmd.MarkFlagRequired(addrAdminFlag)
|
||||||
|
}
|
||||||
|
|
||||||
|
func initGetAdminCmd() {
|
||||||
|
apeCmd.AddCommand(getAdminCmd)
|
||||||
|
|
||||||
|
getAdminCmd.Flags().StringP(endpointFlag, endpointFlagShort, "", endpointFlagDesc)
|
||||||
|
getAdminCmd.Flags().String(alphabetWalletsFlag, "", alphabetWalletsFlagDesc)
|
||||||
|
}
|
||||||
|
|
||||||
func addRuleChain(cmd *cobra.Command, _ []string) {
|
func addRuleChain(cmd *cobra.Command, _ []string) {
|
||||||
chain := parseChain(cmd)
|
chain := parseChain(cmd)
|
||||||
target := parseTarget(cmd)
|
target := parseTarget(cmd)
|
||||||
|
@ -151,6 +190,25 @@ func listRuleChains(cmd *cobra.Command, _ []string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func setAdmin(cmd *cobra.Command, _ []string) {
|
||||||
|
s, _ := cmd.Flags().GetString(addrAdminFlag)
|
||||||
|
addr, err := util.Uint160DecodeStringLE(s)
|
||||||
|
commonCmd.ExitOnErr(cmd, "can't decode admin addr: %w", err)
|
||||||
|
pci, ac := newPolicyContractInterface(cmd)
|
||||||
|
h, vub, err := pci.SetAdmin(addr)
|
||||||
|
cmd.Println("Waiting for transaction to persist...")
|
||||||
|
_, err = ac.Wait(h, vub, err)
|
||||||
|
commonCmd.ExitOnErr(cmd, "can't set admin: %w", err)
|
||||||
|
cmd.Println("Admin set successfully")
|
||||||
|
}
|
||||||
|
|
||||||
|
func getAdmin(cmd *cobra.Command, _ []string) {
|
||||||
|
pci, _ := newPolicyContractInterface(cmd)
|
||||||
|
addr, err := pci.GetAdmin()
|
||||||
|
commonCmd.ExitOnErr(cmd, "unable to get admin: %w", err)
|
||||||
|
cmd.Println(addr.StringLE())
|
||||||
|
}
|
||||||
|
|
||||||
func prettyJSONFormat(cmd *cobra.Command, chains []*apechain.Chain) {
|
func prettyJSONFormat(cmd *cobra.Command, chains []*apechain.Chain) {
|
||||||
wr := bytes.NewBufferString("")
|
wr := bytes.NewBufferString("")
|
||||||
data, err := json.Marshal(chains)
|
data, err := json.Marshal(chains)
|
||||||
|
|
|
@ -283,10 +283,14 @@ func init() {
|
||||||
initRefillGasCmd()
|
initRefillGasCmd()
|
||||||
initDepositoryNotaryCmd()
|
initDepositoryNotaryCmd()
|
||||||
initNetmapCandidatesCmd()
|
initNetmapCandidatesCmd()
|
||||||
|
|
||||||
RootCmd.AddCommand(apeCmd)
|
RootCmd.AddCommand(apeCmd)
|
||||||
initAddRuleChainCmd()
|
initAddRuleChainCmd()
|
||||||
initRemoveRuleChainCmd()
|
initRemoveRuleChainCmd()
|
||||||
initListRuleChainsCmd()
|
initListRuleChainsCmd()
|
||||||
|
initSetAdminCmd()
|
||||||
|
initGetAdminCmd()
|
||||||
|
|
||||||
initProxyAddAccount()
|
initProxyAddAccount()
|
||||||
initProxyRemoveAccount()
|
initProxyRemoveAccount()
|
||||||
}
|
}
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -8,7 +8,7 @@ require (
|
||||||
git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20231101111734-b3ad3335ff65
|
git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20231101111734-b3ad3335ff65
|
||||||
git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20231122162120-56debcfa569e
|
git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20231122162120-56debcfa569e
|
||||||
git.frostfs.info/TrueCloudLab/hrw v1.2.1
|
git.frostfs.info/TrueCloudLab/hrw v1.2.1
|
||||||
git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20231214122253-62ea96b82ce3
|
git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20231221121354-ed93bb5cc574
|
||||||
git.frostfs.info/TrueCloudLab/tzhash v1.8.0
|
git.frostfs.info/TrueCloudLab/tzhash v1.8.0
|
||||||
github.com/cheggaaa/pb v1.0.29
|
github.com/cheggaaa/pb v1.0.29
|
||||||
github.com/chzyer/readline v1.5.1
|
github.com/chzyer/readline v1.5.1
|
||||||
|
|
BIN
go.sum
BIN
go.sum
Binary file not shown.
Loading…
Reference in a new issue