CLI: Reorder flags of cluster management commands

Signed-off-by: Michael Mayer <michael@photoprism.app>

internal/commands/cluster_nodes_mod.go

@@ -24,8 +24,11 @@ var ClusterNodesModCommand = &cli.Command{
 	Name:      "mod",
 	Usage:     "Updates node properties",
 	ArgsUsage: "<id|name>",
-	Flags: []cli.Flag{nodesModRoleFlag, nodesModInternal, nodesModLabel,
+	Flags: []cli.Flag{
 		DryRunFlag("preview updates without modifying the registry"),
+		nodesModRoleFlag,
+		nodesModInternal,
+		nodesModLabel,
 		YesFlag(),
 	},
 	Hidden: true, // Required for cluster-management only.

internal/commands/cluster_nodes_remove.go

@@ -20,10 +20,10 @@ var ClusterNodesRemoveCommand = &cli.Command{
 	Usage:     "Deletes a node from the registry",
 	ArgsUsage: "<id|name>",
 	Flags: []cli.Flag{
-		YesFlag(),
-		&cli.BoolFlag{Name: "all-ids", Usage: "delete all records that share the same UUID (admin cleanup)"},
-		&cli.BoolFlag{Name: "drop-db", Aliases: []string{"d"}, Usage: "drop the node’s provisioned database and user after registry deletion"},
 		DryRunFlag("preview deletion without modifying the registry or database"),
+		&cli.BoolFlag{Name: "drop-db", Aliases: []string{"d"}, Usage: "drop the node’s provisioned database and user after registry deletion"},
+		&cli.BoolFlag{Name: "all-ids", Usage: "delete all records that share the same UUID (admin cleanup)"},
+		YesFlag(),
 	},
 	Hidden: true, // Required for cluster-management only.
 	Action: clusterNodesRemoveAction,

internal/commands/cluster_nodes_rotate.go

@@ -29,10 +29,14 @@ var ClusterNodesRotateCommand = &cli.Command{
 	Name:      "rotate",
 	Usage:     "Rotates a node's DB and/or secret via Portal (HTTP)",
 	ArgsUsage: "<id|name>",
-	Flags: append([]cli.Flag{rotateDatabaseFlag, rotateSecretFlag,
+	Flags: append([]cli.Flag{
 		DryRunFlag("preview rotation without contacting the Portal"),
+		rotateDatabaseFlag,
+		rotateSecretFlag,
+		rotatePortalURL,
+		rotatePortalTok,
 		YesFlag(),
-		rotatePortalURL, rotatePortalTok}, report.CliFlags...),
+	}, report.CliFlags...),
 	Action: clusterNodesRotateAction,
 }
 

internal/commands/cluster_register.go

@@ -42,9 +42,21 @@ var (
 
 // ClusterRegisterCommand registers a node with the Portal via HTTP.
 var ClusterRegisterCommand = &cli.Command{
-	Name:   "register",
+	Name:  "register",
-	Usage:  "Registers a node or updates its credentials within a cluster",
+	Usage: "Registers a node or updates its credentials within a cluster",
-	Flags:  append(append([]cli.Flag{regNameFlag, regRoleFlag, regIntUrlFlag, regLabelFlag, regRotateDatabase, regRotateSec, regPortalURL, regPortalTok, regWriteConf, regForceFlag, regDryRun}, report.CliFlags...)),
+	Flags: append(append([]cli.Flag{
+		regDryRun,
+		regNameFlag,
+		regRoleFlag,
+		regPortalURL,
+		regPortalTok,
+		regIntUrlFlag,
+		regLabelFlag,
+		regRotateDatabase,
+		regRotateSec,
+		regWriteConf,
+		regForceFlag,
+	}, report.CliFlags...)),
 	Action: clusterRegisterAction,
 }