Re-write CLI

Author: roblaszczak

.golangci.yml

@@ -0,0 +1,44 @@
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - asciicheck
+    - bodyclose
+    - dogsled
+    - exhaustive
+    - exportloopref
+    - gocognit
+    - goconst
+    - gofmt
+    - goheader
+    - goimports
+    - gosec
+    - misspell
+    - nakedret
+    - nestif
+    - noctx
+    - rowserrcheck
+    - sqlclosecheck
+    - unconvert
+    - unparam
+    - whitespace
+
+issues:
+  exclude:
+    - "composite literal uses unkeyed fields"
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - gosec
+        - noctx
+        - unparam
+        - bodyclose

Makefile

@@ -8,4 +8,18 @@ proto:
 
 .PHONY: install
 install:
-	go install .
+	go install .
+
+
+.PHONY: lint
+lint:
+	golangci-lint run
+
+.PHONY: test
+test:
+	go test ./...
+
+.PHONY: fmt
+fmt:
+	goimports -local github.com/ThreeDotsLabs -l -w .
+

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/hexops/gotextdiff v1.0.3
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/afero v1.6.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
 	google.golang.org/grpc v1.40.0

go.sum

@@ -54,12 +54,15 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -71,8 +74,11 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
+github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -81,6 +87,7 @@ github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/X
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

internal/confirm.go

@@ -7,14 +7,17 @@ import (
 	"strings"
 )
 
-var stdin io.Reader = os.Stdin
-var stdout io.Writer = os.Stdout
-
 func ConfirmPrompt(msg string) bool {
-	defer fmt.Fprintln(stdout)
+	return FConfirmPrompt(msg, os.Stdin, os.Stdout)
+}
+
+func FConfirmPrompt(msg string, stdin io.Reader, stdout io.Writer) bool {
+	defer func() {
+		_, _ = fmt.Fprintln(stdout)
+	}()
 
 	for {
-		fmt.Fprintf(stdout, "%s [y/n]: ", msg)
+		_, _ = fmt.Fprintf(stdout, "%s [y/n]: ", msg)
 
 		var input string
 		_, err := fmt.Fscanln(stdin, &input)
@@ -37,19 +40,25 @@ func ConfirmPrompt(msg string) bool {
 }
 
 func ConfirmPromptDefaultYes(msg string) bool {
-	defer fmt.Println()
+	return FConfirmPromptDefaultYes(msg, os.Stdin, os.Stdout)
+}
+
+func FConfirmPromptDefaultYes(msg string, stdin io.Reader, stdout io.Writer) bool {
+	defer func() {
+		_, _ = fmt.Fprintln(stdout)
+	}()
 
 	for {
-		fmt.Fprintf(stdout, "%s [Y/n]: ", msg)
+		_, _ = fmt.Fprintf(stdout, "%s [Y/n]: ", msg)
 
 		var input string
 		_, _ = fmt.Fscanln(stdin, &input)
 
 		input = strings.ToLower(input)
 		if input == "n" || input == "no" {
 			return false
+		} else {
+			return true
 		}
-
-		return true
 	}
 }

internal/confirm_test.go

@@ -2,7 +2,6 @@ package internal
 
 import (
 	"bytes"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -50,17 +49,12 @@ func TestConfirmPrompt(t *testing.T) {
 		tc := testCases[i]
 
 		t.Run(tc.Input, func(t *testing.T) {
-			defer func() {
-				stdin = os.Stdin
-				stdout = os.Stdout
-			}()
+			stdin := bytes.NewBufferString(tc.Input)
+			stdout := bytes.NewBuffer(nil)
 
-			stdin = bytes.NewBufferString(tc.Input)
-			stdout = bytes.NewBuffer(nil)
-
-			ok := ConfirmPrompt("some msg")
+			ok := FConfirmPrompt("some msg", stdin, stdout)
 			assert.Equal(t, tc.ExpectedResult, ok)
-			assert.Equal(t, tc.ExpectedMessage, stdout.(*bytes.Buffer).String())
+			assert.Equal(t, tc.ExpectedMessage, stdout.String())
 		})
 	}
 }
@@ -104,17 +98,12 @@ func TestConfirmPromptDefaultYes(t *testing.T) {
 		tc := testCases[i]
 
 		t.Run(tc.Input, func(t *testing.T) {
-			defer func() {
-				stdin = os.Stdin
-				stdout = os.Stdout
-			}()
-
-			stdin = bytes.NewBufferString(tc.Input)
-			stdout = bytes.NewBuffer(nil)
+			stdin := bytes.NewBufferString(tc.Input)
+			stdout := bytes.NewBuffer(nil)
 
-			ok := ConfirmPromptDefaultYes("some msg")
+			ok := FConfirmPromptDefaultYes("some msg", stdin, stdout)
 			assert.Equal(t, tc.ExpectedResult, ok)
-			assert.Equal(t, "some msg [Y/n]: ", stdout.(*bytes.Buffer).String())
+			assert.Equal(t, "some msg [Y/n]: \n", stdout.String())
 		})
 	}
 }

internal/print.go

@@ -0,0 +1,7 @@
+package internal
+
+import "github.com/fatih/color"
+
+func SprintCommand(cmd string) string {
+	return color.CyanString(cmd)
+}