[main] Upgrade to latest dependencies (#7366)

upgrade to latest dependencies bumping knative.dev/reconciler-test 362d56d...25dc2db: > 25dc2db Enable OIDCAuth for eventshub sender when sink has an audience (# 607) bumping knative.dev/pkg 948f5f5...9051a45: > 9051a45 Migrate knative.dev/hack/shell to knative.dev/pkg/test/shell (# 2856) Signed-off-by: Knative Automation <[email protected]>
knative · Oct 16, 2023 · 6dca8c4 · 6dca8c4
1 parent 082d90a
commit 6dca8c4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/go.mod b/go.mod
@@ -47,8 +47,8 @@ require (
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491
 	knative.dev/hack v0.0.0-20231010131532-fc76874b28c6
 	knative.dev/hack/schema v0.0.0-20231010131532-fc76874b28c6
-	knative.dev/pkg v0.0.0-20231011202506-948f5f57818a
-	knative.dev/reconciler-test v0.0.0-20231012060156-362d56d92da9
+	knative.dev/pkg v0.0.0-20231012104454-9051a454f03f
+	knative.dev/reconciler-test v0.0.0-20231013140232-25dc2db92f9c
 	sigs.k8s.io/yaml v1.3.0
 )
 

diff --git a/go.sum b/go.sum
@@ -848,10 +848,10 @@ knative.dev/hack v0.0.0-20231010131532-fc76874b28c6 h1:K9saPnpWTK1xH/Dpx1aE4CA+4
 knative.dev/hack v0.0.0-20231010131532-fc76874b28c6/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
 knative.dev/hack/schema v0.0.0-20231010131532-fc76874b28c6 h1:bF2l6mSHnL/YcqnTWTjaNm+TPYhZ7fM0gI3zKzJoPHE=
 knative.dev/hack/schema v0.0.0-20231010131532-fc76874b28c6/go.mod h1:3pWwBLnTZSM9psSgCAvhKOHIPTzqfEMlWRpDu6IYhK0=
-knative.dev/pkg v0.0.0-20231011202506-948f5f57818a h1:/Ia2DN9jWwz0CSLXFq0iwvMK4Tx4Iy9WoMvoPn1ri98=
-knative.dev/pkg v0.0.0-20231011202506-948f5f57818a/go.mod h1:0HqD8pZppFF34znDJnN6fGzuFq9ulJnelX64ciHD+PE=
-knative.dev/reconciler-test v0.0.0-20231012060156-362d56d92da9 h1:hFBfT8vESYUs6hJ07Vg717TQCaIJPYIjE/HZUGgv7EA=
-knative.dev/reconciler-test v0.0.0-20231012060156-362d56d92da9/go.mod h1:O6m795/qJO9+FaNCOQMuKb3veDjpPKvc626ZLXcrjlU=
+knative.dev/pkg v0.0.0-20231012104454-9051a454f03f h1:flYmL48DIXsEw2wIEcDB69cw3Ju+aAlANUGmNrGitYs=
+knative.dev/pkg v0.0.0-20231012104454-9051a454f03f/go.mod h1:0HqD8pZppFF34znDJnN6fGzuFq9ulJnelX64ciHD+PE=
+knative.dev/reconciler-test v0.0.0-20231013140232-25dc2db92f9c h1:6i8J7K/Kf45noCWXKNfEAhWsmpf5iJYSjYVVil2rFXI=
+knative.dev/reconciler-test v0.0.0-20231013140232-25dc2db92f9c/go.mod h1:O6m795/qJO9+FaNCOQMuKb3veDjpPKvc626ZLXcrjlU=
 pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
 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=

diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/options.go b/vendor/knative.dev/reconciler-test/pkg/eventshub/options.go
@@ -268,11 +268,6 @@ func InputMethod(method string) EventsHubOption {
 	return envOption("INPUT_METHOD", method)
 }
 
-// OIDCValidToken adds a valid OIDC token to use for OIDC authentication to the request.
-func OIDCValidToken() EventsHubOption {
-	return compose(envOption(OIDCGenerateValidTokenEnv, "true"), envOIDCEnabled())
-}
-
 // OIDCExpiredToken adds an expired OIDC token to the request. As the minimal
 // expiry for JWTs from Kubernetes are 10 minutes, the sender will delay the
 // send by 10 + 1 minutes.
@@ -289,11 +284,12 @@ func OIDCInvalidAudience() EventsHubOption {
 }
 
 func oidcSinkAudience(aud *string) EventsHubOption {
-	if aud == nil {
-		return noop
+	if aud != nil && *aud != "" {
+		// if the sink has an audience set, we enable OIDC to get a token added
+		return compose(envOption(OIDCSinkAudienceEnv, *aud), envOIDCEnabled())
 	}
 
-	return envOption(OIDCSinkAudienceEnv, *aud)
+	return noop
 }
 
 // OIDCCorruptedSignature adds an OIDC token with an invalid signature to the request.

diff --git a/vendor/knative.dev/reconciler-test/pkg/eventshub/utils.go b/vendor/knative.dev/reconciler-test/pkg/eventshub/utils.go
@@ -39,7 +39,6 @@ const (
 	EventLogsEnv       = "EVENT_LOGS"
 
 	OIDCEnabledEnv                         = "ENABLE_OIDC_AUTH"
-	OIDCGenerateValidTokenEnv              = "OIDC_GENERATE_VALID_TOKEN"
 	OIDCGenerateExpiredTokenEnv            = "OIDC_GENERATE_EXPIRED_TOKEN"
 	OIDCGenerateInvalidAudienceTokenEnv    = "OIDC_GENERATE_INVALID_AUDIENCE_TOKEN"
 	OIDCGenerateCorruptedSignatureTokenEnv = "OIDC_GENERATE_CORRUPTED_SIG_TOKEN"

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1209,7 +1209,7 @@ knative.dev/hack/schema/commands
 knative.dev/hack/schema/docs
 knative.dev/hack/schema/registry
 knative.dev/hack/schema/schema
-# knative.dev/pkg v0.0.0-20231011202506-948f5f57818a
+# knative.dev/pkg v0.0.0-20231012104454-9051a454f03f
 ## explicit; go 1.18
 knative.dev/pkg/apiextensions/storageversion
 knative.dev/pkg/apiextensions/storageversion/cmd/migrate
@@ -1347,7 +1347,7 @@ knative.dev/pkg/webhook/resourcesemantics
 knative.dev/pkg/webhook/resourcesemantics/conversion
 knative.dev/pkg/webhook/resourcesemantics/defaulting
 knative.dev/pkg/webhook/resourcesemantics/validation
-# knative.dev/reconciler-test v0.0.0-20231012060156-362d56d92da9
+# knative.dev/reconciler-test v0.0.0-20231013140232-25dc2db92f9c
 ## explicit; go 1.20
 knative.dev/reconciler-test/cmd/eventshub
 knative.dev/reconciler-test/pkg/environment