feat(cmd): pass Start options; add WithFlagSet option

cmd/celestia/main.go

@@ -5,9 +5,28 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	cmdnode "github.com/celestiaorg/celestia-node/cmd"
 )
 
+func WithSubcommands() func(*cobra.Command, []*pflag.FlagSet) {
+	return func(c *cobra.Command, flags []*pflag.FlagSet) {
+		c.AddCommand(
+			cmdnode.Init(flags...),
+			cmdnode.Start(cmdnode.WithFlagSet(flags)),
+			cmdnode.AuthCmd(flags...),
+			cmdnode.ResetStore(flags...),
+			cmdnode.RemoveConfigCmd(flags...),
+			cmdnode.UpdateConfigCmd(flags...),
+		)
+	}
+}
+
 func init() {
+	bridgeCmd := cmdnode.NewBridge(WithSubcommands())
+	lightCmd := cmdnode.NewLight(WithSubcommands())
+	fullCmd := cmdnode.NewFull(WithSubcommands())
 	rootCmd.AddCommand(
 		bridgeCmd,
 		lightCmd,

cmd/node.go

@@ -0,0 +1,92 @@
+package cmd
+
+import (
+	"github.com/celestiaorg/celestia-node/nodebuilder/core"
+	"github.com/celestiaorg/celestia-node/nodebuilder/gateway"
+	"github.com/celestiaorg/celestia-node/nodebuilder/header"
+	"github.com/celestiaorg/celestia-node/nodebuilder/node"
+	"github.com/celestiaorg/celestia-node/nodebuilder/p2p"
+	"github.com/celestiaorg/celestia-node/nodebuilder/rpc"
+	"github.com/celestiaorg/celestia-node/nodebuilder/state"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+)
+
+func NewBridge(options ...func(*cobra.Command, []*pflag.FlagSet)) *cobra.Command {
+	flags := []*pflag.FlagSet{
+		NodeFlags(),
+		p2p.Flags(),
+		MiscFlags(),
+		core.Flags(),
+		rpc.Flags(),
+		gateway.Flags(),
+		state.Flags(),
+	}
+	cmd := &cobra.Command{
+		Use:   "bridge [subcommand]",
+		Args:  cobra.NoArgs,
+		Short: "Manage your Bridge node",
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return PersistentPreRunEnv(cmd, node.Bridge, args)
+		},
+	}
+	for _, option := range options {
+		option(cmd, flags)
+	}
+	return cmd
+}
+
+func NewLight(options ...func(*cobra.Command, []*pflag.FlagSet)) *cobra.Command {
+	flags := []*pflag.FlagSet{
+		NodeFlags(),
+		p2p.Flags(),
+		header.Flags(),
+		MiscFlags(),
+		// NOTE: for now, state-related queries can only be accessed
+		// over an RPC connection with a celestia-core node.
+		core.Flags(),
+		rpc.Flags(),
+		gateway.Flags(),
+		state.Flags(),
+	}
+	cmd := &cobra.Command{
+		Use:   "light [subcommand]",
+		Args:  cobra.NoArgs,
+		Short: "Manage your Light node",
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return PersistentPreRunEnv(cmd, node.Light, args)
+		},
+	}
+	for _, option := range options {
+		option(cmd, flags)
+	}
+	return cmd
+}
+
+func NewFull(options ...func(*cobra.Command, []*pflag.FlagSet)) *cobra.Command {
+	flags := []*pflag.FlagSet{
+		NodeFlags(),
+		p2p.Flags(),
+		header.Flags(),
+		MiscFlags(),
+		// NOTE: for now, state-related queries can only be accessed
+		// over an RPC connection with a celestia-core node.
+		core.Flags(),
+		rpc.Flags(),
+		gateway.Flags(),
+		state.Flags(),
+	}
+	cmd := &cobra.Command{
+		Use:   "full [subcommand]",
+		Args:  cobra.NoArgs,
+		Short: "Manage your Full node",
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			return PersistentPreRunEnv(cmd, node.Full, args)
+		},
+	}
+	for _, option := range options {
+		option(cmd, flags)
+	}
+	return cmd
+}

cmd/start.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/spf13/cobra"
-	flag "github.com/spf13/pflag"
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/app/encoding"
@@ -18,7 +17,7 @@ import (
 )
 
 // Start constructs a CLI command to start Celestia Node daemon of any type with the given flags.
-func Start(fsets ...*flag.FlagSet) *cobra.Command {
+func Start(options ...func(*cobra.Command)) *cobra.Command {
 	cmd := &cobra.Command{
 		Use: "start",
 		Short: `Starts Node daemon. First stopping signal gracefully stops the Node and second terminates it.
@@ -72,8 +71,9 @@ Options passed on start override configuration options only on start and are not
 			return nd.Stop(ctx)
 		},
 	}
-	for _, set := range fsets {
-		cmd.Flags().AddFlagSet(set)
+	// Apply each passed option to the command
+	for _, option := range options {
+		option(cmd)
 	}
 	return cmd
 }

cmd/util.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
 
 	"github.com/celestiaorg/celestia-node/nodebuilder/core"
 	"github.com/celestiaorg/celestia-node/nodebuilder/gateway"
@@ -125,3 +126,12 @@ func PersistentPreRunEnv(cmd *cobra.Command, nodeType node.Type, _ []string) err
 	cmd.SetContext(ctx)
 	return nil
 }
+
+// WithFlagSet adds the given flagset to the command.
+func WithFlagSet(fset []*flag.FlagSet) func(*cobra.Command) {
+	return func(c *cobra.Command) {
+		for _, set := range fset {
+			c.Flags().AddFlagSet(set)
+		}
+	}
+}