Skip to content

Commit 776b024

Browse files
authored
Merge pull request #594 from mmorel-35/errorlint
enable errorlint linter
2 parents 26ae564 + 8a3c749 commit 776b024

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

.golangci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ linters:
289289
- bodyclose
290290
- depguard
291291
- errcheck
292+
- errorlint
292293
- exportloopref
293294
- funlen
294295
- gci

cmd/helm3.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func getHelmVersion() (*semver.Version, error) {
2525
debugPrint("Executing %s", strings.Join(cmd.Args, " "))
2626
output, err := cmd.CombinedOutput()
2727
if err != nil {
28-
return nil, fmt.Errorf("Failed to run `%s version`: %v", os.Getenv("HELM_BIN"), err)
28+
return nil, fmt.Errorf("Failed to run `%s version`: %w", os.Getenv("HELM_BIN"), err)
2929
}
3030
versionOutput := string(output)
3131

@@ -35,7 +35,7 @@ func getHelmVersion() (*semver.Version, error) {
3535
}
3636
helmVersion, err := semver.NewVersion(matches[1])
3737
if err != nil {
38-
return nil, fmt.Errorf("Failed to parse version %#v: %v", matches[1], err)
38+
return nil, fmt.Errorf("Failed to parse version %#v: %w", matches[1], err)
3939
}
4040

4141
return helmVersion, nil

cmd/helpers.go

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

33
import (
4+
"errors"
45
"fmt"
56
"os"
67
"os/exec"
@@ -32,7 +33,8 @@ func debugPrint(format string, a ...interface{}) {
3233
func outputWithRichError(cmd *exec.Cmd) ([]byte, error) {
3334
debugPrint("Executing %s", strings.Join(cmd.Args, " "))
3435
output, err := cmd.Output()
35-
if exitError, ok := err.(*exec.ExitError); ok {
36+
var exitError *exec.ExitError
37+
if errors.As(err, &exitError) {
3638
return output, fmt.Errorf("%s: %s", exitError.Error(), string(exitError.Stderr))
3739
}
3840
return output, err

cmd/upgrade.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,12 @@ func (d *diffCmd) runHelm3() error {
288288
}
289289
}
290290
if err != nil {
291-
return fmt.Errorf("Failed to get release %s in namespace %s: %s", d.release, d.namespace, err)
291+
return fmt.Errorf("Failed to get release %s in namespace %s: %w", d.release, d.namespace, err)
292292
}
293293

294294
installManifest, err := d.template(!newInstall)
295295
if err != nil {
296-
return fmt.Errorf("Failed to render chart: %s", err)
296+
return fmt.Errorf("Failed to render chart: %w", err)
297297
}
298298

299299
if d.threeWayMerge {

main.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"errors"
45
"os"
56

67
_ "k8s.io/client-go/plugin/pkg/client/auth/azure"
@@ -13,9 +14,10 @@ import (
1314

1415
func main() {
1516
if err := cmd.New().Execute(); err != nil {
16-
switch e := err.(type) {
17-
case cmd.Error:
18-
os.Exit(e.Code)
17+
var cmdErr cmd.Error
18+
switch {
19+
case errors.As(err, &cmdErr):
20+
os.Exit(cmdErr.Code)
1921
default:
2022
os.Exit(1)
2123
}

manifest/parse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func parseContent(content string, defaultNamespace string, normalizeManifests bo
134134

135135
subs, err := parseContent(string(subcontent), defaultNamespace, normalizeManifests, excludedHooks...)
136136
if err != nil {
137-
return nil, fmt.Errorf("Parsing YAML list item: %v", err)
137+
return nil, fmt.Errorf("Parsing YAML list item: %w", err)
138138
}
139139

140140
result = append(result, subs...)

0 commit comments

Comments
 (0)