[main] Upgrade to latest dependencies

go.mod

@@ -1,6 +1,6 @@
 module knative.dev/security-guard
 
-go 1.21
+go 1.22
 
 require (
 	github.com/emicklei/go-restful v2.9.5+incompatible
@@ -13,8 +13,8 @@ require (
 	k8s.io/apimachinery v0.29.2
 	k8s.io/client-go v0.29.2
 	knative.dev/hack v0.0.0-20240607132042-09143140a254
-	knative.dev/pkg v0.0.0-20240614135239-339c22b8218c
-	knative.dev/serving v0.41.1-0.20240617121625-0b61640a60ab
+	knative.dev/pkg v0.0.0-20240626134149-3f6a546ac3a4
+	knative.dev/serving v0.41.1-0.20240626135008-25783aef0b65
 )
 
 require (
@@ -77,7 +77,7 @@ require (
 	golang.org/x/tools v0.22.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/api v0.183.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
 	google.golang.org/grpc v1.64.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
@@ -89,7 +89,7 @@ require (
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
-	knative.dev/networking v0.0.0-20240607132834-85e269dff522 // indirect
+	knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect

go.sum

@@ -632,8 +632,8 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e h1:SkdGTrROJl2jRGT/Fxv5QUf9jtdKCQh4KQJXbXVLAi0=
-google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e/go.mod h1:LweJcLbyVij6rCex8YunD8DYR5VDonap/jYl3ZRxcIU=
+google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 h1:+rdxYoE3E5htTEWIe15GlN6IfvbURM//Jt0mmkmm6ZU=
+google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117/go.mod h1:OimBR/bc1wPO9iV4NC2bpyjy3VnAwZh5EBPQdtaE5oo=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -718,12 +718,12 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
 k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 knative.dev/hack v0.0.0-20240607132042-09143140a254 h1:1YFnu3U6dWZg0oxm6GU8kEdA9A+BvSWKJO7sg3N0kq8=
 knative.dev/hack v0.0.0-20240607132042-09143140a254/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
-knative.dev/networking v0.0.0-20240607132834-85e269dff522 h1:zDtZStHJI3La7jSHUAjN4Jgv0/Yynl51kuchlVLHqzA=
-knative.dev/networking v0.0.0-20240607132834-85e269dff522/go.mod h1:WS5A291Vy2unZ1L54ZSKBkz/gVzVmIy15cCcdA6PRN4=
-knative.dev/pkg v0.0.0-20240614135239-339c22b8218c h1:OaKrY7L6rzWTvs51JlieJajL40F6CpBbvO1aZspg2EA=
-knative.dev/pkg v0.0.0-20240614135239-339c22b8218c/go.mod h1:l7R8/SteYph0mZDsVgq3fVs4mWp1DaYx9BJJX68U6ik=
-knative.dev/serving v0.41.1-0.20240617121625-0b61640a60ab h1:cFa/CTFJern7SeyvFnzq/rhMFWrCyY/yESLDRLtmr58=
-knative.dev/serving v0.41.1-0.20240617121625-0b61640a60ab/go.mod h1:Z58WxiVmEynF1kX8cK4fYmNprj8IkPLl2mEHdvuP6nc=
+knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c h1:Q+DdJYzvhwAVWMQtP6mbEr5dNxpr+K9HAF9RqJmZefY=
+knative.dev/networking v0.0.0-20240611072033-3b8764c0bb4c/go.mod h1:WhZLv94eOMDGHbdZiMrw6cnRfN3WEcFgpjUcV0A48pI=
+knative.dev/pkg v0.0.0-20240626134149-3f6a546ac3a4 h1:slPKf3UKdBFZlz+hFy+KXzTgY9yOePLzRuEhKzgc5a4=
+knative.dev/pkg v0.0.0-20240626134149-3f6a546ac3a4/go.mod h1:Wikg4u73T6vk9TctrxZt60VXzqmGEQIx0iKfk1+9o4c=
+knative.dev/serving v0.41.1-0.20240626135008-25783aef0b65 h1:qrJP9d0xE/r4IXxc7D2azSE+3ctVsrC3aTjE5tjwreU=
+knative.dev/serving v0.41.1-0.20240626135008-25783aef0b65/go.mod h1:hJmsIYz96VulSSDCPYfUIA14cwZAT6ehMST3zMfmUmU=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/knative.dev/pkg/apis/condition_set.go

@@ -17,12 +17,12 @@ limitations under the License.
 package apis
 
 import (
+	"errors"
+	"fmt"
 	"reflect"
 	"sort"
 	"time"
 
-	"fmt"
-
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -234,7 +234,7 @@ func (r conditionsImpl) ClearCondition(t ConditionType) error {
 	}
 	// Terminal conditions are not handled as they can't be nil
 	if r.isTerminal(t) {
-		return fmt.Errorf("clearing terminal conditions not implemented")
+		return errors.New("clearing terminal conditions not implemented")
 	}
 	cond := r.GetCondition(t)
 	if cond == nil {

vendor/knative.dev/pkg/apis/convert.go

@@ -24,7 +24,6 @@ func ConvertToViaProxy(
 	ctx context.Context,
 	source, proxy, sink Convertible,
 ) error {
-
 	if err := source.ConvertTo(ctx, proxy); err != nil {
 		return err
 	}
@@ -38,7 +37,6 @@ func ConvertFromViaProxy(
 	ctx context.Context,
 	source, proxy, sink Convertible,
 ) error {
-
 	if err := proxy.ConvertFrom(ctx, source); err != nil {
 		return err
 	}

vendor/knative.dev/pkg/apis/deprecated.go

@@ -94,7 +94,7 @@ func getPrefixedNamedFieldValues(prefix string, obj interface{}) (map[string]ref
 		return fields, inlined
 	}
 
-	for i := 0; i < objValue.NumField(); i++ {
+	for i := range objValue.NumField() {
 		tf := objValue.Type().Field(i)
 		if v := objValue.Field(i); v.IsValid() {
 			jTag := tf.Tag.Get("json")

vendor/knative.dev/pkg/apis/duck/v1/addressable_types.go

@@ -54,10 +54,8 @@ type Addressable struct {
 	Audience *string `json:"audience,omitempty"`
 }
 
-var (
-	// Addressable is a Convertible type.
-	_ apis.Convertible = (*Addressable)(nil)
-)
+// Addressable is a Convertible type.
+var _ apis.Convertible = (*Addressable)(nil)
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 

vendor/knative.dev/pkg/apis/duck/v1/destination.go

@@ -103,11 +103,11 @@ func (d *Destination) SetDefaults(ctx context.Context) {
 	}
 }
 
-func validateCACerts(CACert *string) *apis.FieldError {
+func validateCACerts(caCert *string) *apis.FieldError {
 	// Check the object.
 	var errs *apis.FieldError
 
-	block, err := pem.Decode([]byte(*CACert))
+	block, err := pem.Decode([]byte(*caCert))
 	if err != nil && block == nil {
 		errs = errs.Also(apis.ErrInvalidValue("CA Cert provided is invalid", "caCert"))
 		return errs

vendor/knative.dev/pkg/apis/duck/v1/knative_reference.go

@@ -102,7 +102,6 @@ func (kr *KReference) Validate(ctx context.Context) *apis.FieldError {
 					Details: fmt.Sprintf("parent namespace: %q does not match ref: %q", parentNS, kr.Namespace),
 				})
 			}
-
 		}
 	}
 	return errs

vendor/knative.dev/pkg/apis/duck/v1/kresource_type.go

@@ -68,7 +68,7 @@ func (t *KResource) Populate() {
 		// Populate ALL fields
 		Type:               "Birthday",
 		Status:             corev1.ConditionTrue,
-		LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 02, 28, 18, 52, 00, 00, time.UTC))},
+		LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 2, 28, 18, 52, 0, 0, time.UTC))},
 		Reason:             "Celebrate",
 		Message:            "n3wScott, find your party hat :tada:",
 	}}

vendor/knative.dev/pkg/apis/duck/v1/register.go

@@ -52,6 +52,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		(&KResource{}).GetListType(),
 		&AddressableType{},
 		(&AddressableType{}).GetListType(),
+		&AuthenticatableType{},
+		(&AuthenticatableType{}).GetListType(),
 		&Source{},
 		(&Source{}).GetListType(),
 		&WithPod{},

vendor/knative.dev/pkg/apis/duck/v1/source_types.go

@@ -158,7 +158,7 @@ func (s *Source) Populate() {
 		// Populate ALL fields
 		Type:               SourceConditionSinkProvided,
 		Status:             corev1.ConditionTrue,
-		LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 02, 28, 18, 52, 00, 00, time.UTC))},
+		LastTransitionTime: apis.VolatileTime{Inner: metav1.NewTime(time.Date(1984, 2, 28, 18, 52, 0, 0, time.UTC))},
 	}}
 	s.Status.SinkURI = &apis.URL{
 		Scheme:   "https",

vendor/knative.dev/pkg/apis/duck/v1/status_types.go

@@ -97,7 +97,6 @@ func (s *Status) ConvertTo(ctx context.Context, sink *Status, predicates ...func
 
 	conditions := make(apis.Conditions, 0, len(s.Conditions))
 	for _, c := range s.Conditions {
-
 		// Copy over the "happy" condition, which is the only condition that
 		// we can reliably transfer.
 		if c.Type == apis.ConditionReady || c.Type == apis.ConditionSucceeded {

vendor/knative.dev/pkg/apis/duck/verify.go

@@ -24,8 +24,10 @@ import (
 	"knative.dev/pkg/kmp"
 )
 
-type Implementable = ducktypes.Implementable
-type Populatable = ducktypes.Populatable
+type (
+	Implementable = ducktypes.Implementable
+	Populatable   = ducktypes.Populatable
+)
 
 // VerifyType verifies that a particular concrete resource properly implements
 // the provided Implementable duck type.  It is expected that under the resource

vendor/knative.dev/pkg/apis/kind2resource.go

@@ -17,7 +17,6 @@ limitations under the License.
 package apis
 
 import (
-	"fmt"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -41,7 +40,7 @@ func KindToResource(gvk schema.GroupVersionKind) schema.GroupVersionResource {
 func pluralizeKind(kind string) string {
 	ret := strings.ToLower(kind)
 	if strings.HasSuffix(ret, "s") {
-		return fmt.Sprintf("%ses", ret)
+		return ret + "es"
 	}
-	return fmt.Sprintf("%ss", ret)
+	return ret + "s"
 }

vendor/knative.dev/pkg/codegen/cmd/injection-gen/args/args.go

@@ -17,7 +17,7 @@ limitations under the License.
 package args
 
 import (
-	"fmt"
+	"errors"
 
 	"github.com/spf13/pflag"
 	"k8s.io/gengo/args"
@@ -59,13 +59,13 @@ func Validate(genericArgs *args.GeneratorArgs) error {
 	customArgs := genericArgs.CustomArgs.(*CustomArgs)
 
 	if len(genericArgs.OutputPackagePath) == 0 {
-		return fmt.Errorf("output package cannot be empty")
+		return errors.New("output package cannot be empty")
 	}
 	if len(customArgs.VersionedClientSetPackage) == 0 {
-		return fmt.Errorf("versioned clientset package cannot be empty")
+		return errors.New("versioned clientset package cannot be empty")
 	}
 	if len(customArgs.ExternalVersionsInformersPackage) == 0 {
-		return fmt.Errorf("external versions informers package cannot be empty")
+		return errors.New("external versions informers package cannot be empty")
 	}
 
 	return nil

vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go

@@ -43,7 +43,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 		klog.Fatalf("Wrong CustomArgs type: %T", arguments.CustomArgs)
 	}
 
-	versionPackagePath := filepath.Join(arguments.OutputPackagePath)
+	versionPackagePath := filepath.Clean(arguments.OutputPackagePath)
 
 	var packageList generator.Packages
 
@@ -389,8 +389,6 @@ func versionInformerPackages(basePackage string, groupPkgName string, gv clientg
 	vers := make([]generator.Package, 0, 2*len(typesToGenerate))
 
 	for _, t := range typesToGenerate {
-		// Fix for golang iterator bug.
-		t := t
 		packagePath := packagePath + "/" + strings.ToLower(t.Name.Name)
 		typedInformerPackage := typedInformerPackage(groupPkgName, gv, customArgs.ExternalVersionsInformersPackage)
 
@@ -501,7 +499,6 @@ func versionInformerPackages(basePackage string, groupPkgName string, gv clientg
 				return tags.NeedsInformerInjection()
 			},
 		})
-
 	}
 	return vers
 }
@@ -513,8 +510,6 @@ func reconcilerPackages(basePackage string, groupPkgName string, gv clientgentyp
 	vers := make([]generator.Package, 0, 4*len(typesToGenerate))
 
 	for _, t := range typesToGenerate {
-		// Fix for golang iterator bug.
-		t := t
 		extracted := extractCommentTags(t)
 		reconcilerClasses, hasReconcilerClass := extractReconcilerClassesTag(extracted)
 		nonNamespaced := isNonNamespaced(extracted)
@@ -677,7 +672,6 @@ func versionDuckPackages(basePackage string, groupPkgName string, gv clientgenty
 
 	for _, t := range typesToGenerate {
 		// Fix for golang iterator bug.
-		t := t
 		packagePath := filepath.Join(packagePath, strings.ToLower(t.Name.Name))
 
 		// Impl

vendor/knative.dev/pkg/configmap/example.go

@@ -31,10 +31,8 @@ const (
 	ExampleChecksumAnnotation = "knative.dev/example-checksum"
 )
 
-var (
-	// Allows for normalizing by collapsing newlines.
-	sequentialNewlines = regexp.MustCompile("(?:\r?\n)+")
-)
+// Allows for normalizing by collapsing newlines.
+var sequentialNewlines = regexp.MustCompile("(?:\r?\n)+")
 
 // Checksum generates a checksum for the example value to be compared against
 // a respective annotation.

vendor/knative.dev/pkg/configmap/filter.go

@@ -17,7 +17,7 @@ limitations under the License.
 package configmap
 
 import (
-	"fmt"
+	"errors"
 	"reflect"
 
 	corev1 "k8s.io/api/core/v1"
@@ -58,17 +58,17 @@ func ValidateConstructor(constructor interface{}) error {
 	cType := reflect.TypeOf(constructor)
 
 	if cType.Kind() != reflect.Func {
-		return fmt.Errorf("config constructor must be a function")
+		return errors.New("config constructor must be a function")
 	}
 
 	if cType.NumIn() != 1 || cType.In(0) != reflect.TypeOf(&corev1.ConfigMap{}) {
-		return fmt.Errorf("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
+		return errors.New("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
 	}
 
 	errorType := reflect.TypeOf((*error)(nil)).Elem()
 
 	if cType.NumOut() != 2 || !cType.Out(1).Implements(errorType) {
-		return fmt.Errorf("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
+		return errors.New("config constructor must be of the type func(*k8s.io/api/core/v1/ConfigMap) (..., error)")
 	}
 	return nil
 }

vendor/knative.dev/pkg/configmap/store.go

@@ -81,8 +81,8 @@ func NewUntypedStore(
 	name string,
 	logger Logger,
 	constructors Constructors,
-	onAfterStore ...func(name string, value interface{})) *UntypedStore {
-
+	onAfterStore ...func(name string, value interface{}),
+) *UntypedStore {
 	store := &UntypedStore{
 		name:         name,
 		logger:       logger,

vendor/knative.dev/pkg/hack/update-k8s-deps.sh → vendor/knative.dev/pkg/hack/format-code.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2020 The Knative Authors
+# Copyright 2024 The Knative Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,12 +18,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
 
-run_go_tool knative.dev/test-infra/buoy \
-  buoy float ${REPO_ROOT_DIR}/go.mod \
-    --release "$1" --domain k8s.io --ruleset=Release \
-    | xargs -n1 -t go get -d
-
-./hack/update-deps.sh
+go run mvdan.cc/gofumpt@latest -l -w .
 

vendor/knative.dev/pkg/kmeta/names.go

@@ -18,6 +18,7 @@ package kmeta
 
 import (
 	"crypto/md5" //nolint:gosec // No strong cryptography needed.
+	"encoding/hex"
 	"fmt"
 	"regexp"
 )
@@ -53,7 +54,7 @@ func ChildName(parent, suffix string) string {
 			// Format the return string, if it's shorter than longest: pad with
 			// beginning of the suffix. This happens, for example, when parent is
 			// short, but the suffix is very long.
-			ret := parent + fmt.Sprintf("%x", h)
+			ret := parent + hex.EncodeToString(h[:])
 			if d := longest - len(ret); d > 0 {
 				ret += suffix[:d]
 			}

vendor/knative.dev/pkg/logging/config.go

@@ -197,7 +197,8 @@ func levelFromString(level string) (*zapcore.Level, error) {
 // UpdateLevelFromConfigMap returns a helper func that can be used to update the logging level
 // when a config map is updated
 func UpdateLevelFromConfigMap(logger *zap.SugaredLogger, atomicLevel zap.AtomicLevel,
-	levelKey string) func(configMap *corev1.ConfigMap) {
+	levelKey string,
+) func(configMap *corev1.ConfigMap) {
 	return func(configMap *corev1.ConfigMap) {
 		config, err := NewConfigFromConfigMap(configMap)
 		if err != nil {