diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 027e5f8466..57104ea3af 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -7,7 +7,7 @@ on: env: GO_VERSION: '1.25' - GOLANGCI_LINT_VERSION: v2.8.0 + GOLANGCI_LINT_VERSION: v2.10.1 MISSPELL_VERSION: v0.7.0 jobs: diff --git a/.golangci.yml b/.golangci.yml index a0fcc0112a..7dd5763bea 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -309,7 +309,7 @@ linters: text: 'var-naming: avoid meaningless package names' linters: - revive - - path: (pkg/muxer/http/.+|pkg/provider/http/.+)\.go + - path: ((cmd|pkg)/version/.*|pkg/config/runtime/.*|pkg/log/.*|pkg/(middlewares/)?metrics/.*|pkg/muxer/http/.+|pkg/provider/http/.+|pkg/tls/.+)\.go text: 'var-naming: avoid package names that conflict with Go standard library package names' linters: - revive diff --git a/cmd/internal/gen/centrifuge.go b/cmd/internal/gen/centrifuge.go index 2c0f6e6349..5e363d280d 100644 --- a/cmd/internal/gen/centrifuge.go +++ b/cmd/internal/gen/centrifuge.go @@ -158,7 +158,7 @@ func (c Centrifuge) run(sc *types.Scope, rootPkg string, pkgName string) map[str func (c Centrifuge) writeStruct(name string, obj *types.Struct, rootPkg string, elt *File) string { b := strings.Builder{} - b.WriteString(fmt.Sprintf("type %s struct {\n", name)) + fmt.Fprintf(&b, "type %s struct {\n", name) for i := range obj.NumFields() { field := obj.Field(i) @@ -175,7 +175,7 @@ func (c Centrifuge) writeStruct(name string, obj *types.Struct, rootPkg string, fType := c.TypeCleaner(field.Type(), rootPkg) if field.Embedded() { - b.WriteString(fmt.Sprintf("\t%s\n", fType)) + fmt.Fprintf(&b, "\t%s\n", fType) continue } @@ -184,10 +184,10 @@ func (c Centrifuge) writeStruct(name string, obj *types.Struct, rootPkg string, continue } - b.WriteString(fmt.Sprintf("\t%s %s", field.Name(), fType)) + fmt.Fprintf(&b, "\t%s %s", field.Name(), fType) if ok { - b.WriteString(fmt.Sprintf(" `json:\"%s\"`", strings.Join(values, ","))) + fmt.Fprintf(&b, " `json:\"%s\"`", strings.Join(values, ",")) } b.WriteString("\n") diff --git a/internal/gendoc.go b/internal/gendoc.go index 116040b1e8..83e142a5e3 100644 --- a/internal/gendoc.go +++ b/internal/gendoc.go @@ -300,7 +300,7 @@ THIS FILE MUST NOT BE EDITED BY HAND } if w.err != nil { - logger.Fatal(err) + logger.Fatal(w.err) } } diff --git a/pkg/provider/acme/local_store_windows.go b/pkg/provider/acme/local_store_windows.go index 747618eb8b..63a903b979 100644 --- a/pkg/provider/acme/local_store_windows.go +++ b/pkg/provider/acme/local_store_windows.go @@ -3,7 +3,7 @@ package acme import "os" // CheckFile checks file content size -// Do not check file permissions on Windows right now +// Do not check file permissions on Windows right now. func CheckFile(name string) (bool, error) { f, err := os.Open(name) if err != nil {