Skip to content

Commit 5ce29ec

Browse files
dbussinkdbussink
committed
Update linter config and fix some cases
Signed-off-by: Dirkjan Bussink <[email protected]>
1 parent 9ea6be4 commit 5ce29ec

20 files changed

+64
-83
lines changed

‎.golangci.yml

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
version: "2"
12
linters:
3+
exclusions:
4+
generated: lax
5+
presets:
6+
- comments
7+
- common-false-positives
8+
- std-error-handling
9+
formatters:
210
enable:
311
- goimports

‎Brewfile.lock.json

-40
This file was deleted.

‎internal/cmd/auth/login.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func LoginCmd(ch *cmdutil.Helper) *cobra.Command {
2929
Short: "Authenticate with the PlanetScale API",
3030
RunE: func(cmd *cobra.Command, args []string) error {
3131
if !printer.IsTTY {
32-
return errors.New("The 'login' command requires an interactive shell")
32+
return errors.New("the 'login' command requires an interactive shell")
3333
}
3434

3535
authenticator, err := auth.New(cleanhttp.DefaultClient(), clientID, clientSecret, auth.SetBaseURL(authURL))

‎internal/cmd/connect/connect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func runCommand(ctx context.Context, addr, command, protocol, databaseEnvURL, da
287287
if errors.As(err, &ee) {
288288
return &cmdutil.Error{
289289
Msg: fmt.Sprintf("running command with --execute has failed: %s\n", err),
290-
ExitCode: ee.ProcessState.ExitCode(),
290+
ExitCode: ee.ExitCode(),
291291
}
292292
}
293293

‎internal/cmd/deployrequest/deploy_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ func TestDeployRequest_DeployBranchName(t *testing.T) {
7070

7171
org := "planetscale"
7272
db := "planetscale"
73-
var number uint64 = 10
74-
var branchName string = "dev"
73+
number := uint64(10)
74+
branchName := "dev"
7575

7676
svc := &mock.DeployRequestsService{
7777
DeployFn: func(ctx context.Context, req *ps.PerformDeployRequest) (*ps.DeployRequest, error) {

‎internal/cmd/deployrequest/edit_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ func TestDeployRequest_EditCmd(t *testing.T) {
2525

2626
org := "planetscale"
2727
db := "planetscale"
28-
var number uint64 = 10
29-
var enable bool = true
28+
number := uint64(10)
29+
enable := true
3030

3131
svc := &mock.DeployRequestsService{
3232
AutoApplyFn: func(ctx context.Context, req *ps.AutoApplyDeployRequestRequest) (*ps.DeployRequest, error) {

‎internal/cmd/deployrequest/show_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ func TestDeployRequest_ShowBranchName(t *testing.T) {
7070

7171
org := "planetscale"
7272
db := "planetscale"
73-
var number uint64 = 10
74-
var branchName string = "dev"
73+
number := uint64(10)
74+
branchName := "dev"
7575

7676
svc := &mock.DeployRequestsService{
7777
GetFn: func(ctx context.Context, req *ps.GetDeployRequestRequest) (*ps.DeployRequest, error) {

‎internal/cmd/keyspace/vschema_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ func TestKeyspace_UpdateVSchemaCmd(t *testing.T) {
111111

112112
tmpFile, err := os.CreateTemp("", "vschema.json")
113113
c.Assert(err, qt.IsNil)
114-
tmpFile.Write([]byte(raw))
114+
_, err = tmpFile.Write([]byte(raw))
115+
c.Assert(err, qt.IsNil)
115116
tmpFile.Close()
116117

117118
cmd := UpdateVSchemaCmd(ch)

‎internal/cmd/workflow/cancel_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -126,4 +127,4 @@ func TestWorkflow_CancelCmd_Error(t *testing.T) {
126127

127128
c.Assert(err, qt.Not(qt.IsNil))
128129
c.Assert(svc.CancelFnInvoked, qt.IsTrue)
129-
}
130+
}

‎internal/cmd/workflow/complete_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -128,4 +129,4 @@ func TestWorkflow_CompleteCmd_Error(t *testing.T) {
128129

129130
c.Assert(err, qt.Not(qt.IsNil))
130131
c.Assert(svc.CompleteFnInvoked, qt.IsTrue)
131-
}
132+
}

‎internal/cmd/workflow/create.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import (
88
"github.com/charmbracelet/huh"
99
"github.com/planetscale/cli/internal/cmdutil"
1010
"github.com/planetscale/cli/internal/printer"
11-
ps "github.com/planetscale/planetscale-go/planetscale"
1211
"github.com/spf13/cobra"
12+
13+
ps "github.com/planetscale/planetscale-go/planetscale"
1314
)
1415

1516
type createFlags struct {
@@ -50,7 +51,7 @@ func CreateCmd(ch *cmdutil.Helper) *cobra.Command {
5051

5152
workflow, err := createWorkflow(ctx, client, org, db, branch, flags)
5253
end()
53-
54+
5455
if err != nil {
5556
return err
5657
}
@@ -303,4 +304,4 @@ func findKeyspace(keyspaces []*ps.Keyspace, name string) *ps.Keyspace {
303304
}
304305

305306
return nil
306-
}
307+
}

‎internal/cmd/workflow/create_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -99,7 +100,7 @@ func TestWorkflow_CreateCmd(t *testing.T) {
99100
"--defer-secondary-keys",
100101
"--on-ddl", onDDL,
101102
})
102-
103+
103104
err := cmd.Execute()
104105

105106
c.Assert(err, qt.IsNil)
@@ -160,9 +161,9 @@ func TestWorkflow_CreateCmd_Error(t *testing.T) {
160161
"--defer-secondary-keys",
161162
"--on-ddl", "STOP",
162163
})
163-
164+
164165
err := cmd.Execute()
165166

166167
c.Assert(err, qt.Not(qt.IsNil))
167168
c.Assert(svc.CreateFnInvoked, qt.IsTrue)
168-
}
169+
}

‎internal/cmd/workflow/cutover_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -128,4 +129,4 @@ func TestWorkflow_CutoverCmd_Error(t *testing.T) {
128129

129130
c.Assert(err, qt.Not(qt.IsNil))
130131
c.Assert(svc.CutoverFnInvoked, qt.IsTrue)
131-
}
132+
}

‎internal/cmd/workflow/list_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"context"
66
"testing"
77

8-
qt "github.com/frankban/quicktest"
98
"github.com/planetscale/cli/internal/cmdutil"
109
"github.com/planetscale/cli/internal/config"
1110
"github.com/planetscale/cli/internal/mock"
1211
"github.com/planetscale/cli/internal/printer"
12+
13+
qt "github.com/frankban/quicktest"
1314
ps "github.com/planetscale/planetscale-go/planetscale"
1415
)
1516

‎internal/cmd/workflow/retry_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -126,4 +127,4 @@ func TestWorkflow_RetryCmd_Error(t *testing.T) {
126127

127128
c.Assert(err, qt.Not(qt.IsNil))
128129
c.Assert(svc.RetryFnInvoked, qt.IsTrue)
129-
}
130+
}

‎internal/cmd/workflow/reverse_cutover_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -126,4 +127,4 @@ func TestWorkflow_ReverseCutoverCmd_Error(t *testing.T) {
126127

127128
c.Assert(err, qt.Not(qt.IsNil))
128129
c.Assert(svc.ReverseCutoverFnInvoked, qt.IsTrue)
129-
}
130+
}

‎internal/cmd/workflow/reverse_traffic_test.go

+12-11
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -31,16 +32,16 @@ func TestWorkflow_ReverseTrafficCmd(t *testing.T) {
3132

3233
// Create expected workflow response
3334
expectedWorkflow := &ps.Workflow{
34-
ID: "workflow1",
35-
Number: workflowNumber,
36-
Name: "test-workflow",
37-
State: "traffic_reversed",
38-
CreatedAt: createdAt,
39-
UpdatedAt: createdAt,
40-
ReversedAt: &reversedAt,
41-
ReplicasSwitched: false, // Traffic has been reversed
35+
ID: "workflow1",
36+
Number: workflowNumber,
37+
Name: "test-workflow",
38+
State: "traffic_reversed",
39+
CreatedAt: createdAt,
40+
UpdatedAt: createdAt,
41+
ReversedAt: &reversedAt,
42+
ReplicasSwitched: false, // Traffic has been reversed
4243
PrimariesSwitched: false, // Traffic has been reversed
43-
Tables: []*ps.WorkflowTable{{Name: "table1"}, {Name: "table2"}},
44+
Tables: []*ps.WorkflowTable{{Name: "table1"}, {Name: "table2"}},
4445
SourceKeyspace: ps.Keyspace{
4546
Name: "source_ks",
4647
},
@@ -128,4 +129,4 @@ func TestWorkflow_ReverseTrafficCmd_Error(t *testing.T) {
128129

129130
c.Assert(err, qt.Not(qt.IsNil))
130131
c.Assert(svc.ReverseTrafficFnInvoked, qt.IsTrue)
131-
}
132+
}

‎internal/cmd/workflow/show_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"context"
66
"testing"
77

8-
qt "github.com/frankban/quicktest"
98
"github.com/planetscale/cli/internal/cmdutil"
109
"github.com/planetscale/cli/internal/config"
1110
"github.com/planetscale/cli/internal/mock"
1211
"github.com/planetscale/cli/internal/printer"
12+
13+
qt "github.com/frankban/quicktest"
1314
ps "github.com/planetscale/planetscale-go/planetscale"
1415
)
1516

‎internal/cmd/workflow/switch_traffic_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -200,4 +201,4 @@ func TestWorkflow_SwitchTrafficCmd_Error(t *testing.T) {
200201

201202
c.Assert(err, qt.Not(qt.IsNil))
202203
c.Assert(svc.SwitchPrimariesFnInvoked, qt.IsTrue)
203-
}
204+
}

‎internal/cmd/workflow/verify_data_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import (
66
"testing"
77
"time"
88

9-
qt "github.com/frankban/quicktest"
109
"github.com/planetscale/cli/internal/cmdutil"
1110
"github.com/planetscale/cli/internal/config"
1211
"github.com/planetscale/cli/internal/mock"
1312
"github.com/planetscale/cli/internal/printer"
13+
14+
qt "github.com/frankban/quicktest"
1415
ps "github.com/planetscale/planetscale-go/planetscale"
1516
)
1617

@@ -122,4 +123,4 @@ func TestWorkflow_VerifyDataCmd_Error(t *testing.T) {
122123

123124
c.Assert(err, qt.Not(qt.IsNil))
124125
c.Assert(svc.VerifyDataFnInvoked, qt.IsTrue)
125-
}
126+
}

0 commit comments

Comments
 (0)