Upgrade to golangci-lint v2 for improved linting

Also fixes issues reported by golangci-lint v2:

* Change `Replace` to `ReplaceAll` where sensible
* Omit an embedded field
* `ingress/v2` had been imported twice
* Nicer casing in logs

Noteworthy changes in golangci-lint v2:

* New config format (migrated with `migrate` command)
* Default timeout is now 0 instead of 1 minute.

Author: jorbaum

scripts/subtests/lint

@@ -9,7 +9,7 @@ set +e
 golangci_lint_executable=$(which golangci-lint)
 set -e
 if [ -z "${golangci_lint_executable}" ] || [ ! -x "${golangci_lint_executable}" ]; then
-  go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+  go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
 fi
 
 pushd "${SCRIPT_DIR}/../../src" > /dev/null

src/.golangci.yml

@@ -1,8 +1,8 @@
+version: "2"
 run:
-  # Timeout for analysis, e.g. 30s, 5m.
-  # Default: 1m
+  # Timeout full work, e.g. 30s, 5m.
+  # Default: none
   timeout: 5m
-
 linters:
   enable:
     # Checks for non-ASCII identifiers
@@ -11,15 +11,31 @@ linters:
     - gocyclo
     # Inspects source code for security problems.
     - gosec
-
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      # Exclude some linters from running on helheim generated file.
+      - linters:
+          - unused
+        path: pkg/egress/v2/helheim_test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   # Disable max issues per linter.
   max-issues-per-linter: 0
   # Disable max same issues.
   max-same-issues: 0
-
-  exclude-rules:
-    # Exclude some linters from running on helheim generated file.
-    - path: pkg/egress/v2/helheim_test\.go
-      linters:
-        - unused
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

src/cmd/loggregator-agent/app/app_v1.go

@@ -84,7 +84,7 @@ func (a *AppV1) Start() {
 		a.metricClient,
 	)
 	if err != nil {
-		log.Panic(fmt.Errorf("Failed to listen on %s: %s", agentAddress, err))
+		log.Panic(fmt.Errorf("failed to listen on %s: %s", agentAddress, err))
 	}
 
 	log.Printf("agent v1 API started on addr %s", agentAddress)

src/cmd/loggregator-agent/app/app_v2.go

@@ -18,7 +18,6 @@ import (
 	"code.cloudfoundry.org/loggregator-agent-release/src/pkg/diodes"
 	egress "code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress/v2"
 	ingress "code.cloudfoundry.org/loggregator-agent-release/src/pkg/ingress/v2"
-	v2 "code.cloudfoundry.org/loggregator-agent-release/src/pkg/ingress/v2"
 	"code.cloudfoundry.org/loggregator-agent-release/src/pkg/plumbing"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -137,7 +136,7 @@ func (a *AppV2) Start() {
 	var es envelopeSetter
 	es = envelopeBuffer
 	if a.config.LogsDisabled {
-		es = v2.NewFilteringSetter(envelopeBuffer)
+		es = ingress.NewFilteringSetter(envelopeBuffer)
 	}
 
 	rx := ingress.NewReceiver(es, ingressMetric, originMappings)

src/cmd/loggregator-agent/app/config.go

@@ -66,7 +66,7 @@ func LoadConfig() (*Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	cfg.RouterAddrWithAZ = strings.Replace(cfg.RouterAddrWithAZ, "@", "-", -1)
+	cfg.RouterAddrWithAZ = strings.ReplaceAll(cfg.RouterAddrWithAZ, "@", "-")
 
 	return &cfg, nil
 }

src/cmd/syslog-agent/app/config.go

@@ -140,7 +140,7 @@ func convertCipherStringToInt(cipherStrs []string, cipherMap map[string]uint16)
 			for key := range cipherMap {
 				supportedCipherSuites = append(supportedCipherSuites, key)
 			}
-			return nil, fmt.Errorf("Invalid cipher string configuration: %s, please choose from %v", cipher, supportedCipherSuites)
+			return nil, fmt.Errorf("invalid cipher string configuration: %s, please choose from %v", cipher, supportedCipherSuites)
 		}
 	}
 

src/cmd/syslog-agent/app/syslog_agent_mtls_test.go

@@ -285,8 +285,8 @@ func (f *fakeBindingCache) startTLS(testCerts *testhelper.TestCerts) {
 	Expect(err).ToNot(HaveOccurred())
 
 	f.Server = httptest.NewUnstartedServer(f)
-	f.Server.TLS = tlsConfig
-	f.Server.StartTLS()
+	f.TLS = tlsConfig
+	f.StartTLS()
 }
 
 func (f *fakeBindingCache) ServeHTTP(w http.ResponseWriter, r *http.Request) {

src/cmd/syslog-binding-cache/app/syslog_binding_cache_test.go

@@ -289,8 +289,8 @@ func (f *fakeCC) startTLS(testCerts *testhelper.TestCerts) {
 	Expect(err).ToNot(HaveOccurred())
 
 	f.Server = httptest.NewUnstartedServer(f)
-	f.Server.TLS = tlsConfig
-	f.Server.StartTLS()
+	f.TLS = tlsConfig
+	f.StartTLS()
 }
 
 func (f *fakeCC) ServeHTTP(w http.ResponseWriter, r *http.Request) {

src/internal/testservers/agent.go

@@ -11,7 +11,10 @@ import (
 	"code.cloudfoundry.org/loggregator-agent-release/src/cmd/loggregator-agent/app"
 	"code.cloudfoundry.org/loggregator-agent-release/src/internal/testhelper"
 
+	// . imports are common usage for ginkgo
+	//nolint:staticcheck
 	. "github.com/onsi/ginkgo/v2"
+	//nolint:staticcheck
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )

src/pkg/egress/syslog/https.go

@@ -91,11 +91,11 @@ func (*HTTPSWriter) sanitizeError(u *url.URL, err error) error {
 	}
 
 	if user := u.User.Username(); user != "" {
-		err = errors.New(strings.Replace(err.Error(), user, "<REDACTED>", -1))
+		err = errors.New(strings.ReplaceAll(err.Error(), user, "<REDACTED>"))
 	}
 
 	if p, ok := u.User.Password(); ok {
-		err = errors.New(strings.Replace(err.Error(), p, "<REDACTED>", -1))
+		err = errors.New(strings.ReplaceAll(err.Error(), p, "<REDACTED>"))
 	}
 	return err
 }