re-run

aerospike · Jan 10, 2024 · 378352c · 378352c
1 parent bb6785d
commit 378352c
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 21 deletions.
diff --git a/cmd/convert.go b/cmd/convert.go
@@ -26,6 +26,7 @@ var (
 	errUnsupportedAerospikeVersion = fmt.Errorf("aerospike version unsupported")
 	errInvalidOutput               = fmt.Errorf("invalid output flag")
 	errInvalidFormat               = fmt.Errorf("invalid format flag")
+	errMissingFormat               = fmt.Errorf("missing format flag")
 )
 
 func init() {
@@ -252,6 +253,16 @@ func newConvertCmd() *cobra.Command {
 				}
 			}
 
+			formatString, err := cmd.Flags().GetString("format")
+			if err != nil {
+				return errors.Join(errMissingFormat, err)
+			}
+
+			_, err = ParseFmtString(formatString)
+			if err != nil && formatString != "" {
+				return errors.Join(errInvalidFormat, err)
+			}
+
 			return nil
 		},
 	}

diff --git a/cmd/convert_test.go b/cmd/convert_test.go
@@ -5,6 +5,8 @@ package cmd
 import (
 	"errors"
 	"testing"
+
+	"github.com/aerospike/asconfig/conf"
 )
 
 type preTestConvert struct {
@@ -45,6 +47,20 @@ var preTestsConvert = []preTestConvert{
 		arguments:      []string{"./convert_test.go"},
 		expectedErrors: []error{nil},
 	},
+	{
+		flags:     []string{"--format", "bad_fmt"},
+		arguments: []string{"./convert_test.go"},
+		expectedErrors: []error{
+			conf.ErrInvalidFormat,
+		},
+	},
+	{
+		flags:     []string{"-F", "bad_fmt"},
+		arguments: []string{"./convert_test.go"},
+		expectedErrors: []error{
+			conf.ErrInvalidFormat,
+		},
+	},
 }
 
 func TestPreRunConvert(t *testing.T) {

diff --git a/cmd/diff_test.go b/cmd/diff_test.go
@@ -58,6 +58,16 @@ var testDiffArgs = []runTestDiff{
 		arguments:   []string{"../testdata/expected/all_flash_cluster_cr.conf", "../testdata/expected/all_flash_cluster_cr.conf"},
 		expectError: false,
 	},
+	{
+		flags:       []string{"--format", "bad_fmt"},
+		arguments:   []string{},
+		expectError: true,
+	},
+	{
+		flags:       []string{"-F", "bad_fmt"},
+		arguments:   []string{},
+		expectError: true,
+	},
 }
 
 func TestRunEDiff(t *testing.T) {

diff --git a/cmd/root.go b/cmd/root.go
@@ -45,8 +45,8 @@ func newRootCmd() *cobra.Command {
 
 			lvlCode, err := logrus.ParseLevel(lvl)
 			if err != nil {
-				logger.Errorf("Invalid log-level %s", lvl)
-				multiErr = fmt.Errorf("%w, %w %w", multiErr, errInvalidLogLevel, err)
+				// logger.Errorf("Invalid log-level %s", lvl)
+				multiErr = errors.Join(multiErr, errInvalidLogLevel, err)
 			}
 
 			logger.SetLevel(lvlCode)

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -1,12 +1,8 @@
-//go:build unit
-
 package cmd
 
 import (
 	"errors"
 	"testing"
-
-	"github.com/aerospike/asconfig/conf"
 )
 
 type preTestRoot struct {
@@ -33,20 +29,6 @@ var preTestsRoot = []preTestRoot{
 			errInvalidLogLevel,
 		},
 	},
-	{
-		flags:     []string{"--format", "bad_fmt"},
-		arguments: []string{},
-		expectedErrors: []error{
-			conf.ErrInvalidFormat,
-		},
-	},
-	{
-		flags:     []string{"-F", "bad_fmt"},
-		arguments: []string{},
-		expectedErrors: []error{
-			conf.ErrInvalidFormat,
-		},
-	},
 }
 
 func TestPersistentPreRunRoot(t *testing.T) {
@@ -57,7 +39,7 @@ func TestPersistentPreRunRoot(t *testing.T) {
 		err := cmd.PersistentPreRunE(cmd, test.arguments)
 		for _, expectedErr := range test.expectedErrors {
 			if !errors.Is(err, expectedErr) {
-				t.Errorf("actual err: %v\n is not expected err: %v", err, expectedErr)
+				t.Errorf("%v\n actual err: %v\n is not expected err: %v", test.flags, err, expectedErr)
 			}
 		}
 	}

diff --git a/cmd/validate_test.go b/cmd/validate_test.go
@@ -49,6 +49,16 @@ var testValidateArgs = []runTestValidate{
 		arguments:   []string{"../testdata/cases/server70/server70.conf"},
 		expectError: false,
 	},
+	{
+		flags:       []string{"--format", "bad_fmt"},
+		arguments:   []string{},
+		expectError: true,
+	},
+	{
+		flags:       []string{"-F", "bad_fmt"},
+		arguments:   []string{},
+		expectError: true,
+	},
 }
 
 func TestRunEValidate(t *testing.T) {