Update golangci-lint

Author: firelizzard18

.golangci.yml

@@ -1,3 +1,23 @@
+linters-settings:
+  custom:
+    noprint:
+      type: module
+    nodebug:
+      type: module
+    rangevarref:
+      type: module
+
+  goheader:
+    values:
+      const:
+        AUTHOR: The Accumulate Authors
+    template: |-
+      Copyright {{ YEAR }} {{ AUTHOR }}
+
+      Use of this source code is governed by an MIT-style
+      license that can be found in the LICENSE file or at
+      https://opensource.org/licenses/MIT.
+
 linters:
   disable-all: true
   enable:
@@ -59,15 +79,3 @@ issues:
   - path: ^test/util/goroutine_leaks\.go$
     linters:
     - goheader
-
-linters-settings:
-  goheader:
-    values:
-      const:
-        AUTHOR: The Accumulate Authors
-    template: |-
-      Copyright {{ YEAR }} {{ AUTHOR }}
-
-      Use of this source code is governed by an MIT-style
-      license that can be found in the LICENSE file or at
-      https://opensource.org/licenses/MIT.

go.mod

@@ -1,32 +1,24 @@
-// Copyright 2022 The Accumulate Authors
-//
+// Copyright 2024 The Accumulate Authors
+// 
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
 package main
 
 import (
-	"fmt"
-	"reflect"
-	"unsafe"
-
-	"github.com/golangci/golangci-lint/pkg/lint/linter"
-	"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
+	"golang.org/x/tools/go/analysis"
 )
 
-var customLinters []*linter.Config
-
-func addCustomLinters(db *lintersdb.Manager) {
-	field, ok := reflect.TypeOf(db).Elem().FieldByName("nameToLCs")
-	if !ok {
-		panic(fmt.Errorf("can't find linter config field"))
-	}
+type customLinter struct {
+	LoadMode string
+	Analyzer *analysis.Analyzer
+}
 
-	// This is a horrific abuse of Go. But using a plugin would be a huge PITA.
-	nameToLCs := *(*map[string][]*linter.Config)(unsafe.Pointer(uintptr(unsafe.Pointer(db)) + field.Offset))
+func (c *customLinter) GetLoadMode() string {
+	return c.LoadMode
+}
 
-	for _, lc := range customLinters {
-		nameToLCs[lc.Name()] = append(nameToLCs[lc.Name()], lc)
-	}
+func (c *customLinter) BuildAnalyzers() ([]*analysis.Analyzer, error) {
+	return []*analysis.Analyzer{c.Analyzer}, nil
 }

go.sum

@@ -1,5 +1,5 @@
-// Copyright 2023 The Accumulate Authors
-//
+// Copyright 2024 The Accumulate Authors
+// 
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.

tools/cmd/golangci-lint/custom.go

@@ -1,5 +1,5 @@
-// Copyright 2022 The Accumulate Authors
-//
+// Copyright 2024 The Accumulate Authors
+// 
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.

tools/cmd/golangci-lint/custom_test.go

@@ -1,5 +1,5 @@
-// Copyright 2023 The Accumulate Authors
-//
+// Copyright 2024 The Accumulate Authors
+// 
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
@@ -23,15 +23,14 @@ var (
 )
 
 func main() {
-	e := commands.NewExecutor(commands.BuildInfo{
+	err := commands.Execute(commands.BuildInfo{
 		GoVersion: "go",
 		Version:   version,
 		Commit:    commit,
 		Date:      date,
 	})
-	addCustomLinters(e.DBManager)
 
-	if err := e.Execute(); err != nil {
+	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed executing command with error %v\n", err)
 		os.Exit(exitcodes.Failure)
 	}

tools/cmd/golangci-lint/debug.go

@@ -1,5 +1,5 @@
-// Copyright 2022 The Accumulate Authors
-//
+// Copyright 2024 The Accumulate Authors
+// 
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
@@ -10,23 +10,24 @@ import (
 	"go/ast"
 	"strings"
 
-	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
-	"github.com/golangci/golangci-lint/pkg/lint/linter"
+	"github.com/golangci/plugin-module-register/register"
 	"golang.org/x/tools/go/analysis"
 )
 
 func init() {
 	const name = "nodebug"
 	const doc = "Checks for enabled debug flags"
 
-	customLinters = append(customLinters, linter.NewConfig(
-		goanalysis.NewLinter(name, doc, []*analysis.Analyzer{{
-			Name: name,
-			Doc:  doc,
-			Run:  nodebug,
-		}}, nil).
-			WithLoadMode(goanalysis.LoadModeSyntax),
-	))
+	register.Plugin(name, func(any) (register.LinterPlugin, error) {
+		return &customLinter{
+			LoadMode: register.LoadModeSyntax,
+			Analyzer: &analysis.Analyzer{
+				Name: name,
+				Doc:  doc,
+				Run:  nodebug,
+			},
+		}, nil
+	})
 }
 
 func nodebug(pass *analysis.Pass) (interface{}, error) {

tools/cmd/golangci-lint/main.go

@@ -1,5 +1,5 @@
-// Copyright 2022 The Accumulate Authors
-//
+// Copyright 2024 The Accumulate Authors
+// 
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
@@ -9,23 +9,24 @@ package main
 import (
 	"go/ast"
 
-	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
-	"github.com/golangci/golangci-lint/pkg/lint/linter"
+	"github.com/golangci/plugin-module-register/register"
 	"golang.org/x/tools/go/analysis"
 )
 
 func init() {
 	const name = "noprint"
 	const doc = "Checks for out of place print statements"
 
-	customLinters = append(customLinters, linter.NewConfig(
-		goanalysis.NewLinter(name, doc, []*analysis.Analyzer{{
-			Name: name,
-			Doc:  doc,
-			Run:  noprint,
-		}}, nil).
-			WithLoadMode(goanalysis.LoadModeSyntax),
-	))
+	register.Plugin(name, func(any) (register.LinterPlugin, error) {
+		return &customLinter{
+			LoadMode: register.LoadModeSyntax,
+			Analyzer: &analysis.Analyzer{
+				Name: name,
+				Doc:  doc,
+				Run:  noprint,
+			},
+		}, nil
+	})
 }
 
 func noprint(pass *analysis.Pass) (interface{}, error) {

tools/cmd/golangci-lint/nodebug.go

@@ -1,5 +1,5 @@
-// Copyright 2022 The Accumulate Authors
-//
+// Copyright 2024 The Accumulate Authors
+// 
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
@@ -11,23 +11,24 @@ import (
 	"go/token"
 	"go/types"
 
-	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
-	"github.com/golangci/golangci-lint/pkg/lint/linter"
+	"github.com/golangci/plugin-module-register/register"
 	"golang.org/x/tools/go/analysis"
 )
 
 func init() {
 	const name = "rangevarref"
 	const doc = "Checks for loops that capture a pointer to a value-type range variable"
 
-	customLinters = append(customLinters, linter.NewConfig(
-		goanalysis.NewLinter(name, doc, []*analysis.Analyzer{{
-			Name: name,
-			Doc:  doc,
-			Run:  rangevarref,
-		}}, nil).
-			WithLoadMode(goanalysis.LoadModeTypesInfo),
-	))
+	register.Plugin(name, func(any) (register.LinterPlugin, error) {
+		return &customLinter{
+			LoadMode: register.LoadModeSyntax,
+			Analyzer: &analysis.Analyzer{
+				Name: name,
+				Doc:  doc,
+				Run:  rangevarref,
+			},
+		}, nil
+	})
 }
 
 func rangevarref(pass *analysis.Pass) (interface{}, error) {