Skip to content

Commit

Permalink
upgrade to latest dependencies (#441)
Browse files Browse the repository at this point in the history 
bumping knative.dev/eventing-redis 0dd3e17...792cc40:
  > 792cc40 upgrade to latest dependencies (# 519)
bumping knative.dev/reconciler-test feb27a7...3bf004c:
  > 3bf004c make MatchPeerCertificatesFromSecret work with certificate chains (# 664)
bumping knative.dev/eventing 62c74c1...469d0ac:
  > 469d0ac [main] Upgrade to latest dependencies (# 7654)
  > 9d892bf Remove empty labels (# 7648)
  > d258e7d Create teardown script for local development (# 7642)
bumping knative.dev/eventing-kafka 43826ff...bb903df:
  > bb903df upgrade to latest dependencies (# 1469)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
@knative-automation
knative-automation authored Feb 5, 2024
1 parent c0b4e9c commit 9fde07b
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 21 deletions.
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ require (
k8s.io/apimachinery v0.28.5
k8s.io/client-go v0.28.5
k8s.io/code-generator v0.28.5
knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2
knative.dev/eventing-kafka v0.40.1-0.20240201062232-43826ff346a9
knative.dev/eventing-redis v0.40.1-0.20240201014856-0dd3e17830a5
knative.dev/eventing v0.40.1-0.20240202144010-469d0ac85e86
knative.dev/eventing-kafka v0.40.1-0.20240202062335-bb903df41c7d
knative.dev/eventing-redis v0.40.1-0.20240201132420-792cc4081d70
knative.dev/hack v0.0.0-20240201013652-f3881d90c189
knative.dev/pkg v0.0.0-20240201013110-e85c3cf6d5f1
knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67
knative.dev/reconciler-test v0.0.0-20240202062219-3bf004cddd5c
sigs.k8s.io/controller-runtime v0.13.1
)

Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,18 +786,18 @@ k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5Ohx
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2 h1:sTS/eCfl+75LEBj94vsn5vTeFommX4zR3/zlQ6J8lTY=
knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2/go.mod h1:B3/ep06tqwcAfcH7R5eGKi7bgZTfqb59MPoqfV8Jirg=
knative.dev/eventing-kafka v0.40.1-0.20240201062232-43826ff346a9 h1:R9ZzbDK7qiHhpXiDWMmE6tAAb+sqEz7DHKLpYhp7ITg=
knative.dev/eventing-kafka v0.40.1-0.20240201062232-43826ff346a9/go.mod h1:0BBXpXOKDsSR01PXiWCIviuhAYvMPXSMR7/+yIytVFU=
knative.dev/eventing-redis v0.40.1-0.20240201014856-0dd3e17830a5 h1:/ueDIRMV/p9zauvi4GJ3Xay8ASQco1IPZocNFZ8F/po=
knative.dev/eventing-redis v0.40.1-0.20240201014856-0dd3e17830a5/go.mod h1:akdoOUMvNvOakZpLLISmavA982Y2Sk4ag5hNkT1plUc=
knative.dev/eventing v0.40.1-0.20240202144010-469d0ac85e86 h1:a+k1iy7L+AQPY0jbWWM+7N6h5DXvvNw3L0f9cN60WKo=
knative.dev/eventing v0.40.1-0.20240202144010-469d0ac85e86/go.mod h1:gji5GMsP3ahX6Ul5y/rqp6X2oNTurLwdekzl6Tt16zo=
knative.dev/eventing-kafka v0.40.1-0.20240202062335-bb903df41c7d h1:C/QvgGUymdZDkg6AUzSABv77b6L1go8Zd4gF6eon5MQ=
knative.dev/eventing-kafka v0.40.1-0.20240202062335-bb903df41c7d/go.mod h1:BiuEf4l4XvhJiwb8q3juGaEMZsy1HSZBL3rC562LCtU=
knative.dev/eventing-redis v0.40.1-0.20240201132420-792cc4081d70 h1:/L9bP3tTzTIgJ46yZEqeyyxgyG2AF02gBtZwIffzn2s=
knative.dev/eventing-redis v0.40.1-0.20240201132420-792cc4081d70/go.mod h1:nAKBsKg/SwKhb0skdAJVMF48S55Nc18eMU7bwr9a7YY=
knative.dev/hack v0.0.0-20240201013652-f3881d90c189 h1:a8htyuf5+S0NGxxdKXeQ49XOD9dEC1LHoofRQPgFKrU=
knative.dev/hack v0.0.0-20240201013652-f3881d90c189/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/pkg v0.0.0-20240201013110-e85c3cf6d5f1 h1:xGmWQyA+hwyFT1BN5RWi8wx0DxwZQZni8SPN/FZ02kI=
knative.dev/pkg v0.0.0-20240201013110-e85c3cf6d5f1/go.mod h1:cGCJe6wkr0vQMAXTaUHi0XA/12JbxSTK15TnyBmn7ms=
knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67 h1:cgAtVlJJaWRBM5MzuN7ig++Z61FO5j2EoAqRBITSLRw=
knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67/go.mod h1:GYf5f0+DBK7736Y9VydjMkmkCqbWKIlRWN+SQ5tJ7A0=
knative.dev/reconciler-test v0.0.0-20240202062219-3bf004cddd5c h1:UYcWk9LGRjxvlx0AFKPTm8YWqxNstFxF++zyIZK6TnE=
knative.dev/reconciler-test v0.0.0-20240202062219-3bf004cddd5c/go.mod h1:GYf5f0+DBK7736Y9VydjMkmkCqbWKIlRWN+SQ5tJ7A0=
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=
Expand Down
39 changes: 34 additions & 5 deletions vendor/knative.dev/reconciler-test/pkg/eventshub/assert/step.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package assert

import (
"bytes"
"context"
"encoding/json"
"encoding/pem"
"fmt"

cetest "github.com/cloudevents/sdk-go/v2/test"
Expand Down Expand Up @@ -144,13 +146,40 @@ func MatchPeerCertificatesFromSecret(namespace, name string, key string) eventsh
return fmt.Errorf("failed to match peer certificates, connection is not TLS")
}

for _, cert := range info.Connection.TLS.PemPeerCertificates {
if cert == string(value) {
return nil
// secret value can, in general, be a certificate chain (a sequence of PEM-encoded certificate blocks)
valueBlock, valueRest := pem.Decode(value)
if valueBlock == nil {
// error if there's not even a single certificate in the value
return fmt.Errorf("failed to decode secret certificate:\n%s", string(value))
}
// for each certificate in the chain, check if it's present in info.Connection.TLS.PemPeerCertificates
for valueBlock != nil {
found := false
for _, cert := range info.Connection.TLS.PemPeerCertificates {
certBlock, _ := pem.Decode([]byte(cert))
if certBlock == nil {
return fmt.Errorf("failed to decode peer certificate:\n%s", cert)
}

if certBlock.Type == valueBlock.Type && string(certBlock.Bytes) == string(valueBlock.Bytes) {
found = true
break
}
}

if !found {
pemBytes, _ := json.MarshalIndent(info.Connection.TLS.PemPeerCertificates, "", " ")
return fmt.Errorf("failed to find peer certificate with value\n%s\nin:\n%s", string(value), string(pemBytes))
}

valueBlock, valueRest = pem.Decode(valueRest)
}

// any non-whitespace suffix not parsed as a PEM is suspicious, so we treat it as an error:
if "" != string(bytes.TrimSpace(valueRest)) {
return fmt.Errorf("failed to decode secret certificate starting with\n%s\nin:\n%s", string(valueRest), string(value))
}

bytes, _ := json.MarshalIndent(info.Connection.TLS.PemPeerCertificates, "", " ")
return fmt.Errorf("failed to find peer certificate with value\n%s\nin:\n%s", string(value), string(bytes))
return nil
}
}
8 changes: 4 additions & 4 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/eventing v0.40.1-0.20240201013611-62c74c1b87e2
# knative.dev/eventing v0.40.1-0.20240202144010-469d0ac85e86
## explicit; go 1.21
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
Expand Down Expand Up @@ -969,7 +969,7 @@ knative.dev/eventing/pkg/client/listers/messaging/v1
knative.dev/eventing/pkg/client/listers/sources/v1
knative.dev/eventing/pkg/client/listers/sources/v1beta2
knative.dev/eventing/pkg/eventingtls
# knative.dev/eventing-kafka v0.40.1-0.20240201062232-43826ff346a9
# knative.dev/eventing-kafka v0.40.1-0.20240202062335-bb903df41c7d
## explicit; go 1.21
knative.dev/eventing-kafka/pkg/apis/bindings
knative.dev/eventing-kafka/pkg/apis/bindings/v1beta1
Expand All @@ -984,7 +984,7 @@ knative.dev/eventing-kafka/test/rekt/features/kafkasource
knative.dev/eventing-kafka/test/rekt/resources/kafkacat
knative.dev/eventing-kafka/test/rekt/resources/kafkasource
knative.dev/eventing-kafka/test/rekt/resources/kafkatopic
# knative.dev/eventing-redis v0.40.1-0.20240201014856-0dd3e17830a5
# knative.dev/eventing-redis v0.40.1-0.20240201132420-792cc4081d70
## explicit; go 1.21
knative.dev/eventing-redis/pkg/source/apis/sources
knative.dev/eventing-redis/pkg/source/apis/sources/v1alpha1
Expand Down Expand Up @@ -1061,7 +1061,7 @@ knative.dev/pkg/webhook/json
knative.dev/pkg/webhook/resourcesemantics
knative.dev/pkg/webhook/resourcesemantics/defaulting
knative.dev/pkg/webhook/resourcesemantics/validation
# knative.dev/reconciler-test v0.0.0-20240201013705-feb27a771d67
# knative.dev/reconciler-test v0.0.0-20240202062219-3bf004cddd5c
## explicit; go 1.21
knative.dev/reconciler-test/cmd/eventshub
knative.dev/reconciler-test/pkg/environment
Expand Down

0 comments on commit 9fde07b

Please sign in to comment.