Merge pull request #728 from Elbehery/use_cobra_exactArgs

fix: use cobra exactArgs

Author: ahrtr

cmd/bbolt/command_inspect.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"os"
 
@@ -15,15 +14,7 @@ func newInspectCobraCommand() *cobra.Command {
 	inspectCmd := &cobra.Command{
 		Use:   "inspect",
 		Short: "inspect the structure of the database",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return inspectFunc(args[0])
 		},

cmd/bbolt/command_surgery.go

@@ -54,15 +54,7 @@ func newSurgeryRevertMetaPageCommand() *cobra.Command {
 	revertMetaPageCmd := &cobra.Command{
 		Use:   "revert-meta-page <bbolt-file> [options]",
 		Short: "Revert the meta page to revert the changes performed by the latest transaction",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := o.Validate(); err != nil {
 				return err
@@ -121,15 +113,7 @@ func newSurgeryCopyPageCommand() *cobra.Command {
 	copyPageCmd := &cobra.Command{
 		Use:   "copy-page <bbolt-file> [options]",
 		Short: "Copy page from the source page Id to the destination page Id",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := o.Validate(); err != nil {
 				return err
@@ -193,15 +177,7 @@ func newSurgeryClearPageCommand() *cobra.Command {
 	clearPageCmd := &cobra.Command{
 		Use:   "clear-page <bbolt-file> [options]",
 		Short: "Clears all elements from the given page, which can be a branch or leaf page",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := o.Validate(); err != nil {
 				return err
@@ -268,15 +244,7 @@ func newSurgeryClearPageElementsCommand() *cobra.Command {
 	clearElementCmd := &cobra.Command{
 		Use:   "clear-page-elements <bbolt-file> [options]",
 		Short: "Clears elements from the given page, which can be a branch or leaf page",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := o.Validate(); err != nil {
 				return err

cmd/bbolt/command_surgery_freelist.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"os"
 
@@ -29,15 +28,7 @@ func newSurgeryFreelistAbandonCommand() *cobra.Command {
 	abandonFreelistCmd := &cobra.Command{
 		Use:   "abandon <bbolt-file> [options]",
 		Short: "Abandon the freelist from both meta pages",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := o.Validate(); err != nil {
 				return err
@@ -72,15 +63,7 @@ func newSurgeryFreelistRebuildCommand() *cobra.Command {
 	rebuildFreelistCmd := &cobra.Command{
 		Use:   "rebuild <bbolt-file> [options]",
 		Short: "Rebuild the freelist",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := o.Validate(); err != nil {
 				return err

cmd/bbolt/command_surgery_meta.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -37,15 +36,7 @@ func newSurgeryMetaValidateCommand() *cobra.Command {
 	metaValidateCmd := &cobra.Command{
 		Use:   "validate <bbolt-file> [options]",
 		Short: "Validate both meta pages",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return surgeryMetaValidateFunc(args[0])
 		},
@@ -131,15 +122,7 @@ func newSurgeryMetaUpdateCommand() *cobra.Command {
 	metaUpdateCmd := &cobra.Command{
 		Use:   "update <bbolt-file> [options]",
 		Short: "Update fields in meta pages",
-		Args: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return errors.New("db file path not provided")
-			}
-			if len(args) > 1 {
-				return errors.New("too many arguments")
-			}
-			return nil
-		},
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if err := o.Validate(); err != nil {
 				return err