Skip to content

Commit

Permalink
fix cli cmds panics
Browse files Browse the repository at this point in the history
Signed-off-by: Mustafa Elbehery <melbeher@redhat.com>
  • Loading branch information
Elbehery committed Jan 30, 2024
1 parent e102fcf commit 684e1ef
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
9 changes: 9 additions & 0 deletions cmd/bbolt/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ var (

// ErrKeyNotFound is returned when a key is not found.
ErrKeyNotFound = errors.New("key not found")

// ErrNotEnoughArgs is returned with a cmd is being executed with fewer arguments.
ErrNotEnoughArgs = errors.New("not enough arguments")
)

func main() {
Expand Down Expand Up @@ -908,6 +911,9 @@ func (cmd *keysCommand) Run(args ...string) error {

// Require database path and bucket.
relevantArgs := fs.Args()
if len(relevantArgs) < 2 {
return fmt.Errorf("required arguments are 'database', and 'bucket': %w", ErrNotEnoughArgs)
}
path, buckets := relevantArgs[0], relevantArgs[1:]
if path == "" {
return ErrPathRequired
Expand Down Expand Up @@ -993,6 +999,9 @@ func (cmd *getCommand) Run(args ...string) error {

// Require database path, bucket and key.
relevantArgs := fs.Args()
if len(relevantArgs) < 3 {
return fmt.Errorf("expected arguments are 'database path', 'bucket', and 'key': %w", ErrNotEnoughArgs)
}
path, buckets := relevantArgs[0], relevantArgs[1:len(relevantArgs)-1]
key, err := parseBytes(relevantArgs[len(relevantArgs)-1], parseFormat)
if err != nil {
Expand Down
22 changes: 22 additions & 0 deletions cmd/bbolt/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,28 @@ func TestCompactCommand_Run(t *testing.T) {
}
}

func TestCommands_Run_NoArgs(t *testing.T) {
testCases := []struct {
cmd string
expErr error
}{
{
cmd: "get",
expErr: main.ErrNotEnoughArgs,
},
{
cmd: "keys",
expErr: main.ErrNotEnoughArgs,
},
}

m := NewMain()
for _, tc := range testCases {
err := m.Run(tc.cmd)
require.ErrorIs(t, err, main.ErrNotEnoughArgs)
}
}

func fillBucket(b *bolt.Bucket, prefix []byte) error {
n := 10 + rand.Intn(50)
for i := 0; i < n; i++ {
Expand Down

0 comments on commit 684e1ef

Please sign in to comment.