Fix linger issues

Author: dsimansk

.golangci.yaml

@@ -72,7 +72,7 @@ linters:
     - gocritic
 
     # See config below
-    - gomodguard
+    - gomodguard_v2
 
     # Inspects source code for security problems.
     - gosec
@@ -154,27 +154,26 @@ linters:
       checks:
       - all
       - "-QF1008" # Disable https://staticcheck.dev/docs/checks/#QF1008
-    gomodguard:
+    gomodguard_v2:
       blocked:
-        modules:
-          - github.com/ghodss/yaml:
-              recommendations:
-                - sigs.k8s.io/yaml
-          - go.uber.org/atomic:
-              recommendations:
-                - sync/atomic
-          - io/ioutil:
-              recommendations:
-                - os
-                - io
-          - github.com/hashicorp/go-multierror:
-              recommendations:
-                - errors
-              reason: use errors.Join
-          - go.uber.org/multierr:
-              recommendations:
-                - errors
-              reason: use errors.Join
+        - module: github.com/ghodss/yaml
+          recommendations:
+            - sigs.k8s.io/yaml
+        - module: go.uber.org/atomic
+          recommendations:
+            - sync/atomic
+        - module: io/ioutil
+          recommendations:
+            - os
+            - io
+        - module: github.com/hashicorp/go-multierror
+          recommendations:
+            - errors
+          reason: use errors.Join
+        - module: go.uber.org/multierr
+          recommendations:
+            - errors
+          reason: use errors.Join
     revive:
       rules:
         # use unparam linter instead - defaults are better
@@ -190,10 +189,15 @@ linters:
     rules:
       - linters:
         - staticcheck
-        text: corev1.Endpoint.* is deprecated
+        text: (corev1.Endpoint|k8s.io/api/core/v1.Endpoints).* is deprecated
       - linters:
           - staticcheck
         text: .*NewSimpleClientset is deprecated
+      # These tests intentionally exercise fields marked as deprecated.
+      - linters:
+          - staticcheck
+        text: 'is deprecated: This field is deprecated'
+        path: _test\.go
       - linters:
           - gosec
           - noctx

apis/deprecated.go

@@ -116,7 +116,7 @@ func getPrefixedNamedFieldValues(prefix string, obj interface{}) (map[string]ref
 // getInterface returns the interface value of the reflected object.
 func getInterface(a reflect.Value) interface{} {
 	switch a.Kind() {
-	case reflect.Ptr:
+	case reflect.Pointer:
 		if a.IsNil() {
 			return nil
 		}
@@ -137,7 +137,7 @@ func getInterface(a reflect.Value) interface{} {
 // nonZero returns true if a is nil or reflect.Zero.
 func nonZero(a reflect.Value) bool {
 	switch a.Kind() {
-	case reflect.Ptr:
+	case reflect.Pointer:
 		if a.IsNil() {
 			return false
 		}
@@ -168,7 +168,7 @@ func differ(a, b reflect.Value) bool {
 	}
 
 	switch a.Kind() {
-	case reflect.Ptr:
+	case reflect.Pointer:
 		if a.IsNil() || b.IsNil() {
 			return a.IsNil() != b.IsNil()
 		}

configmap/hash-gen/main.go

@@ -38,6 +38,7 @@ func main() {
 // processFile reads the ConfigMap manifest from a file and adds or updates the label
 // containing the checksum of it's _example data if present.
 func processFile(fileName string) error {
+	//nolint:gosec // This build-time tool reads ConfigMap manifests passed as CLI args; path traversal is not a concern.
 	in, err := os.ReadFile(fileName)
 	if err != nil {
 		return fmt.Errorf("failed to read file: %w", err)

configmap/load.go

@@ -46,6 +46,7 @@ func Load(p string) (map[string]string, error) {
 		if info.IsDir() {
 			return nil
 		}
+		//nolint:gosec // Reading files from a trusted mounted ConfigMap volume; symlink traversal is not a concern.
 		b, err := os.ReadFile(p)
 		if err != nil {
 			return err

injection/config.go

@@ -40,6 +40,7 @@ func ParseAndGetRESTConfigOrDie() *rest.Config {
 }
 
 // GetRESTConfig returns a rest.Config to be used for kubernetes client creation.
+//
 // Deprecated: use environment.ClientConfig package
 func GetRESTConfig(serverURL, kubeconfig string) (*rest.Config, error) {
 	env := environment.ClientConfig{

injection/sharedmain/main.go

@@ -142,6 +142,7 @@ func GetObservabilityConfig(ctx context.Context) (*observability.Config, error)
 
 // EnableInjectionOrDie enables Knative Injection and starts the informers.
 // Both Context and Config are optional.
+//
 // Deprecated: use injection.EnableInjectionOrDie
 func EnableInjectionOrDie(ctx context.Context, cfg *rest.Config) context.Context {
 	ctx, startInformers := injection.EnableInjectionOrDie(ctx, cfg)

kmeta/map.go

@@ -19,16 +19,19 @@ package kmeta
 import "knative.dev/pkg/kmap"
 
 // CopyMap makes a copy of the map.
+//
 // Deprecated: use kmap.Copy
 var CopyMap = kmap.Copy
 
 // UnionMaps returns a map constructed from the union of input maps.
 // where values from latter maps win.
+//
 // Deprecated: use kmap.Union
 var UnionMaps = kmap.Union
 
 // FilterMap creates a copy of the provided map, filtering out the elements
 // that match `filter`.
 // nil `filter` is accepted.
+//
 // Deprecated: use kmap.Filter
 var FilterMap = kmap.Filter

kmp/reporters_test.go

@@ -30,7 +30,8 @@ type testStruct struct {
 	StructField childStruct `json:"child"`
 	Omit        string      `json:"omit,omitempty"`
 	Ignore      string      `json:"-"`
-	Dash        string      `json:"-,"`
+	//nolint:staticcheck // We actually want to test this broken json option works.
+	Dash string `json:"-,"`
 	//nolint:staticcheck // We actually want to test this broken json options work
 	MultiComma string `json:"multi,omitempty,somethingelse"`
 }

network/h2c.go

@@ -24,16 +24,20 @@ import (
 	"time"
 
 	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/h2c"
 )
 
 // NewServer returns a new HTTP Server with HTTP2 handler.
 func NewServer(addr string, h http.Handler) *http.Server {
 	h1s := &http.Server{
 		Addr:              addr,
-		Handler:           h2c.NewHandler(h, &http2.Server{}),
+		Handler:           h,
 		ReadHeaderTimeout: time.Minute, // https://medium.com/a-journey-with-go/go-understand-and-mitigate-slowloris-attack-711c1b1403f6
+		Protocols:         new(http.Protocols),
 	}
+	// Serve HTTP/1.1 alongside unencrypted HTTP/2 (h2c) using the standard
+	// library instead of the deprecated golang.org/x/net/http2/h2c handler.
+	h1s.Protocols.SetHTTP1(true)
+	h1s.Protocols.SetUnencryptedHTTP2(true)
 
 	return h1s
 }
@@ -50,9 +54,8 @@ func newH2CTransport(disableCompression bool) http.RoundTripper {
 	return &http2.Transport{
 		AllowHTTP:          true,
 		DisableCompression: disableCompression,
-		DialTLS: func(netw, addr string, _ *tls.Config) (net.Conn, error) {
-			return DialWithBackOff(context.Background(),
-				netw, addr)
+		DialTLSContext: func(ctx context.Context, netw, addr string, _ *tls.Config) (net.Conn, error) {
+			return DialWithBackOff(ctx, netw, addr)
 		},
 	}
 }

network/transports.go

@@ -85,7 +85,6 @@ func dialBackOffHelper(ctx context.Context, network, address string, bo wait.Bac
 	dialer := &net.Dialer{
 		Timeout:   bo.Duration, // Initial duration.
 		KeepAlive: 5 * time.Second,
-		DualStack: true,
 	}
 	start := time.Now()
 	for {