Move command-specific flags into command source file

ipni · Sep 1, 2023 · d680791 · d680791
1 parent 3e2927a
commit d680791
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 80 deletions.
diff --git a/cmd/provider/announce.go b/cmd/provider/announce.go
@@ -17,13 +17,22 @@ var AnnounceCmd = &cli.Command{
 	Action: announceCommand,
 }
 
+var announceFlags = []cli.Flag{
+	adminAPIFlag,
+}
+
 var AnnounceHttpCmd = &cli.Command{
 	Name:   "announce-http",
 	Usage:  "Publish an announcement message for the latest advertisement to a specific indexer via http",
 	Flags:  announceHttpFlags,
 	Action: announceHttpCommand,
 }
 
+var announceHttpFlags = []cli.Flag{
+	adminAPIFlag,
+	indexerFlag,
+}
+
 func announceCommand(cctx *cli.Context) error {
 	req, err := http.NewRequestWithContext(cctx.Context, http.MethodPost, adminAPIFlagValue+"/admin/announce", nil)
 	if err != nil {

diff --git a/cmd/provider/connect.go b/cmd/provider/connect.go
@@ -15,6 +15,16 @@ var ConnectCmd = &cli.Command{
 	Action: connectCommand,
 }
 
+var connectFlags = []cli.Flag{
+	&cli.StringFlag{
+		Name:     "indexermaddr",
+		Usage:    "Indexer multiaddr to connect",
+		Aliases:  []string{"imaddr"},
+		Required: true,
+	},
+	adminAPIFlag,
+}
+
 func connectCommand(cctx *cli.Context) error {
 	iaddr := cctx.String("indexermaddr")
 	req := &adminserver.ConnectReq{Maddr: iaddr}

diff --git a/cmd/provider/daemon.go b/cmd/provider/daemon.go
@@ -54,6 +54,25 @@ var DaemonCmd = &cli.Command{
 	Action: daemonCommand,
 }
 
+var carZeroLengthAsEOFFlagValue bool
+
+var daemonFlags = []cli.Flag{
+	&cli.BoolFlag{
+		Name:        "carZeroLengthAsEOF",
+		Aliases:     []string{"cz"},
+		Usage:       "Specifies whether zero-length blocks in CAR should be consideted as EOF.",
+		Value:       false, // Default to disabled, consistent with go-car/v2 defaults.
+		Destination: &carZeroLengthAsEOFFlagValue,
+	},
+	&cli.StringFlag{
+		Name:     "log-level",
+		Usage:    "Set the log level",
+		EnvVars:  []string{"GOLOG_LOG_LEVEL"},
+		Value:    "info",
+		Required: false,
+	},
+}
+
 var tempBootstrapPeersKey = datastore.NewKey("/local/temp_bootstrap_peers")
 
 func daemonCommand(cctx *cli.Context) error {

diff --git a/cmd/provider/flags.go b/cmd/provider/flags.go
@@ -4,82 +4,18 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var announceFlags = []cli.Flag{
-	adminAPIFlag,
-}
-
-var announceHttpFlags = []cli.Flag{
-	adminAPIFlag,
-	indexerFlag,
-}
-
-var daemonFlags = []cli.Flag{
-	carZeroLengthAsEOFFlag,
-	&cli.StringFlag{
-		Name:     "log-level",
-		Usage:    "Set the log level",
-		EnvVars:  []string{"GOLOG_LOG_LEVEL"},
-		Value:    "info",
-		Required: false,
-	},
-}
-
-var connectFlags = []cli.Flag{
-	&cli.StringFlag{
-		Name:     "indexermaddr",
-		Usage:    "Indexer multiaddr to connect",
-		Aliases:  []string{"imaddr"},
-		Required: true,
-	},
-	adminAPIFlag,
-}
-
-var indexerFlag = &cli.StringFlag{
-	Name:     "indexer",
-	Usage:    "Host or host:port of indexer to use",
-	Aliases:  []string{"i"},
-	Required: true,
-}
-
 var addrFlag = &cli.StringSliceFlag{
 	Name:     "addr",
 	Usage:    `Provider address as multiaddr string, example: "/ip4/127.0.0.1/tcp/3103"`,
 	Aliases:  []string{"a"},
 	Required: true,
 }
 
-var indexFlags = []cli.Flag{
-	indexerFlag,
-	addrFlag,
-	&cli.StringFlag{
-		Name:     "mh",
-		Usage:    "Specify multihash to use as indexer key",
-		Required: false,
-	},
-	&cli.StringFlag{
-		Name:     "cid",
-		Usage:    "Specify CID to use as indexer key",
-		Required: false,
-	},
-	&cli.StringFlag{
-		Name:     "ctxid",
-		Usage:    "Context ID",
-		Required: true,
-	},
-	metadataFlag,
-}
-
-var importCarFlags = []cli.Flag{
-	adminAPIFlag,
-	carPathFlag,
-	metadataFlag,
-	keyFlag,
-}
-
-var removeCarFlags = []cli.Flag{
-	adminAPIFlag,
-	optionalCarPathFlag,
-	keyFlag,
+var indexerFlag = &cli.StringFlag{
+	Name:     "indexer",
+	Usage:    "Host or host:port of indexer to use",
+	Aliases:  []string{"i"},
+	Required: true,
 }
 
 var (
@@ -136,14 +72,3 @@ var (
 		Destination: &adminAPIFlagValue,
 	}
 )
-
-var (
-	carZeroLengthAsEOFFlagValue bool
-	carZeroLengthAsEOFFlag      = &cli.BoolFlag{
-		Name:        "carZeroLengthAsEOF",
-		Aliases:     []string{"cz"},
-		Usage:       "Specifies whether zero-length blocks in CAR should be consideted as EOF.",
-		Value:       false, // Default to disabled, consistent with go-car/v2 defaults.
-		Destination: &carZeroLengthAsEOFFlagValue,
-	}
-)
diff --git a/cmd/provider/import.go b/cmd/provider/import.go
@@ -35,6 +35,13 @@ var (
 	md = metadata.Default.New()
 )
 
+var importCarFlags = []cli.Flag{
+	adminAPIFlag,
+	carPathFlag,
+	metadataFlag,
+	keyFlag,
+}
+
 func beforeImportCar(cctx *cli.Context) error {
 	if cctx.IsSet(keyFlag.Name) {
 		decoded, err := base64.StdEncoding.DecodeString(keyFlagValue)

diff --git a/cmd/provider/index.go b/cmd/provider/index.go
@@ -21,6 +21,27 @@ var IndexCmd = &cli.Command{
 	Action: indexCommand,
 }
 
+var indexFlags = []cli.Flag{
+	addrFlag,
+	indexerFlag,
+	&cli.StringFlag{
+		Name:     "mh",
+		Usage:    "Specify multihash to use as indexer key",
+		Required: false,
+	},
+	&cli.StringFlag{
+		Name:     "cid",
+		Usage:    "Specify CID to use as indexer key",
+		Required: false,
+	},
+	&cli.StringFlag{
+		Name:     "ctxid",
+		Usage:    "Context ID",
+		Required: true,
+	},
+	metadataFlag,
+}
+
 func indexCommand(cctx *cli.Context) error {
 	mhArg := cctx.String("mh")
 	cidArg := cctx.String("cid")

diff --git a/cmd/provider/remove.go b/cmd/provider/remove.go
@@ -41,6 +41,12 @@ specified, they key is simply calculated as the SHA_256 hash of the given path.`
 		Before: beforeRemoveCar,
 		Action: doRemoveCar,
 	}
+
+	removeCarFlags = []cli.Flag{
+		adminAPIFlag,
+		optionalCarPathFlag,
+		keyFlag,
+	}
 )
 
 func beforeRemoveCar(cctx *cli.Context) error {