fix: change getCommand default format auto

Signed-off-by: Mustafa Elbehery <[email protected]>
etcd-io · Nov 7, 2023 · 86d58d8 · 86d58d8
1 parent 959ab0a
commit 86d58d8
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 28 deletions.
diff --git a/cmd/bbolt/main.go b/cmd/bbolt/main.go
@@ -994,7 +994,7 @@ func (cmd *getCommand) Run(args ...string) error {
 	var parseFormat string
 	var format string
 	fs.StringVar(&parseFormat, "parse-format", "ascii-encoded", "Input format. One of: ascii-encoded|hex (default: ascii-encoded)")
-	fs.StringVar(&format, "format", "bytes", "Output format. One of: "+FORMAT_MODES+" (default: bytes)")
+	fs.StringVar(&format, "format", "auto", "Output format. One of: "+FORMAT_MODES+" (default: auto)")
 	help := fs.Bool("h", false, "")
 	if err := fs.Parse(args); err != nil {
 		return err
@@ -1064,7 +1064,7 @@ Additional options include:
 	--format
 		Output format. One of: `+FORMAT_MODES+` (default=bytes)
 	--parse-format
-		Input format (of key). One of: ascii-encoded|hex (default=ascii-encoded)"
+		Input format (of key). One of: ascii-encoded|hex (default=auto)"
 `, "\n")
 }
 

diff --git a/cmd/bbolt/main_test.go b/cmd/bbolt/main_test.go
@@ -6,6 +6,7 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+	"github.com/stretchr/testify/assert"
 	"io"
 	"math/rand"
 	"os"
@@ -355,38 +356,64 @@ func TestKeysCommand_Run(t *testing.T) {
 
 // Ensure the "get" command can print the value of a key in a bucket.
 func TestGetCommand_Run(t *testing.T) {
-	db := btesting.MustCreateDB(t)
+	testCases := []struct {
+		name          string
+		printable     bool
+		testBucket    string
+		testKey       string
+		expectedValue string
+	}{
+		{
+			name:          "printable data",
+			printable:     true,
+			testBucket:    "foo",
+			testKey:       "foo-1",
+			expectedValue: "val-foo-1\n",
+		},
+		{
+			name:          "non printable data",
+			printable:     false,
+			testBucket:    "bar",
+			testKey:       "100001",
+			expectedValue: hex.EncodeToString(convertInt64IntoBytes(100001)) + "\n",
+		},
+	}
 
-	if err := db.Update(func(tx *bolt.Tx) error {
-		for _, name := range []string{"foo", "bar"} {
-			b, err := tx.CreateBucket([]byte(name))
-			if err != nil {
-				return err
-			}
-			for i := 0; i < 3; i++ {
-				key := fmt.Sprintf("%s-%d", name, i)
-				val := fmt.Sprintf("val-%s-%d", name, i)
-				if err := b.Put([]byte(key), []byte(val)); err != nil {
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			db := btesting.MustCreateDB(t)
+
+			if err := db.Update(func(tx *bolt.Tx) error {
+				b, err := tx.CreateBucket([]byte(tc.testBucket))
+				if err != nil {
 					return err
 				}
+				if tc.printable {
+					val := fmt.Sprintf("val-%s", tc.testKey)
+					if err := b.Put([]byte(tc.testKey), []byte(val)); err != nil {
+						return err
+					}
+				} else {
+					if err := b.Put([]byte(tc.testKey), convertInt64IntoBytes(100001)); err != nil {
+						return err
+					}
+				}
+				return nil
+			}); err != nil {
+				t.Fatal(err)
 			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	db.Close()
+			db.Close()
 
-	defer requireDBNoChange(t, dbData(t, db.Path()), db.Path())
-
-	expected := "val-foo-1\n"
+			defer requireDBNoChange(t, dbData(t, db.Path()), db.Path())
 
-	// Run the command.
-	m := NewMain()
-	if err := m.Run("get", db.Path(), "foo", "foo-1"); err != nil {
-		t.Fatal(err)
-	} else if actual := m.Stdout.String(); actual != expected {
-		t.Fatalf("unexpected stdout:\n\n%s", actual)
+			// Run the command.
+			m := NewMain()
+			if err := m.Run("get", db.Path(), tc.testBucket, tc.testKey); err != nil {
+				t.Fatal(err)
+			}
+			actual := m.Stdout.String()
+			assert.Equal(t, tc.expectedValue, actual)
+		})
 	}
 }