Skip to content

Commit 2265436

Browse files
authored
Merge pull request #3852 from saschagrunert/lint
Update golangci-lint to v1.62
2 parents 81d94f3 + 5f7f4b3 commit 2265436

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
- name: golangci-lint
2626
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
2727
with:
28-
version: v1.61
28+
version: v1.62

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ linters:
5555
- gosmopolitan
5656
- govet
5757
- grouper
58+
- iface
5859
- importas
5960
- ineffassign
6061
- intrange
@@ -72,6 +73,7 @@ linters:
7273
- promlinter
7374
- protogetter
7475
- reassign
76+
- recvcheck
7577
- revive
7678
- rowserrcheck
7779
- sloglint

cmd/krel/cmd/release_notes.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,8 @@ func fixReleaseNotes(workDir string, releaseNotes *notes.ReleaseNotes) error {
11841184
_, choice, err := util.Ask(fmt.Sprintf("\n- Fix note for PR #%d? (y/N)", note.PrNumber), "y:Y:yes|n:N:no|n", 10)
11851185
if err != nil {
11861186
// If the user cancelled with ctr+c exit and continue the PR flow
1187-
if err.(util.UserInputError).IsCtrlC() {
1187+
var userInputErr util.UserInputError
1188+
if errors.As(err, &userInputErr) && userInputErr.IsCtrlC() {
11881189
logrus.Info("Input cancelled, exiting edit flow")
11891190
return nil
11901191
}
@@ -1240,8 +1241,10 @@ func fixReleaseNotes(workDir string, releaseNotes *notes.ReleaseNotes) error {
12401241
func pointIfChanged(label string, var1, var2 interface{}) string {
12411242
changed := false
12421243
// Check if alues are string
1243-
if _, ok := var1.(string); ok {
1244-
if var1.(string) != var2.(string) {
1244+
var1String, ok1 := var1.(string)
1245+
var2String, ok2 := var2.(string)
1246+
if ok1 && ok2 {
1247+
if var1String != var2String {
12451248
changed = true
12461249
}
12471250
}
@@ -1253,9 +1256,11 @@ func pointIfChanged(label string, var1, var2 interface{}) string {
12531256
}
12541257
}
12551258

1256-
// Check if string slices
1257-
if _, ok := var1.(bool); ok {
1258-
if var1.(bool) != var2.(bool) {
1259+
// Check if bools
1260+
var1Bool, ok1 := var1.(bool)
1261+
var2Bool, ok2 := var2.(bool)
1262+
if ok1 && ok2 {
1263+
if var1Bool != var2Bool {
12591264
changed = true
12601265
}
12611266
}
@@ -1458,9 +1463,12 @@ func confirmWithUser(opts *releaseNotesOptions, question string) bool {
14581463
_, success, err := util.Ask(question+" (Y/n)", "y:Y:yes|n:N:no|y", 10)
14591464
if err != nil {
14601465
logrus.Error(err)
1461-
if err.(util.UserInputError).IsCtrlC() {
1466+
1467+
var userInputErr util.UserInputError
1468+
if errors.As(err, &userInputErr) && userInputErr.IsCtrlC() {
14621469
os.Exit(1)
14631470
}
1471+
14641472
return false
14651473
}
14661474
if success {

dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ dependencies:
371371

372372
# golangci-lint-version
373373
- name: "golangci-lint"
374-
version: v1.61
374+
version: v1.62
375375
refPaths:
376376
- path: .github/workflows/lint.yml
377377
match: "version: v\\d+.\\d+?\\.?(\\d+)?"

pkg/cve/cve.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ func (cve *CVE) ReadRawInterface(cvedata interface{}) error {
6565
if val, ok := cvedata.(map[interface{}]interface{})["linkedPRs"].([]interface{}); ok {
6666
cve.LinkedPRs = []int{}
6767
for _, prid := range val {
68-
cve.LinkedPRs = append(cve.LinkedPRs, prid.(int))
68+
if prid, ok := prid.(int); ok {
69+
cve.LinkedPRs = append(cve.LinkedPRs, prid)
70+
}
6971
}
7072
}
7173

0 commit comments

Comments
 (0)