[#932] adm: Move set-/dump-policy to policy package

Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>

cmd/frostfs-adm/internal/modules/morph/initialize_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/policy"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/util"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring"
 	"github.com/nspcc-dev/neo-go/pkg/config"
@@ -78,8 +79,8 @@ func testInitialize(t *testing.T, committeeSize int) {
 		require.NoError(t, setConfigCmd(setConfig, []string{"MaintenanceModeAllowed=true"}))
 	})
 	t.Run("set-policy", func(t *testing.T) {
-		require.NoError(t, setPolicy.Flags().Set(util.LocalDumpFlag, dumpPath))
+		require.NoError(t, policy.Set.Flags().Set(util.LocalDumpFlag, dumpPath))
-		require.NoError(t, setPolicyCmd(setPolicy, []string{"ExecFeeFactor=1"}))
+		require.NoError(t, policy.SetPolicyCmd(policy.Set, []string{"ExecFeeFactor=1"}))
 	})
 	t.Run("remove-node", func(t *testing.T) {
 		pk, err := keys.NewPrivateKey()

cmd/frostfs-adm/internal/modules/morph/policy/policy.go

@@ -1,4 +1,4 @@
-package morph
+package policy
 
 import (
 	"bytes"
@@ -24,7 +24,7 @@ const (
 	setFeeParam       = "FeePerByte"
 )
 
-func setPolicyCmd(cmd *cobra.Command, args []string) error {
+func SetPolicyCmd(cmd *cobra.Command, args []string) error {
 	wCtx, err := util.NewInitializeContext(cmd, viper.GetViper())
 	if err != nil {
 		return fmt.Errorf("can't to initialize context: %w", err)

cmd/frostfs-adm/internal/modules/morph/policy/root.go

@@ -0,0 +1,47 @@
+package policy
+
+import (
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/util"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var (
+	Set = &cobra.Command{
+		Use:                   "set-policy [ExecFeeFactor=<n1>] [StoragePrice=<n2>] [FeePerByte=<n3>]",
+		DisableFlagsInUseLine: true,
+		Short:                 "Set global policy values",
+		PreRun: func(cmd *cobra.Command, _ []string) {
+			_ = viper.BindPFlag(util.AlphabetWalletsFlag, cmd.Flags().Lookup(util.AlphabetWalletsFlag))
+			_ = viper.BindPFlag(util.EndpointFlag, cmd.Flags().Lookup(util.EndpointFlag))
+		},
+		RunE: SetPolicyCmd,
+		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+			return []string{"ExecFeeFactor=", "StoragePrice=", "FeePerByte="}, cobra.ShellCompDirectiveNoSpace
+		},
+	}
+
+	Dump = &cobra.Command{
+		Use:   "dump-policy",
+		Short: "Dump FrostFS policy",
+		PreRun: func(cmd *cobra.Command, _ []string) {
+			_ = viper.BindPFlag(util.EndpointFlag, cmd.Flags().Lookup(util.EndpointFlag))
+		},
+		RunE: dumpPolicyCmd,
+	}
+)
+
+func initSetPolicyCmd() {
+	Set.Flags().String(util.AlphabetWalletsFlag, "", util.AlphabetWalletsFlagDesc)
+	Set.Flags().StringP(util.EndpointFlag, util.EndpointFlagShort, "", util.EndpointFlagDesc)
+	Set.Flags().String(util.LocalDumpFlag, "", "Path to the blocks dump file")
+}
+
+func initDumpPolicyCmd() {
+	Dump.Flags().StringP(util.EndpointFlag, util.EndpointFlagShort, "", util.EndpointFlagDesc)
+}
+
+func init() {
+	initSetPolicyCmd()
+	initDumpPolicyCmd()
+}

cmd/frostfs-adm/internal/modules/morph/root.go

@@ -2,6 +2,7 @@ package morph
 
 import (
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/ape"
+	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/policy"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/util"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -130,29 +131,6 @@ var (
 		RunE: setConfigCmd,
 	}
 
-	setPolicy = &cobra.Command{
-		Use:                   "set-policy [ExecFeeFactor=<n1>] [StoragePrice=<n2>] [FeePerByte=<n3>]",
-		DisableFlagsInUseLine: true,
-		Short:                 "Set global policy values",
-		PreRun: func(cmd *cobra.Command, _ []string) {
-			_ = viper.BindPFlag(util.AlphabetWalletsFlag, cmd.Flags().Lookup(util.AlphabetWalletsFlag))
-			_ = viper.BindPFlag(util.EndpointFlag, cmd.Flags().Lookup(util.EndpointFlag))
-		},
-		RunE: setPolicyCmd,
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return []string{"ExecFeeFactor=", "StoragePrice=", "FeePerByte="}, cobra.ShellCompDirectiveNoSpace
-		},
-	}
-
-	dumpPolicy = &cobra.Command{
-		Use:   "dump-policy",
-		Short: "Dump FrostFS policy",
-		PreRun: func(cmd *cobra.Command, _ []string) {
-			_ = viper.BindPFlag(util.EndpointFlag, cmd.Flags().Lookup(util.EndpointFlag))
-		},
-		RunE: dumpPolicyCmd,
-	}
-
 	dumpContractHashesCmd = &cobra.Command{
 		Use:   "dump-hashes",
 		Short: "Dump deployed contract hashes",
@@ -265,8 +243,8 @@ func init() {
 	initGenerateStorageCmd()
 	initForceNewEpochCmd()
 	initRemoveNodesCmd()
-	initSetPolicyCmd()
+	RootCmd.AddCommand(policy.Set)
-	initDumpPolicyCmd()
+	RootCmd.AddCommand(policy.Dump)
 	initDumpContractHashesCmd()
 	initDumpNetworkConfigCmd()
 	initSetConfigCmd()
@@ -393,18 +371,6 @@ func initDumpContractHashesCmd() {
 	dumpContractHashesCmd.Flags().String(customZoneFlag, "", "Custom zone to search.")
 }
 
-func initSetPolicyCmd() {
-	RootCmd.AddCommand(setPolicy)
-	setPolicy.Flags().String(util.AlphabetWalletsFlag, "", util.AlphabetWalletsFlagDesc)
-	setPolicy.Flags().StringP(util.EndpointFlag, util.EndpointFlagShort, "", util.EndpointFlagDesc)
-	setPolicy.Flags().String(util.LocalDumpFlag, "", "Path to the blocks dump file")
-}
-
-func initDumpPolicyCmd() {
-	RootCmd.AddCommand(dumpPolicy)
-	dumpPolicy.Flags().StringP(util.EndpointFlag, util.EndpointFlagShort, "", util.EndpointFlagDesc)
-}
-
 func initRemoveNodesCmd() {
 	RootCmd.AddCommand(removeNodes)
 	removeNodes.Flags().String(util.AlphabetWalletsFlag, "", util.AlphabetWalletsFlagDesc)