From 3f7377ed4dc6d91df9ff547a93c0dcb443e5109c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 14:25:36 +0000 Subject: [PATCH 1/2] Bump golangci/golangci-lint-action from 6 to 7 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6 to 7. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v6...v7) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/eventlist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/eventlist.yml b/.github/workflows/eventlist.yml index aa66b65..ca7770c 100644 --- a/.github/workflows/eventlist.yml +++ b/.github/workflows/eventlist.yml @@ -128,7 +128,7 @@ jobs: check-latest: true - name: golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v7 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version version: latest From d2d1111ca2590b891c8ce449429f753fd4e70816 Mon Sep 17 00:00:00 2001 From: Jonatan Antoni Date: Tue, 1 Apr 2025 14:16:17 +0200 Subject: [PATCH 2/2] Fixup: Migrate to golangci-lint v2 --- .github/workflows/eventlist.yml | 2 -- tools/eventlist/.golangci.yaml | 47 +++++++++++++++++-------- tools/eventlist/cmd/make/make.go | 18 +++++----- tools/eventlist/pkg/eval/expression.go | 5 +-- tools/eventlist/pkg/event/event_test.go | 16 ++++----- tools/eventlist/pkg/output/output.go | 7 ++-- 6 files changed, 57 insertions(+), 38 deletions(-) diff --git a/.github/workflows/eventlist.yml b/.github/workflows/eventlist.yml index ca7770c..000e376 100644 --- a/.github/workflows/eventlist.yml +++ b/.github/workflows/eventlist.yml @@ -130,8 +130,6 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v7 with: - # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: latest working-directory: ./tools/eventlist format: diff --git a/tools/eventlist/.golangci.yaml b/tools/eventlist/.golangci.yaml index d3cddda..2bd3cc9 100644 --- a/tools/eventlist/.golangci.yaml +++ b/tools/eventlist/.golangci.yaml @@ -1,15 +1,34 @@ +version: "2" linters: - enable: - - errname - - errorlint - - goerr113 - - makezero - - nilerr - - paralleltest - - prealloc - - predeclared - - revive - - thelper - - unconvert - - unparam - - wastedassign + enable: + - err113 + - errname + - errorlint + - makezero + - nilerr + - paralleltest + - prealloc + - predeclared + - revive + - thelper + - unconvert + - unparam + - wastedassign + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + paths: + - third_party$ + - builtin$ + - examples$ +formatters: + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ diff --git a/tools/eventlist/cmd/make/make.go b/tools/eventlist/cmd/make/make.go index b2c15a4..6b40d6b 100644 --- a/tools/eventlist/cmd/make/make.go +++ b/tools/eventlist/cmd/make/make.go @@ -63,23 +63,23 @@ type runner struct { } func (r runner) run(command string) { - switch { - case command == "build": + switch command { + case "build": versionInfo, err := createResourceInfoFile(r.options.targetArch) if err != nil { fmt.Println(err.Error()) return } - info := versionInfo.StringFileInfo.FileVersion + " " + versionInfo.StringFileInfo.LegalCopyright + info := versionInfo.StringFileInfo.FileVersion + " " + versionInfo.LegalCopyright if err = r.build(r.options, info); err != nil { fmt.Println(err.Error()) } - case command == "test": + case "test": if err := r.test(); err != nil { fmt.Println(err.Error()) return } - case command == "coverage": + case "coverage": if r.options.covReport == "" { if err := r.coverage(); err != nil { fmt.Println(err.Error()) @@ -91,9 +91,9 @@ func (r runner) run(command string) { return } } - case command == "lint": + case "lint": r.lint() - case command == "format": + case "format": r.format() } } @@ -233,7 +233,7 @@ func createResourceInfoFile(arch string) (version goversioninfo.VersionInfo, err ProductVersion: gitVersion.String(), LegalCopyright: "Copyright (c) 2022-" + gitYear + " " + legalCopyright, } - verInfo.VarFileInfo.Translation = goversioninfo.Translation{ + verInfo.Translation = goversioninfo.Translation{ LangID: 1033, CharsetID: 1200, } @@ -291,7 +291,7 @@ func newVersion(verStr string) (ver version, err error) { tokens := strings.Split(versionStr, "-") numTokens := len(tokens) - if !(numTokens == 1 || numTokens == 3) { + if numTokens != 1 && numTokens != 3 { return ver, reportError(ErrVersion, "invalid version string") } verParts := strings.Split(tokens[0], ".") diff --git a/tools/eventlist/pkg/eval/expression.go b/tools/eventlist/pkg/eval/expression.go index 36a1a10..856befa 100644 --- a/tools/eventlist/pkg/eval/expression.go +++ b/tools/eventlist/pkg/eval/expression.go @@ -660,7 +660,8 @@ func (ex *Expression) lex() (Value, error) { } s0 += string(c) done := false - if c == '\\' { + switch c { + case '\\': var cx byte if c, err = ex.get(); err != nil { return v, syntaxError(fnLex, s0) @@ -731,7 +732,7 @@ func (ex *Expression) lex() (Value, error) { v.s += string(rune(i)) done = true } - } else if c == '"' { + case '"': v.t = String return v, nil } diff --git a/tools/eventlist/pkg/event/event_test.go b/tools/eventlist/pkg/event/event_test.go index bd2130d..5361e7a 100644 --- a/tools/eventlist/pkg/event/event_test.go +++ b/tools/eventlist/pkg/event/event_test.go @@ -331,14 +331,14 @@ func TestEventData_calculateEnumExpression(t *testing.T) { //nolint:golint,paral func TestEventData_EvalLine(t *testing.T) { t.Parallel() - var ev1 scvd.EventType = scvd.EventType{ID: "id1", Value: "x%%%d[val1]y%u[val2]z"} - var ev2 scvd.EventType = scvd.EventType{ID: "id2", Value: "x%T[val1]y%x[val2]z"} - var ev3 scvd.EventType = scvd.EventType{ID: "id3", Value: "x%I[val3]y%J[val3]z"} - var ev4 scvd.EventType = scvd.EventType{ID: "id4", Value: "x%M[val3]y%S[val3]z"} - var evE1 scvd.EventType = scvd.EventType{ID: "idE1", Value: "x%E[val2, typName]y"} - var evTD scvd.EventType = scvd.EventType{ID: "idTD", Val1: "v1", Val2: "v2", Val3: "4BY", Val4: "v4", Val5: "v5", Val6: "v6", Value: "x%x[val3.B2]y"} - var everr1 scvd.EventType = scvd.EventType{ID: "iderr1", Value: "x%d[;]y"} - var everr2 scvd.EventType = scvd.EventType{ID: "iderr2", Value: "x%E[;]y"} + var ev1 = scvd.EventType{ID: "id1", Value: "x%%%d[val1]y%u[val2]z"} + var ev2 = scvd.EventType{ID: "id2", Value: "x%T[val1]y%x[val2]z"} + var ev3 = scvd.EventType{ID: "id3", Value: "x%I[val3]y%J[val3]z"} + var ev4 = scvd.EventType{ID: "id4", Value: "x%M[val3]y%S[val3]z"} + var evE1 = scvd.EventType{ID: "idE1", Value: "x%E[val2, typName]y"} + var evTD = scvd.EventType{ID: "idTD", Val1: "v1", Val2: "v2", Val3: "4BY", Val4: "v4", Val5: "v5", Val6: "v6", Value: "x%x[val3.B2]y"} + var everr1 = scvd.EventType{ID: "iderr1", Value: "x%d[;]y"} + var everr2 = scvd.EventType{ID: "iderr2", Value: "x%E[;]y"} var vals eval.Member vals.Enums = make(map[int64]string) diff --git a/tools/eventlist/pkg/output/output.go b/tools/eventlist/pkg/output/output.go index 4f2f89e..385ea20 100644 --- a/tools/eventlist/pkg/output/output.go +++ b/tools/eventlist/pkg/output/output.go @@ -891,7 +891,8 @@ func Print(filename *string, formatType *string, level *string, eventFile *strin out := bufio.NewWriter(file) err = o.print(out, eventFile, evdefs, typedefs, statBegin, showStatistic, &eventsTable) if err == nil { - if FormatType == "json" { + switch FormatType { + case "json": output, err := json.Marshal(eventsTable) if err == nil { buf := bytes.NewBuffer(output) @@ -900,7 +901,7 @@ func Print(filename *string, formatType *string, level *string, eventFile *strin out.Flush() } } - } else if FormatType == "xml" { + case "xml": output, err := xml.Marshal(eventsTable) if err == nil { buf := bytes.NewBuffer(output) @@ -909,7 +910,7 @@ func Print(filename *string, formatType *string, level *string, eventFile *strin out.Flush() } } - } else { + default: err = out.Flush() } } else {