Skip to content

Commit ad62038

Browse files
authored
[ci] add nonamedreturns linter (#703)
Signed-off-by: Mikhail Scherba <[email protected]>
1 parent f22ccb5 commit ad62038

27 files changed

+262
-218
lines changed

.golangci.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ linters:
88
- depguard
99
- dogsled
1010
- durationcheck
11-
- exportloopref
11+
- copyloopvar
1212
- gci
1313
- gochecknoinits
1414
- gocritic
@@ -20,6 +20,7 @@ linters:
2020
- ineffassign
2121
- misspell
2222
- nolintlint
23+
- nonamedreturns
2324
- prealloc
2425
- revive
2526
- sloglint
@@ -78,6 +79,10 @@ linters-settings:
7879
deny:
7980
- pkg: "gopkg.in/satori/go.uuid.v1"
8081
desc: "Use https://github.com/gofrs/uuid instead. Satori/go.uuid is no longer maintained and has critical vulnerabilities."
82+
nonamedreturns:
83+
# Report named error if it is assigned inside defer.
84+
# Default: false
85+
report-error-in-defer: false
8186
issues:
8287
exclude-dirs:
8388
- test/integration

pkg/debug/server.go

+11-14
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,28 @@ func NewServer(prefix, socketPath, httpAddr string, logger *log.Logger) *Server
4343
}
4444
}
4545

46-
func (s *Server) Init() (err error) {
46+
func (s *Server) Init() error {
4747
address := s.SocketPath
4848

49-
err = os.MkdirAll(path.Dir(address), 0o700)
50-
if err != nil {
51-
s.logger.Errorf("Debug HTTP server fail to create socket '%s': %v", address, err)
52-
return err
49+
if err := os.MkdirAll(path.Dir(address), 0o700); err != nil {
50+
return fmt.Errorf("Debug HTTP server fail to create socket '%s': %w", address, err)
5351
}
5452

5553
exists, err := utils.FileExists(address)
5654
if err != nil {
57-
s.logger.Errorf("Debug HTTP server fail to check socket '%s': %v", address, err)
58-
return err
55+
return fmt.Errorf("Debug HTTP server fail to check socket '%s': %w", address, err)
5956
}
57+
6058
if exists {
61-
err = os.Remove(address)
62-
if err != nil {
63-
s.logger.Errorf("Debug HTTP server fail to remove existing socket '%s': %v", address, err)
64-
return err
59+
if err := os.Remove(address); err != nil {
60+
return fmt.Errorf("Debug HTTP server fail to check socket '%s': %w", address, err)
6561
}
6662
}
6763

6864
// Check if socket is available
6965
listener, err := net.Listen("unix", address)
7066
if err != nil {
71-
s.logger.Errorf("Debug HTTP server fail to listen on '%s': %v", address, err)
72-
return err
67+
return fmt.Errorf("Debug HTTP server fail to listen on '%s': %w", address, err)
7368
}
7469

7570
s.logger.Infof("Debug endpoint listen on %s", address)
@@ -153,7 +148,9 @@ func handleFormattedOutput(writer http.ResponseWriter, request *http.Request, ha
153148
}
154149
}
155150

156-
func transformUsingFormat(w io.Writer, val interface{}, format string) (err error) {
151+
func transformUsingFormat(w io.Writer, val interface{}, format string) error {
152+
var err error
153+
157154
switch format {
158155
case "yaml":
159156
enc := yaml.NewEncoder(w)

pkg/filter/jq/jq_exec.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
// jqExec is a subprocess implementation of the jq filtering.
13-
func jqExec(jqFilter string, jsonData []byte, libPath string) (result string, err error) {
13+
func jqExec(jqFilter string, jsonData []byte, libPath string) (string, error) {
1414
var cmd *exec.Cmd
1515
if libPath == "" {
1616
cmd = exec.Command("jq", jqFilter)
@@ -19,14 +19,16 @@ func jqExec(jqFilter string, jsonData []byte, libPath string) (result string, er
1919
}
2020

2121
var stdinBuf bytes.Buffer
22-
_, err = stdinBuf.WriteString(string(jsonData))
22+
_, err := stdinBuf.WriteString(string(jsonData))
2323
if err != nil {
2424
panic(err)
2525
}
26-
cmd.Stdin = &stdinBuf
26+
2727
var stdoutBuf bytes.Buffer
28-
cmd.Stdout = &stdoutBuf
2928
var stderrBuf bytes.Buffer
29+
30+
cmd.Stdin = &stdinBuf
31+
cmd.Stdout = &stdoutBuf
3032
cmd.Stderr = &stderrBuf
3133

3234
err = executor.Run(cmd)

pkg/hook/config/config_v0.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,31 @@ type KubeNamespaceSelectorV0 struct {
4343
}
4444

4545
// ConvertAndCheckV0 fills non-versioned structures and run inter-field checks not covered by OpenAPI schemas.
46-
func (cv0 *HookConfigV0) ConvertAndCheck(c *HookConfig) (err error) {
47-
c.OnStartup, err = c.ConvertOnStartup(cv0.OnStartup)
48-
if err != nil {
46+
func (cv0 *HookConfigV0) ConvertAndCheck(c *HookConfig) error {
47+
var err error
48+
49+
if c.OnStartup, err = c.ConvertOnStartup(cv0.OnStartup); err != nil {
4950
return err
5051
}
5152

5253
c.Schedules = []htypes.ScheduleConfig{}
5354
for i, rawSchedule := range cv0.Schedule {
54-
err := cv0.CheckSchedule(rawSchedule)
55-
if err != nil {
56-
return fmt.Errorf("invalid schedule config [%d]: %v", i, err)
55+
if err := cv0.CheckSchedule(rawSchedule); err != nil {
56+
return fmt.Errorf("invalid schedule config [%d]: %w", i, err)
5757
}
58+
5859
schedule, err := cv0.ConvertSchedule(rawSchedule)
5960
if err != nil {
6061
return err
6162
}
63+
6264
c.Schedules = append(c.Schedules, schedule)
6365
}
6466

6567
c.OnKubernetesEvents = []htypes.OnKubernetesEventConfig{}
6668
for i, kubeCfg := range cv0.OnKubernetesEvent {
67-
err := cv0.CheckOnKubernetesEvent(kubeCfg, fmt.Sprintf("onKubernetesEvent[%d]", i))
68-
if err != nil {
69-
return fmt.Errorf("invalid onKubernetesEvent config [%d]: %v", i, err)
69+
if err := cv0.CheckOnKubernetesEvent(kubeCfg, fmt.Sprintf("onKubernetesEvent[%d]", i)); err != nil {
70+
return fmt.Errorf("invalid onKubernetesEvent config [%d]: %w", i, err)
7071
}
7172

7273
monitor := &kubeeventsmanager.MonitorConfig{}

0 commit comments

Comments
 (0)