Update linter config and fix some cases

Signed-off-by: Dirkjan Bussink <[email protected]>

Author: dbussink

.golangci.yml

@@ -1,3 +1,11 @@
+version: "2"
 linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - std-error-handling
+formatters:
   enable:
     - goimports

Brewfile.lock.json

@@ -29,7 +29,7 @@ func LoginCmd(ch *cmdutil.Helper) *cobra.Command {
 		Short: "Authenticate with the PlanetScale API",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if !printer.IsTTY {
-				return errors.New("The 'login' command requires an interactive shell")
+				return errors.New("the 'login' command requires an interactive shell")
 			}
 
 			authenticator, err := auth.New(cleanhttp.DefaultClient(), clientID, clientSecret, auth.SetBaseURL(authURL))

internal/cmd/auth/login.go

@@ -287,7 +287,7 @@ func runCommand(ctx context.Context, addr, command, protocol, databaseEnvURL, da
 	if errors.As(err, &ee) {
 		return &cmdutil.Error{
 			Msg:      fmt.Sprintf("running command with --execute has failed: %s\n", err),
-			ExitCode: ee.ProcessState.ExitCode(),
+			ExitCode: ee.ExitCode(),
 		}
 	}
 

internal/cmd/connect/connect.go

@@ -70,8 +70,8 @@ func TestDeployRequest_DeployBranchName(t *testing.T) {
 
 	org := "planetscale"
 	db := "planetscale"
-	var number uint64 = 10
-	var branchName string = "dev"
+	number := uint64(10)
+	branchName := "dev"
 
 	svc := &mock.DeployRequestsService{
 		DeployFn: func(ctx context.Context, req *ps.PerformDeployRequest) (*ps.DeployRequest, error) {

internal/cmd/deployrequest/deploy_test.go

@@ -25,8 +25,8 @@ func TestDeployRequest_EditCmd(t *testing.T) {
 
 	org := "planetscale"
 	db := "planetscale"
-	var number uint64 = 10
-	var enable bool = true
+	number := uint64(10)
+	enable := true
 
 	svc := &mock.DeployRequestsService{
 		AutoApplyFn: func(ctx context.Context, req *ps.AutoApplyDeployRequestRequest) (*ps.DeployRequest, error) {

internal/cmd/deployrequest/edit_test.go

@@ -70,8 +70,8 @@ func TestDeployRequest_ShowBranchName(t *testing.T) {
 
 	org := "planetscale"
 	db := "planetscale"
-	var number uint64 = 10
-	var branchName string = "dev"
+	number := uint64(10)
+	branchName := "dev"
 
 	svc := &mock.DeployRequestsService{
 		GetFn: func(ctx context.Context, req *ps.GetDeployRequestRequest) (*ps.DeployRequest, error) {

internal/cmd/deployrequest/show_test.go

@@ -111,7 +111,8 @@ func TestKeyspace_UpdateVSchemaCmd(t *testing.T) {
 
 	tmpFile, err := os.CreateTemp("", "vschema.json")
 	c.Assert(err, qt.IsNil)
-	tmpFile.Write([]byte(raw))
+	_, err = tmpFile.Write([]byte(raw))
+	c.Assert(err, qt.IsNil)
 	tmpFile.Close()
 
 	cmd := UpdateVSchemaCmd(ch)

internal/cmd/keyspace/vschema_test.go

@@ -6,11 +6,12 @@ import (
 	"testing"
 	"time"
 
-	qt "github.com/frankban/quicktest"
 	"github.com/planetscale/cli/internal/cmdutil"
 	"github.com/planetscale/cli/internal/config"
 	"github.com/planetscale/cli/internal/mock"
 	"github.com/planetscale/cli/internal/printer"
+
+	qt "github.com/frankban/quicktest"
 	ps "github.com/planetscale/planetscale-go/planetscale"
 )
 
@@ -126,4 +127,4 @@ func TestWorkflow_CancelCmd_Error(t *testing.T) {
 
 	c.Assert(err, qt.Not(qt.IsNil))
 	c.Assert(svc.CancelFnInvoked, qt.IsTrue)
-}
+}

internal/cmd/workflow/cancel_test.go

@@ -6,11 +6,12 @@ import (
 	"testing"
 	"time"
 
-	qt "github.com/frankban/quicktest"
 	"github.com/planetscale/cli/internal/cmdutil"
 	"github.com/planetscale/cli/internal/config"
 	"github.com/planetscale/cli/internal/mock"
 	"github.com/planetscale/cli/internal/printer"
+
+	qt "github.com/frankban/quicktest"
 	ps "github.com/planetscale/planetscale-go/planetscale"
 )
 
@@ -128,4 +129,4 @@ func TestWorkflow_CompleteCmd_Error(t *testing.T) {
 
 	c.Assert(err, qt.Not(qt.IsNil))
 	c.Assert(svc.CompleteFnInvoked, qt.IsTrue)
-}
+}