fix(serviceaccount): fix invalid i18n message (#509)

redhat-developer · Mar 29, 2021 · bb1d9b4 · bb1d9b4
1 parent 44738ee
commit bb1d9b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/pkg/cmd/flag/flag.go b/pkg/cmd/flag/flag.go
@@ -18,6 +18,7 @@ func (e *Error) Unwrap() error {
 	return e.Err
 }
 
+// InvalidValueError returns an error when an invalid flag value is provided
 func InvalidValueError(flag string, val interface{}, validOptions ...string) *Error {
 	var chooseFromStr string
 	if len(validOptions) > 0 {

diff --git a/pkg/cmd/serviceaccount/create/create.go b/pkg/cmd/serviceaccount/create/create.go
@@ -16,6 +16,7 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/config"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/factory"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/flag"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/logging"
 	"github.com/spf13/cobra"
 )
@@ -73,13 +74,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command {
 			// check that a valid --file-format flag value is used
 			validOutput := flagutil.IsValidInput(opts.fileFormat, flagutil.CredentialsOutputFormats...)
 			if !validOutput && opts.fileFormat != "" {
-				return fmt.Errorf(localizer.MustLocalize(&localizer.Config{
-					MessageID: "flag.error.invalidValue",
-					TemplateData: map[string]interface{}{
-						"Flag":  "file-format",
-						"Value": opts.fileFormat,
-					},
-				}))
+				return flag.InvalidValueError("file-format", opts.fileFormat, flagutil.CredentialsOutputFormats...)
 			}
 
 			return runCreate(opts)

diff --git a/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go b/pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go
@@ -16,6 +16,7 @@ import (
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/config"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/internal/localizer"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/factory"
+	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/cmd/flag"
 	"github.com/bf2fc6cc711aee1a0c2a/cli/pkg/logging"
 	"github.com/spf13/cobra"
 )
@@ -72,13 +73,7 @@ func NewResetCredentialsCommand(f *factory.Factory) *cobra.Command {
 
 			validOutput := flagutil.IsValidInput(opts.fileFormat, flagutil.CredentialsOutputFormats...)
 			if !validOutput && opts.fileFormat != "" {
-				return fmt.Errorf(localizer.MustLocalize(&localizer.Config{
-					MessageID: "flag.error.invalidValue",
-					TemplateData: map[string]interface{}{
-						"Flag":  "file-format",
-						"Value": opts.fileFormat,
-					},
-				}))
+				return flag.InvalidValueError("file-format", opts.fileFormat, flagutil.CredentialsOutputFormats...)
 			}
 
 			return runResetCredentials(opts)