Delete credential flags

internal/mocks/mocks.go

@@ -42,3 +42,21 @@ func (d *DetailManagerMock) LatestTag(repo formula.Repo) string {
 
 	return args.String(0)
 }
+
+type InputListMock struct {
+	mock.Mock
+}
+
+func (m *InputListMock) List(string, []string, ...string) (string, error) {
+	args := m.Called()
+	return args.String(0), args.Error(1)
+}
+
+type InputBoolMock struct {
+	mock.Mock
+}
+
+func (m *InputBoolMock) Bool(string, []string, ...string) (bool, error) {
+	args := m.Called()
+	return args.Bool(0), nil
+}

pkg/cmd/cmd.go

@@ -45,6 +45,10 @@ func RunFuncE(stdinFunc, promptFunc CommandRunnerFunc) CommandRunnerFunc {
 	}
 }
 
+func IsFlagInput(cmd *cobra.Command) bool {
+	return cmd.Flags().NFlag() > 0
+}
+
 func DeprecateCmd(parentCmd *cobra.Command, deprecatedCmd, deprecatedMsg string) {
 	command := &cobra.Command{
 		Use:        deprecatedCmd,

pkg/cmd/delete_credential.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
 	"io"
 
@@ -12,6 +13,15 @@ import (
 	"github.com/ZupIT/ritchie-cli/pkg/stdin"
 )
 
+const (
+	providerFlagName        = "provider"
+	providerFlagDescription = "Provider name to delete"
+)
+
+type inputConfig struct {
+	provider string
+}
+
 // deleteCredentialCmd type for set credential command
 type deleteCredentialCmd struct {
 	credential.CredDelete
@@ -46,49 +56,32 @@ func NewDeleteCredentialCmd(
 		Use:       "credential",
 		Short:     "Delete credential",
 		Long:      `Delete credential from current env`,
-		RunE:      RunFuncE(s.runStdin(), s.runPrompt()),
+		RunE:      RunFuncE(s.runStdin(), s.runFormula()),
 		ValidArgs: []string{""},
 		Args:      cobra.OnlyValidArgs,
 	}
-	cmd.LocalFlags()
+	flags := cmd.Flags()
+	flags.String(providerFlagName, "", providerFlagDescription)
+
 	return cmd
 }
 
-func (d deleteCredentialCmd) runPrompt() CommandRunnerFunc {
+func (d deleteCredentialCmd) runFormula() CommandRunnerFunc {
 	return func(cmd *cobra.Command, args []string) error {
-		env, err := d.currentEnv()
+		curEnv, err := d.currentEnv()
 		if err != nil {
 			return err
 		}
-		prompt.Info(fmt.Sprintf("Current env: %s", env))
+		prompt.Info(fmt.Sprintf("Current env: %s", curEnv))
 
-		data, err := d.ReadCredentialsValueInEnv(d.CredentialsPath(), env)
+		inputParams, err := d.resolveInput(cmd, curEnv)
 		if err != nil {
 			return err
-		}
-
-		if len(data) <= 0 {
-			prompt.Error("You have no defined credentials in this env")
+		} else if inputParams.provider == "" {
 			return nil
 		}
 
-		var providers []string
-		for _, c := range data {
-			providers = append(providers, c.Provider)
-		}
-
-		cred, err := d.List("Credentials: ", providers)
-		if err != nil {
-			return err
-		}
-
-		if b, err := d.Bool("Are you sure want to delete this credential?", []string{"yes", "no"}); err != nil {
-			return err
-		} else if !b {
-			return nil
-		}
-
-		if err := d.Delete(cred); err != nil {
+		if err := d.Delete(inputParams.provider); err != nil {
 			return err
 		}
 
@@ -97,19 +90,64 @@ func (d deleteCredentialCmd) runPrompt() CommandRunnerFunc {
 	}
 }
 
+func (d *deleteCredentialCmd) resolveInput(cmd *cobra.Command, context string) (inputConfig, error) {
+	if IsFlagInput(cmd) {
+		return d.resolveFlags(cmd)
+	} else {
+		return d.resolvePrompt(context)
+	}
+}
+
+func (d *deleteCredentialCmd) resolvePrompt(context string) (inputConfig, error) {
+	data, err := d.ReadCredentialsValueInEnv(d.CredentialsPath(), context)
+	if err != nil {
+		return inputConfig{}, err
+	}
+
+	if len(data) == 0 {
+		return inputConfig{}, errors.New("you have no defined credentials in this env")
+	}
+
+	providers := make([]string, len(data))
+	for _, c := range data {
+		providers = append(providers, c.Provider)
+	}
+
+	cred, err := d.List("Credentials: ", providers)
+	if err != nil {
+		return inputConfig{}, err
+	}
+
+	if b, err := d.Bool("Are you sure want to delete this credential?", []string{"yes", "no"}); err != nil {
+		return inputConfig{}, err
+	} else if !b {
+		return inputConfig{}, nil
+	}
+	return inputConfig{cred}, nil
+}
+
+func (d *deleteCredentialCmd) resolveFlags(cmd *cobra.Command) (inputConfig, error) {
+	provider, err := cmd.Flags().GetString(providerFlagName)
+	if err != nil {
+		return inputConfig{}, err
+	}
+	return inputConfig{provider}, nil
+}
+
+// TODO: remove upon stdin deprecation
 func (d deleteCredentialCmd) runStdin() CommandRunnerFunc {
 	return func(cmd *cobra.Command, args []string) error {
 		dc, err := d.stdinResolver(cmd.InOrStdin())
 		if err != nil {
 			return err
 		}
 
-		env, err := d.currentEnv()
+		curEnv, err := d.currentEnv()
 		if err != nil {
 			return err
 		}
 
-		data, err := d.ReadCredentialsValueInEnv(d.CredentialsPath(), env)
+		data, err := d.ReadCredentialsValueInEnv(d.CredentialsPath(), curEnv)
 		if err != nil {
 			return err
 		}