Skip to content

Commit 483dc06

Browse files
authored
chore(lint): format for the new golangci-lint version (#283)
1 parent 724b307 commit 483dc06

File tree

11 files changed

+34
-18
lines changed

11 files changed

+34
-18
lines changed

internal/cmd/config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cmd
22

33
import (
4+
"context"
45
"errors"
56
"fmt"
67
"log/slog"
@@ -84,7 +85,7 @@ func editConfig() error {
8485
return errNoEditor
8586
}
8687

87-
cmd := exec.Command(editor, config.Path)
88+
cmd := exec.CommandContext(context.TODO(), editor, config.Path)
8889

8990
cmd.Stdin = os.Stdin
9091
cmd.Stdout = os.Stdout

internal/gh/gh.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ func isRetryable(e error) bool {
6565
switch httpError.StatusCode {
6666
case http.StatusNotFound, http.StatusBadGateway, http.StatusGatewayTimeout: // expected status code
6767
return true
68+
default:
6869
}
6970
}
7071

internal/gh/gh_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func TestParse(t *testing.T) {
273273
notifications, next, err := parse(test.response)
274274

275275
if test.fails && err == nil {
276-
t.Errorf("expected test to fails")
276+
t.Error("expected test to fails")
277277
} else if !test.fails && err != nil {
278278
t.Errorf("expected test to pass, got %#v", err)
279279
}
@@ -338,7 +338,7 @@ func TestRequest(t *testing.T) {
338338

339339
_, _, err := client.request(verb, endpoint, nil)
340340
if err == nil {
341-
t.Errorf("expected test to fails")
341+
t.Error("expected test to fails")
342342
}
343343

344344
if !errors.Is(err, errExpected) {
@@ -361,7 +361,7 @@ func TestRequest(t *testing.T) {
361361

362362
notifications, next, err := client.request(verb, endpoint, nil)
363363
if err != nil {
364-
t.Errorf("expected test to pass")
364+
t.Error("expected test to pass")
365365
}
366366

367367
if next != "https://next.page" {
@@ -634,7 +634,7 @@ func TestEnrich(t *testing.T) {
634634
assertError: func(t *testing.T, err error) {
635635
t.Helper()
636636
if err == nil {
637-
t.Fatalf("expected error but got nil")
637+
t.Fatal("expected error but got nil")
638638
}
639639

640640
expected := &json.SyntaxError{}

internal/jq/jq_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestFilter(t *testing.T) {
4949
assertErr: func(t *testing.T, err error) {
5050
t.Helper()
5151
if err == nil {
52-
t.Fatalf("expected error but got nil")
52+
t.Fatal("expected error but got nil")
5353
}
5454

5555
expected := &gojq.ParseError{}
@@ -134,7 +134,7 @@ func TestValidate(t *testing.T) {
134134
assertErr: func(t *testing.T, err error) {
135135
t.Helper()
136136
if err == nil {
137-
t.Fatalf("expected error but got nil")
137+
t.Fatal("expected error but got nil")
138138
}
139139

140140
expected := &gojq.ParseError{}

internal/logger/logger.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ func initWithWriter(w io.Writer, verbosity int) {
3838
case 5:
3939
opts.Level = slog.LevelDebug
4040
opts.AddSource = true
41+
default:
42+
opts.Level = slog.LevelInfo
4143
}
4244

4345
handler := slog.NewTextHandler(w, opts)

internal/manager/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func (m *Manager) refreshNotifications() error {
141141
}
142142

143143
//nolint:forbidigo // This is an expected print statement.
144-
fmt.Printf("Refreshing notifications...\n")
144+
fmt.Print("Refreshing notifications...\n")
145145

146146
remoteNotifications, err := m.client.Notifications()
147147
if err != nil {

internal/manager/strategies.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ func (r *RefreshStrategy) String() string {
3232
return "force"
3333
case PreventRefresh:
3434
return "prevent"
35+
default:
36+
return "unknown"
3537
}
36-
37-
return "unknown"
3838
}
3939

4040
func (*RefreshStrategy) Allowed() string {
@@ -125,9 +125,7 @@ func (*ForceStrategy) Allowed() string {
125125
}
126126

127127
func (r *ForceStrategy) Set(value string) error {
128-
v := strings.Split(value, ",")
129-
130-
for _, s := range v {
128+
for s := range strings.SplitSeq(value, ",") {
131129
switch s {
132130
case "apply":
133131
*r |= ForceApply

internal/manager/strategies_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ func TestRefreshStrategy(t *testing.T) {
4444
t.Parallel()
4545

4646
var got RefreshStrategy
47+
4748
err := got.Set(test.value)
4849

4950
if test.error {
5051
if err == nil {
51-
t.Errorf("expected an error but got none")
52+
t.Error("expected an error but got none")
5253
}
5354
} else {
5455
if err != nil {
@@ -106,11 +107,12 @@ func TestForceStrategy(t *testing.T) {
106107
t.Parallel()
107108

108109
var got ForceStrategy
110+
109111
err := got.Set(test.value)
110112

111113
if test.error {
112114
if err == nil {
113-
t.Errorf("expected an error but got none")
115+
t.Error("expected an error but got none")
114116
}
115117
} else {
116118
if err != nil {

internal/notifications/sync_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ func TestSync(t *testing.T) {
112112
)
113113

114114
if !got[0].Meta.RemoteExists {
115-
t.Fatalf("expected RemoteExists to be true but got false")
115+
t.Fatal("expected RemoteExists to be true but got false")
116116
}
117117

118118
if got[1].Meta.RemoteExists {
119-
t.Fatalf("expected RemoteExists to be false but got true")
119+
t.Fatal("expected RemoteExists to be false but got true")
120120
}
121121

122122
if !got[2].Meta.RemoteExists {
123-
t.Fatalf("expected RemoteExists to be true but got false")
123+
t.Fatal("expected RemoteExists to be true but got false")
124124
}
125125
})
126126

internal/repl/handlers.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,12 @@ func (m model) handleCommand(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
5959

6060
case key.Matches(msg, m.keymap.CommandCancel):
6161
return m.cancelCommand()
62+
63+
default:
6264
}
6365

6466
var cmd tea.Cmd
67+
6568
m.command, cmd = m.command.Update(msg)
6669

6770
return m, cmd
@@ -77,16 +80,20 @@ func (m model) handleResult(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
7780
m.showResult = false
7881

7982
return m, nil
83+
84+
default:
8085
}
8186

8287
var cmd tea.Cmd
88+
8389
m.result, cmd = m.result.Update(msg)
8490

8591
return m, cmd
8692
}
8793

8894
//revive:disable:cognitive-complexity // TODO: simplify.
8995
//revive:disable:cyclomatic // Ditto.
96+
//nolint:cyclop // Ditto.
9097
func (m model) handleBrowsing(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
9198
slog.Debug("browsing", "key", msg.String())
9299

@@ -122,9 +129,12 @@ func (m model) handleBrowsing(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
122129
slog.Debug("focus command")
123130

124131
return m, m.command.Focus()
132+
133+
default:
125134
}
126135

127136
var cmd tea.Cmd
137+
128138
m.list, cmd = m.list.Update(msg)
129139

130140
return m, cmd
@@ -147,6 +157,7 @@ func (m model) handleFiltering(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
147157
slog.Debug("filtering", "key", msg.String())
148158

149159
var cmd tea.Cmd
160+
150161
m.list, cmd = m.list.Update(msg)
151162

152163
return m, cmd

0 commit comments

Comments
 (0)