Feature/requirements lint

.circleci/config.yml

@@ -33,8 +33,7 @@ references:
         - master
         - /^release-.*/
         - qa
-        - /^feature.*/
-        - /^bug.*/
+        - /^pull\/.*$/
 
 executors:
   ritchie-executor:

README.md

@@ -1,7 +1,6 @@
 [![CircleCI](https://circleci.com/gh/ZupIT/ritchie-cli/tree/master.svg?style=svg)](https://circleci.com/gh/ZupIT/ritchie-cli) [![codecov](https://codecov.io/gh/zupit/ritchie-cli/branch/master/graph/badge.svg)](https://codecov.io/gh/zupit/ritchie-cli) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 
-
 <img class="special-img-class" src="/docs/img/ritchie-banner.png" />
 
 ## Ritchie

pkg/cmd/set_server.go

@@ -17,31 +17,31 @@ type setServerCmd struct {
 func NewSetServerCmd(
 	st server.Setter,
 	iu prompt.InputURL,
-	) *cobra.Command {
+) *cobra.Command {
 
 	o := setServerCmd{
 		Setter:   st,
 		InputURL: iu,
 	}
 
 	return &cobra.Command{
-			Use:   "server",
-			Short: "Set server",
-			Long:  `Set organization Server url `,
-			RunE:  o.runFunc(),
+		Use:   "server",
+		Short: "Set server",
+		Long:  `Set organization Server url `,
+		RunE:  o.runFunc(),
 	}
 }
 
 func (s setServerCmd) runFunc() CommandRunnerFunc {
-	return func(cmd *cobra.Command, args []string) error{
-		u, err := s.URL("URL of the server [http(s)://host:port]", "")
-		if err != nil { return err }
+	return func(cmd *cobra.Command, args []string) error {
+		u, err := s.URL("URL of the server [http(s)://host]", "")
+		if err != nil {
+			return err
+		}
 		if err := s.Set(u); err != nil {
 			return err
 		}
-		fmt.Sprintf("Organization server url saved!")
+		fmt.Sprintln("Organization server url saved!")
 		return nil
 	}
 }
-
-

pkg/credential/credsingle/finder_test.go

@@ -14,7 +14,7 @@ func TestFind(t *testing.T) {
 	setter := NewSetter(tmp, ctxFinder, sessManager)
 	err := setter.Set(githubCred)
 	if err != nil {
-		fmt.Sprintf("Error in Set")
+		fmt.Sprintln("Error in Set")
 		return
 	}
 	finder := NewFinder(tmp, ctxFinder, sessManager)

pkg/credential/credteam/credteam_test.go

@@ -62,7 +62,7 @@ func mockServer(status int, body []byte) *httptest.Server {
 		rw.WriteHeader(status)
 		_, err := rw.Write(body)
 		if err != nil {
-			fmt.Sprintf("Error in Write")
+			fmt.Sprintln("Error in Write")
 			return
 		}
 	}))

pkg/credential/credteam/finder_test.go

@@ -3,6 +3,7 @@ package credteam
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"os"
 	"reflect"
 	"testing"
@@ -66,7 +67,12 @@ func TestFinder(t *testing.T) {
 			}
 
 			server := mockServer(out.status, body)
-			serverSetter.Set(server.URL)
+			err := serverSetter.Set(server.URL)
+			if err != nil {
+				fmt.Sprintln("Error in set")
+				return
+			}
+
 			defer server.Close()
 			finder := NewFinder(serverFinder, server.Client(), sessManager, ctxFinder)
 

pkg/credential/credteam/setter_test.go

@@ -3,6 +3,7 @@ package credteam
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"os"
 	"testing"
 
@@ -54,11 +55,15 @@ func TestSet(t *testing.T) {
 			}
 
 			server := mockServer(out.status, body)
-			serverSetter.Set(server.URL)
+			err := serverSetter.Set(server.URL)
+			if err != nil {
+				fmt.Sprintln("Error in set")
+				return
+			}
 			defer server.Close()
 			setter := NewSetter(serverFinder, server.Client(), sessManager, ctxFinder)
 
-			err := setter.Set(in)
+			err = setter.Set(in)
 			if err != nil && err.Error() != out.err.Error() {
 				t.Errorf("Set(%s) got %v, want %v", tt.name, err, out.err)
 			}

pkg/credential/credteam/settings.go

@@ -23,7 +23,6 @@ var (
 
 type Settings struct {
 	serverFinder   server.Finder
-	configURL      string
 	httpClient     *http.Client
 	sessionManager session.Manager
 	ctxFinder      rcontext.Finder

pkg/credential/credteam/settings_test.go

@@ -3,6 +3,7 @@ package credteam
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"os"
 	"reflect"
 	"testing"
@@ -82,7 +83,11 @@ func TestFields(t *testing.T) {
 			}
 
 			server := mockServer(out.status, body)
-			serverSetter.Set(server.URL)
+			err := serverSetter.Set(server.URL)
+			if err != nil {
+				fmt.Sprintln("Error in set")
+				return
+			}
 			defer server.Close()
 			settings := NewSettings(serverFinder, server.Client(), sessManager, ctxFinder)
 

pkg/formula/runner.go

@@ -78,8 +78,17 @@ func (d DefaultRunner) Run(def Definition) error {
 	if err != nil {
 		return err
 	}
-	defer fileutil.RemoveDir(tDir)
-	os.Chdir(tBDir)
+	defer func() {
+		err := fileutil.RemoveDir(tDir)
+		if err != nil {
+			fmt.Sprintln("Error in remove dir")
+			return
+		}
+	}()
+	err = os.Chdir(tBDir)
+	if err != nil {
+		return err
+	}
 	bFilePath = def.BinFilePath(tBDir, bName)
 
 	cmd := exec.Command(bFilePath)
@@ -220,7 +229,7 @@ func (d DefaultRunner) persistCache(formulaPath, inputVal string, input Input, i
 		itemsBytes, _ := json.Marshal(items)
 		err := fileutil.WriteFile(cachePath, itemsBytes)
 		if err != nil {
-			fmt.Sprintf("Error in WriteFile")
+			fmt.Sprintln("Error in WriteFile")
 			return
 		}
 
@@ -381,4 +390,3 @@ func (d DefaultRunner) unzipFile(filename, destPath string) error {
 	log.Println("Done.")
 	return nil
 }
-

pkg/rcontext/finder_test.go

@@ -55,7 +55,7 @@ func TestFind(t *testing.T) {
 			if in != nil {
 				_, err := setter.Set(in.ctx)
 				if err != nil {
-					fmt.Sprintf("Error in Set")
+					fmt.Sprintln("Error in Set")
 					return
 				}
 			}

pkg/rcontext/remover_test.go

@@ -15,12 +15,12 @@ func TestRemove(t *testing.T) {
 
 	_, err := setter.Set(dev)
 	if err != nil {
-		fmt.Sprintf("Error in Set")
+		fmt.Sprintln("Error in Set")
 		return
 	}
 	_, err = setter.Set(qa)
 	if err != nil {
-		fmt.Sprintf("Error in Set")
+		fmt.Sprintln("Error in Set")
 		return
 	}
 

pkg/security/oauth/login.go

@@ -150,12 +150,12 @@ func (l LoginManager) handlerLogin(provider *oidc.Provider, state string, oauth2
 		}{}
 		err = idToken.Claims(&user)
 		if err != nil {
-			fmt.Sprintf("Error in Claims")
+			fmt.Sprintln("Error in Claims")
 			return
 		}
 		_, err = w.Write([]byte(htmlLogin))
 		if err != nil {
-			fmt.Sprintf("Error in Write")
+			fmt.Sprintln("Error in Write")
 			return
 		}
 		l.Resp <- security.ChanResponse{

pkg/security/oauth/logout.go

@@ -96,7 +96,7 @@ func (l *LogoutManager) handlerLogout() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		_, err := w.Write([]byte(htmlLogout))
 		if err != nil {
-			fmt.Sprintf("Error in Write")
+			fmt.Sprintln("Error in Write")
 			return
 		}
 		l.Resp <- security.ChanResponse{}

pkg/security/secteam/provider.go

@@ -15,7 +15,7 @@ func loginChannelProvider(p security.AuthProvider, org, serverURL string) (chan
 		go func() {
 			err := oauthCli.Login(org)
 			if err != nil {
-				fmt.Sprintf("Error in Login")
+				fmt.Sprintln("Error in Login")
 				return
 			}
 		}()
@@ -33,7 +33,7 @@ func logoutChannelProvider(p security.AuthProvider, org, serverURL string) (chan
 		go func() {
 			err := oauthCli.Logout()
 			if err != nil {
-				fmt.Sprintf("Error in Logout")
+				fmt.Sprintln("Error in Logout")
 				return
 			}
 		}()

pkg/server/finder_test.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"fmt"
 	"os"
 	"testing"
 )
@@ -10,11 +11,6 @@ func TestFind(t *testing.T) {
 	finder := NewFinder(tmp)
 	setter := NewSetter(tmp)
 
-	type out struct {
-		err  error
-		want string
-	}
-
 	tests := []struct {
 		name string
 		in   string
@@ -39,7 +35,11 @@ func TestFind(t *testing.T) {
 			out := tt.out
 
 			if in != "" {
-				setter.Set(in)
+				err := setter.Set(in)
+				if err != nil {
+					fmt.Sprintln("Error in set")
+					return
+				}
 			}
 
 			got, err := finder.Find()

pkg/server/server_test.go

@@ -10,6 +10,10 @@ import (
 
 func TestMain(m *testing.M) {
 	f := fmt.Sprintf(serverFilePattern, os.TempDir())
-	fileutil.RemoveFile(f)
+	err := fileutil.RemoveFile(f)
+	if err != nil {
+		fmt.Sprintln("Error in remove file")
+		return
+	}
 	os.Exit(m.Run())
 }

pkg/server/setter.go

@@ -11,7 +11,6 @@ const serverFilePattern = "%s/server"
 
 type SetterManager struct {
 	serverFile string
-	finder     Finder
 }
 
 func NewSetter(ritchieHomeDir string) Setter {

pkg/workspace/default_workspace.go

@@ -52,7 +52,7 @@ func (d DefaultChecker) Check() error {
 		defer func() {
 			err := lock.Unlock()
 			if err != nil {
-				fmt.Sprintf("Error in Unlock")
+				fmt.Sprintln("Error in Unlock")
 				return
 			}
 		}()