List credentials command

cmd/main.go

@@ -8,11 +8,11 @@ import (
 
 	"k8s.io/kubectl/pkg/util/templates"
 
-	"github.com/ZupIT/ritchie-cli/pkg/formula/creator/template"
+	"github.com/ZupIT/ritchie-cli/pkg/credential"
 	"github.com/ZupIT/ritchie-cli/pkg/rtutorial"
-
 	"github.com/ZupIT/ritchie-cli/pkg/formula/builder"
 	"github.com/ZupIT/ritchie-cli/pkg/formula/creator"
+	"github.com/ZupIT/ritchie-cli/pkg/formula/creator/template"
 	"github.com/ZupIT/ritchie-cli/pkg/formula/repo"
 	"github.com/ZupIT/ritchie-cli/pkg/formula/runner"
 	"github.com/ZupIT/ritchie-cli/pkg/formula/tree"
@@ -26,7 +26,6 @@ import (
 	"github.com/ZupIT/ritchie-cli/pkg/api"
 	"github.com/ZupIT/ritchie-cli/pkg/autocomplete"
 	"github.com/ZupIT/ritchie-cli/pkg/cmd"
-	"github.com/ZupIT/ritchie-cli/pkg/credential/credsingle"
 	"github.com/ZupIT/ritchie-cli/pkg/env"
 	"github.com/ZupIT/ritchie-cli/pkg/env/envcredential"
 	"github.com/ZupIT/ritchie-cli/pkg/file/fileutil"
@@ -77,15 +76,15 @@ func buildCommands() *cobra.Command {
 	repoPrioritySetter := repo.NewPrioritySetter(ritchieHomeDir, fileManager)
 
 	tplManager := template.NewManager(api.RitchieHomeDir())
-	ctxFinder := rcontext.NewFinder(ritchieHomeDir)
+	ctxFinder := rcontext.NewFinder(ritchieHomeDir, fileManager)
 	ctxSetter := rcontext.NewSetter(ritchieHomeDir, ctxFinder)
 	ctxRemover := rcontext.NewRemover(ritchieHomeDir, ctxFinder)
 	ctxFindSetter := rcontext.NewFindSetter(ritchieHomeDir, ctxFinder, ctxSetter)
 	ctxFindRemover := rcontext.NewFindRemover(ritchieHomeDir, ctxFinder, ctxRemover)
-	credSetter := credsingle.NewSetter(ritchieHomeDir, ctxFinder)
-	credFinder := credsingle.NewFinder(ritchieHomeDir, ctxFinder)
+	credSetter := credential.NewSetter(ritchieHomeDir, ctxFinder)
+	credFinder := credential.NewFinder(ritchieHomeDir, ctxFinder)
 	treeManager := tree.NewTreeManager(ritchieHomeDir, repoLister, api.CoreCmds)
-	credSettings := credsingle.NewSingleSettings(fileManager)
+	credSettings := credential.NewSettings(fileManager, dirManager, userHomeDir)
 	autocompleteGen := autocomplete.NewGenerator(treeManager)
 	credResolver := envcredential.NewResolver(credFinder)
 	envResolvers := make(env.Resolvers)
@@ -141,8 +140,9 @@ func buildCommands() *cobra.Command {
 		inputText,
 		inputBool,
 		inputList,
-		inputPassword,
-	)
+		inputPassword)
+	listCredentialCmd := cmd.NewListCredentialCmd(credSettings)
+
 	deleteCtxCmd := cmd.NewDeleteContextCmd(ctxFindRemover, inputBool, inputList)
 	setCtxCmd := cmd.NewSetContextCmd(ctxFindSetter, inputText, inputList)
 	showCtxCmd := cmd.NewShowContextCmd(ctxFinder)
@@ -165,6 +165,7 @@ func buildCommands() *cobra.Command {
 	createCmd.AddCommand(createFormulaCmd)
 	deleteCmd.AddCommand(deleteCtxCmd, deleteRepoCmd)
 	listCmd.AddCommand(listRepoCmd)
+	listCmd.AddCommand(listCredentialCmd)
 	setCmd.AddCommand(setCredentialCmd, setCtxCmd, setPriorityCmd)
 	showCmd.AddCommand(showCtxCmd)
 	buildCmd.AddCommand(buildFormulaCmd)

pkg/cmd/list.go

@@ -5,15 +5,15 @@ import "github.com/spf13/cobra"
 const descListLong = `
 This command consists of multiple subcommands to interact with ritchie.
 
-It can be used to list formulas, repositories and other objects.
+It can be used to list repositories or credentials.
 `
 
 // NewListCmd create a new list instance
 func NewListCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "list SUBCOMMAND",
-		Short:   "List repositories",
-		Long:    "List all formula repositories.",
-		Example: "rit list repo",
+		Short:   "List repositories or credentials",
+		Long:    descListLong,
+		Example: "rit list repo, rit list credential",
 	}
 }

pkg/cmd/list_credential.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/gosuri/uitable"
+	"github.com/spf13/cobra"
+
+	"github.com/ZupIT/ritchie-cli/pkg/credential"
+	"github.com/ZupIT/ritchie-cli/pkg/prompt"
+)
+
+type listCredentialCmd struct {
+	credential.Settings
+}
+
+func NewListCredentialCmd(ss credential.Settings) *cobra.Command {
+	l := &listCredentialCmd{ss}
+
+	cmd := &cobra.Command{
+		Use:     "credential",
+		Short:   "List all credential names and fields.",
+		Example: "rit list credential",
+		RunE:    l.run(),
+	}
+
+	return cmd
+}
+
+func printCredentialsTable(fields credential.ListCredDatas) {
+	table := uitable.New()
+	table.Wrap = true
+	table.AddRow(
+		prompt.Bold("CREDENTIAL"),
+		prompt.Bold("PROVIDER"),
+		prompt.Bold("CONTEXT"),
+	)
+
+	for _, c := range fields {
+		table.AddRow(c.Credential, c.Provider, c.Context)
+	}
+	if len(table.Rows) < 2 {
+		setCmd := prompt.Cyan("rit set credential")
+		fmt.Printf("You dont have any credential, use %s\n", setCmd)
+	} else {
+		fmt.Println(table)
+	}
+}
+
+func (l listCredentialCmd) run() CommandRunnerFunc {
+	return func(cmd *cobra.Command, args []string) error {
+		data, err := l.Settings.ReadCredentialsValue(l.CredentialsPath())
+		if err != nil {
+			return err
+		}
+		printCredentialsTable(data)
+		return nil
+	}
+}

pkg/cmd/list_credential_test.go

@@ -0,0 +1,24 @@
+package cmd
+
+import (
+	"os"
+	"testing"
+
+	"github.com/ZupIT/ritchie-cli/pkg/credential"
+	"github.com/ZupIT/ritchie-cli/pkg/stream"
+)
+
+func Test_ListCredentialCmd(t *testing.T) {
+	fileManager := stream.NewFileManager()
+	dirManager := stream.NewDirManager(fileManager)
+	homeDir, _ := os.UserHomeDir()
+	credSettings := credential.NewSettings(fileManager, dirManager, homeDir)
+
+	t.Run("Success case", func(t *testing.T) {
+		o := NewListCredentialCmd(credSettings)
+		if err := o.Execute();err !=nil{
+			t.Errorf("Test_ListCredentialCmd error = %s", err)
+		}
+	})
+
+}

pkg/cmd/mocks_test.go

@@ -31,6 +31,12 @@ func (inputTextValidatorMock) Text(name string, validate func(interface{}) error
 	return "mocked text", nil
 }
 
+type inputTextErrorMock struct{}
+
+func (inputTextErrorMock) Text(name string, required bool, helper ...string) (string, error) {
+	return "", errors.New("error on input text")
+}
+
 type inputSecretMock struct{}
 
 func (inputSecretMock) Text(name string, required bool, helper ...string) (string, error) {
@@ -224,20 +230,34 @@ func (credSetterMock) Set(d credential.Detail) error {
 	return nil
 }
 
-type singleCredSettingsMock struct{}
-
-func (s singleCredSettingsMock) WriteDefaultCredentials(path string) error {
-	return nil
+type credSettingsMock struct {
+	error
 }
 
-func (s singleCredSettingsMock) ReadCredentials(path string) (credential.Fields, error) {
+func (s credSettingsMock) ReadCredentialsFields(path string) (credential.Fields, error) {
 	return credential.Fields{}, nil
 }
 
-func (s singleCredSettingsMock) WriteCredentials(fields credential.Fields, path string) error {
+func (s credSettingsMock) ReadCredentialsValue(path string) ([]credential.ListCredData, error) {
+	return []credential.ListCredData{}, nil
+}
+
+func (s credSettingsMock) WriteDefaultCredentialsFields(path string) error {
 	return nil
 }
 
+func (s credSettingsMock) WriteCredentialsFields(fields credential.Fields, path string) error {
+	return nil
+}
+
+func (s credSettingsMock) ProviderPath() string {
+	return ""
+}
+
+func (s credSettingsMock) CredentialsPath () string {
+	return ""
+}
+
 type runnerMock struct {
 	error error
 }

pkg/cmd/set_credential.go

@@ -8,7 +8,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/ZupIT/ritchie-cli/pkg/credential"
-	"github.com/ZupIT/ritchie-cli/pkg/credential/credsingle"
 	"github.com/ZupIT/ritchie-cli/pkg/prompt"
 	"github.com/ZupIT/ritchie-cli/pkg/stdin"
 )
@@ -18,7 +17,7 @@ var inputTypes = []string{"plain text", "secret"}
 // setCredentialCmd type for set credential command
 type setCredentialCmd struct {
 	credential.Setter
-	credential.SingleSettings
+	credential.ReaderWriterPather
 	prompt.InputText
 	prompt.InputBool
 	prompt.InputList
@@ -28,19 +27,19 @@ type setCredentialCmd struct {
 // NewSetCredentialCmd creates a new cmd instance
 func NewSetCredentialCmd(
 	credSetter credential.Setter,
-	credSetting credential.SingleSettings,
+	file credential.ReaderWriterPather,
 	inText prompt.InputText,
 	inBool prompt.InputBool,
 	inList prompt.InputList,
 	inPass prompt.InputPassword,
 ) *cobra.Command {
 	s := &setCredentialCmd{
-		Setter:         credSetter,
-		SingleSettings: credSetting,
-		InputText:      inText,
-		InputBool:      inBool,
-		InputList:      inList,
-		InputPassword:  inPass,
+		Setter:             credSetter,
+		ReaderWriterPather: file,
+		InputText:          inText,
+		InputBool:          inBool,
+		InputList:          inList,
+		InputPassword:      inPass,
 	}
 
 	cmd := &cobra.Command{
@@ -71,26 +70,26 @@ func (s setCredentialCmd) runPrompt() CommandRunnerFunc {
 }
 
 func (s setCredentialCmd) prompt() (credential.Detail, error) {
-	err := s.WriteDefaultCredentials(credsingle.ProviderPath())
-	if err != nil {
+
+	if err := s.WriteDefaultCredentialsFields(s.ProviderPath()); err != nil {
 		return credential.Detail{}, err
 	}
 
 	var credDetail credential.Detail
 	cred := credential.Credential{}
 
-	credentials, err := s.ReadCredentials(credsingle.ProviderPath())
+	credentials, err := s.ReadCredentialsFields(s.ProviderPath())
 	if err != nil {
 		return credential.Detail{}, err
 	}
 
-	providerArr := credsingle.NewProviderArr(credentials)
+	providerArr := credential.NewProviderArr(credentials)
 	providerChoose, err := s.List("Select your provider", providerArr)
 	if err != nil {
 		return credDetail, err
 	}
 
-	if providerChoose == credsingle.AddNew {
+	if providerChoose == credential.AddNew {
 		newProvider, err := s.Text("Define your provider name:", true)
 		if err != nil {
 			return credDetail, err
@@ -117,8 +116,7 @@ func (s setCredentialCmd) prompt() (credential.Detail, error) {
 			}
 		}
 		credentials[newProvider] = newFields
-		err = s.WriteCredentials(credentials, credsingle.ProviderPath())
-		if err != nil {
+		if err = s.WriteCredentialsFields(credentials, s.ProviderPath()); err != nil {
 			return credDetail, err
 		}
 
@@ -135,7 +133,7 @@ func (s setCredentialCmd) prompt() (credential.Detail, error) {
 				return credDetail, err
 			}
 		} else {
-			value, err = s.Text(i.Name, true)
+			value, err = s.Text(i.Name+":", true)
 			if err != nil {
 				return credDetail, err
 			}
@@ -160,6 +158,7 @@ func (s setCredentialCmd) runStdin() CommandRunnerFunc {
 		}
 
 		prompt.Success(fmt.Sprintf("✔ %s credential saved!", strings.Title(cred.Service)))
+		prompt.Info("Check your credentials using rit list credential")
 		return nil
 	}
 }