Skip to content
This repository has been archived by the owner on Jun 19, 2022. It is now read-only.

[master] Auto-update dependencies #1314

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ require (
k8s.io/api v0.18.1
k8s.io/apimachinery v0.18.1
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
knative.dev/eventing v0.15.1-0.20200618135024-d77f1c5b17ce
knative.dev/pkg v0.0.0-20200618002824-96c250871fac
knative.dev/serving v0.15.1-0.20200618034425-c99ed421d333
knative.dev/test-infra v0.0.0-20200617235125-6382dba95484 // indirect
knative.dev/eventing v0.15.1-0.20200618204825-8d34718da040
knative.dev/pkg v0.0.0-20200619020725-7df8fc5d7743
knative.dev/serving v0.15.1-0.20200619061725-dd1558210db2
knative.dev/test-infra v0.0.0-20200618184825-a7b2980a8884 // indirect
sigs.k8s.io/yaml v1.2.0
)

Expand Down
15 changes: 8 additions & 7 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1525,8 +1525,8 @@ k8s.io/utils v0.0.0-20200124190032-861946025e34/go.mod h1:sZAwmy6armz5eXlNoLmJcl
knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
knative.dev/caching v0.0.0-20200116200605-67bca2c83dfa/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
knative.dev/caching v0.0.0-20200606210318-787aec80f71c/go.mod h1:rWD+0zSqcE7L//jJyt866xtXsOi9hCdB0FoD4w2Rygg=
knative.dev/eventing v0.15.1-0.20200618135024-d77f1c5b17ce h1:vhGFQ0RxP8z9nRhnR+gmRl074F414yg0V3hteiPGMXs=
knative.dev/eventing v0.15.1-0.20200618135024-d77f1c5b17ce/go.mod h1:hN9II95mUmyrvs1Zxs6TUAhZJOYC3emBdgr8hrVO2DA=
knative.dev/eventing v0.15.1-0.20200618204825-8d34718da040 h1:lAZS+40NvY7OPDibODG7B/ycts/siqen72z1IfsxrG8=
knative.dev/eventing v0.15.1-0.20200618204825-8d34718da040/go.mod h1:2nEh+fEi1WQQijYyEEC/6LFZW6UuKy7JmkgB5W5Lvvo=
knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
knative.dev/eventing-contrib v0.11.2/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
knative.dev/networking v0.0.0-20200617160325-c5b1bddf865c h1:Uv3REjPWLs/mohATHb7G9FZFbH4lkiHGX7IVDz+J+zE=
Expand All @@ -1545,12 +1545,13 @@ knative.dev/pkg v0.0.0-20200603222317-b79e4a24ca50 h1:sbJMCCtOENPgfE5dUSwBUxZtJz
knative.dev/pkg v0.0.0-20200603222317-b79e4a24ca50/go.mod h1:8IfPj/lpuKHHg82xZCl2wuFZ3BM96To72sN1W8T9wjQ=
knative.dev/pkg v0.0.0-20200611204322-2ddcfef739a2/go.mod h1:rA+FklsrVahwF4a+D63NyHJlzDoAFH81K4J5CYuE3bA=
knative.dev/pkg v0.0.0-20200616232624-ffb929374a39/go.mod h1:NtvASnZHh7yo6VBfGk7dXdpAK2vJyrDc/+Syk4os8xk=
knative.dev/pkg v0.0.0-20200617194224-40c7e164ccd7/go.mod h1:4ty6MSlNjZk5qBaGb3Gt4gopjMD4gRknfTABblcFpQ8=
knative.dev/pkg v0.0.0-20200618002824-96c250871fac h1:X8XHaSFsUIW2IJCIEQEzNfPbs/gGib3CUK/+lkZuoEo=
knative.dev/pkg v0.0.0-20200618002824-96c250871fac/go.mod h1:4ty6MSlNjZk5qBaGb3Gt4gopjMD4gRknfTABblcFpQ8=
knative.dev/pkg v0.0.0-20200619020725-7df8fc5d7743 h1:W1NKMizoXYYX5e2mkFXnn21T7X6ROKKwL8YetGu7xCQ=
knative.dev/pkg v0.0.0-20200619020725-7df8fc5d7743/go.mod h1:DquzK0hsLDcg2q63Sn+CngAyRwv4cKMpt5F19YzBfb0=
knative.dev/sample-controller v0.0.0-20200510050845-bf7c19498b7e/go.mod h1:D2ZDLrR9Dq9LiiVN7TatzI7WMcEPgk1MHbbhgBKE6W8=
knative.dev/serving v0.15.1-0.20200618034425-c99ed421d333 h1:Vhjl0fMEvUuj9aFfJK3tnkDhWU0ot4YNx4wOJ6npC6E=
knative.dev/serving v0.15.1-0.20200618034425-c99ed421d333/go.mod h1:aTCpYC8OhmRYqMRhTXGEiWgiP3xsuA9uTI15DpdOYTk=
knative.dev/serving v0.15.1-0.20200619061725-dd1558210db2 h1:At08OEyzjiNrqoKn3yqCJB/dNkHG7poGdQZwss1t3Mg=
knative.dev/serving v0.15.1-0.20200619061725-dd1558210db2/go.mod h1:9wdvLb84PW3R/M3StqpvbvxFuw5xv+ZN6rqDU8qXe+k=
knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
knative.dev/test-infra v0.0.0-20200508015845-8d7d46a46176/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE=
Expand All @@ -1562,10 +1563,10 @@ knative.dev/test-infra v0.0.0-20200522180958-6a0a9b9d893a/go.mod h1:n9eQkzmSNj8B
knative.dev/test-infra v0.0.0-20200606045118-14ebc4a42974/go.mod h1://I6IZIF0QDgs5wotU243ZZ5cTpm6/GthayjUenBBc0=
knative.dev/test-infra v0.0.0-20200615231324-3a016f44102c/go.mod h1:+BfrTJpc++rH30gX/C0QY6NT2eYVzycll52uw6CrQnc=
knative.dev/test-infra v0.0.0-20200617011927-7220df1de9de/go.mod h1:+BfrTJpc++rH30gX/C0QY6NT2eYVzycll52uw6CrQnc=
knative.dev/test-infra v0.0.0-20200617184924-0fc4e2aeef74/go.mod h1:+BfrTJpc++rH30gX/C0QY6NT2eYVzycll52uw6CrQnc=
knative.dev/test-infra v0.0.0-20200617203125-9e406338bd60/go.mod h1:+BfrTJpc++rH30gX/C0QY6NT2eYVzycll52uw6CrQnc=
knative.dev/test-infra v0.0.0-20200617235125-6382dba95484 h1:5D1Fm6aA1T1QQXLb1HkJ5t8gB9pTkhLYak1CCqIP+pE=
knative.dev/test-infra v0.0.0-20200617235125-6382dba95484/go.mod h1:+BfrTJpc++rH30gX/C0QY6NT2eYVzycll52uw6CrQnc=
knative.dev/test-infra v0.0.0-20200618184825-a7b2980a8884 h1:qGxu/U/8VxhAuyFedrrne4s0vfY+YfoRwJJCY0AKpbw=
knative.dev/test-infra v0.0.0-20200618184825-a7b2980a8884/go.mod h1:qeiTuhDKO/HHheqVfepbxy5/q+O9toSJW6CO/DgjxFY=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
Expand Down
80 changes: 0 additions & 80 deletions vendor/knative.dev/eventing/pkg/kncloudevents/good_client.go

This file was deleted.

17 changes: 17 additions & 0 deletions vendor/knative.dev/eventing/pkg/kncloudevents/message_sender.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,23 @@ import (
"go.opencensus.io/plugin/ochttp/propagation/tracecontext"
)

// ConnectionArgs allow to configure connection parameters to the underlying
// HTTP Client transport.
type ConnectionArgs struct {
// MaxIdleConns refers to the max idle connections, as in net/http/transport.
MaxIdleConns int
// MaxIdleConnsPerHost refers to the max idle connections per host, as in net/http/transport.
MaxIdleConnsPerHost int
}

func (ca *ConnectionArgs) ConfigureTransport(transport *nethttp.Transport) {
if ca == nil {
return
}
transport.MaxIdleConns = ca.MaxIdleConns
transport.MaxIdleConnsPerHost = ca.MaxIdleConnsPerHost
}

type HttpMessageSender struct {
Client *nethttp.Client
Target string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@
package utils

import (
"context"
"net/http"
"net/url"
"strings"

cloudevents "github.com/cloudevents/sdk-go"
cehttp "github.com/cloudevents/sdk-go/pkg/cloudevents/transport/http"
"k8s.io/apimachinery/pkg/util/sets"
)

Expand All @@ -45,31 +41,6 @@ var (
}
)

// SendingContextFrom creates the context to use when sending a Cloud Event with cloudevents.Client. It
// sets the target if specified, and attaches a filtered set of headers from the initial request.
func SendingContextFrom(ctx context.Context, tctx cloudevents.HTTPTransportContext, targetURI *url.URL) context.Context {
// Get the allowed set of headers.
h := PassThroughHeaders(tctx.Header)
ctx = cloudevents.SetContextHeaders(ctx, h)

if targetURI != nil {
ctx = cloudevents.ContextWithTarget(ctx, targetURI.String())
}

return ctx
}

// ReceivingContextFrom filters the transport context headers using
// PassThroughHeaders after receiving an event using
// cloudevents.Client
func ReceivingContextFrom(ctx context.Context) context.Context {
tctx := cloudevents.HTTPTransportContextFrom(ctx)
// Get the allowed set of headers.
h := PassThroughHeaders(tctx.Header)
tctx.Header = h
return cehttp.WithTransportContext(ctx, tctx)
}

// PassThroughHeaders extracts the headers from headers that are in the `forwardHeaders` set
// or has any of the prefixes in `forwardPrefixes`.
func PassThroughHeaders(headers http.Header) http.Header {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

eventingv1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1"

"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
"knative.dev/eventing/test/lib/duck"
"knative.dev/eventing/test/lib/resources"
)
Expand All @@ -39,12 +39,12 @@ import (
func BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(
t *testing.T,
brokerClass string,
channelTestRunner lib.ChannelTestRunner,
setupClient ...lib.SetupClientOption,
channelTestRunner testlib.ComponentsTestRunner,
setupClient ...testlib.SetupClientOption,
) {
channelTestRunner.RunTests(t, lib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
client := lib.Setup(t, true, setupClient...)
defer lib.TearDown(client)
channelTestRunner.RunTests(t, testlib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
client := testlib.Setup(t, true, setupClient...)
defer testlib.TearDown(client)
brokerName := "br"
triggerNoBroker := "trigger-no-broker"
triggerWithBroker := "trigger-with-broker"
Expand Down Expand Up @@ -76,20 +76,20 @@ func BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(

}

func TriggerV1Beta1BeforeBrokerHelper(t *testing.T, triggerName string, client *lib.Client) {
func TriggerV1Beta1BeforeBrokerHelper(t *testing.T, triggerName string, client *testlib.Client) {
const etLogger = "logger"
const loggerPodName = "logger-pod"

logPod := resources.EventRecordPod(loggerPodName)
client.CreatePodOrFail(logPod, lib.WithService(loggerPodName))
client.CreatePodOrFail(logPod, testlib.WithService(loggerPodName))
client.WaitForAllTestResourcesReadyOrFail() //Can't do this for the trigger because it's not 'ready' yet
client.CreateTriggerOrFailV1Beta1(triggerName,
resources.WithAttributesTriggerFilterV1Beta1(eventingv1beta1.TriggerAnyFilter, etLogger, map[string]interface{}{}),
resources.WithSubscriberServiceRefForTriggerV1Beta1(loggerPodName),
)
}

func BrokerV1Beta1CreatedToReadyHelper(t *testing.T, brokerName, brokerClass string, client *lib.Client, channel metav1.TypeMeta) {
func BrokerV1Beta1CreatedToReadyHelper(t *testing.T, brokerName, brokerClass string, client *testlib.Client, channel metav1.TypeMeta) {
client.CreateBrokerConfigMapOrFail(brokerName, &channel)

broker := client.CreateBrokerV1Beta1OrFail(
Expand All @@ -98,20 +98,20 @@ func BrokerV1Beta1CreatedToReadyHelper(t *testing.T, brokerName, brokerClass str
resources.WithConfigMapForBrokerConfig(),
)

client.WaitForResourceReadyOrFail(broker.Name, lib.BrokerTypeMeta)
client.WaitForResourceReadyOrFail(broker.Name, testlib.BrokerTypeMeta)

}

func ReadyBrokerV1Beta1AvailableHelper(t *testing.T, brokerName string, client *lib.Client) {
client.WaitForResourceReadyOrFail(brokerName, lib.BrokerTypeMeta)
obj := resources.NewMetaResource(brokerName, client.Namespace, lib.BrokerTypeMeta)
func ReadyBrokerV1Beta1AvailableHelper(t *testing.T, brokerName string, client *testlib.Client) {
client.WaitForResourceReadyOrFail(brokerName, testlib.BrokerTypeMeta)
obj := resources.NewMetaResource(brokerName, client.Namespace, testlib.BrokerTypeMeta)
_, err := duck.GetAddressableURI(client.Dynamic, obj)
if err != nil {
t.Fatalf("Broker is not addressable %v", err)
}
}

func TriggerV1Beta1ReadyBrokerReadyHelper(t *testing.T, triggerName, brokerName string, client *lib.Client) {
func TriggerV1Beta1ReadyBrokerReadyHelper(t *testing.T, triggerName, brokerName string, client *testlib.Client) {
const etLogger = "logger"
const loggerPodName = "logger-pod"

Expand All @@ -121,10 +121,10 @@ func TriggerV1Beta1ReadyBrokerReadyHelper(t *testing.T, triggerName, brokerName
resources.WithBrokerV1Beta1(brokerName),
)

client.WaitForResourceReadyOrFail(trigger.Name, lib.TriggerTypeMeta)
client.WaitForResourceReadyOrFail(trigger.Name, testlib.TriggerTypeMeta)
}

func TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, brokerName string, client *lib.Client) {
func TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, brokerName string, client *testlib.Client) {
tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(triggerName, metav1.GetOptions{})
if err != nil {
t.Fatalf("Error: Could not get trigger %s: %v", triggerName, err)
Expand All @@ -145,8 +145,8 @@ func TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, bro

}

func TriggerV1Beta1ReadyIncludesSubURI(t *testing.T, triggerName string, client *lib.Client) {
client.WaitForResourceReadyOrFail(triggerName, lib.TriggerTypeMeta)
func TriggerV1Beta1ReadyIncludesSubURI(t *testing.T, triggerName string, client *testlib.Client) {
client.WaitForResourceReadyOrFail(triggerName, testlib.TriggerTypeMeta)
tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(triggerName, metav1.GetOptions{})
if err != nil {
t.Fatalf("Error: Could not get trigger %s: %v", tr.Name, err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ import (
"knative.dev/eventing/pkg/apis/eventing/v1beta1"
"knative.dev/eventing/pkg/utils"
tracinghelper "knative.dev/eventing/test/conformance/helpers/tracing"
"knative.dev/eventing/test/lib"
testlib "knative.dev/eventing/test/lib"
"knative.dev/eventing/test/lib/recordevents"
"knative.dev/eventing/test/lib/resources"
"knative.dev/eventing/test/lib/resources/sender"
)

// BrokerTracingTestHelperWithChannelTestRunner runs the Broker tracing tests for all Channels in
// the ChannelTestRunner.
// the ComponentsTestRunner.
func BrokerTracingTestHelperWithChannelTestRunner(
t *testing.T,
brokerClass string,
channelTestRunner lib.ChannelTestRunner,
setupClient lib.SetupClientOption,
channelTestRunner testlib.ComponentsTestRunner,
setupClient testlib.SetupClientOption,
) {
channelTestRunner.RunTests(t, lib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
channelTestRunner.RunTests(t, testlib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
tracingTest(t, setupClient, setupBrokerTracing(brokerClass), channel)
})
}
Expand All @@ -65,7 +65,7 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {
return func(
t *testing.T,
channel *metav1.TypeMeta,
client *lib.Client,
client *testlib.Client,
loggerPodName string,
senderPublishTrace bool,
) (tracinghelper.TestSpanTree, cetest.EventMatcher) {
Expand All @@ -80,7 +80,7 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {

// Create a logger (EventRecord) Pod and a K8s Service that points to it.
logPod := resources.EventRecordPod(loggerPodName)
client.CreatePodOrFail(logPod, lib.WithService(loggerPodName))
client.CreatePodOrFail(logPod, testlib.WithService(loggerPodName))

// Create a Trigger that receives events (type=bar) and sends them to the logger Pod.
loggerTrigger := client.CreateTriggerOrFailV1Beta1(
Expand All @@ -98,7 +98,7 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {
senderName,
[]byte(eventBody),
)
client.CreatePodOrFail(eventTransformerPod, lib.WithService(eventTransformerPod.Name))
client.CreatePodOrFail(eventTransformerPod, testlib.WithService(eventTransformerPod.Name))

// Create a Trigger that receives events (type=foo) and sends them to the transformer Pod.
transformerTrigger := client.CreateTriggerOrFailV1Beta1(
Expand All @@ -122,9 +122,9 @@ func setupBrokerTracing(brokerClass string) SetupTracingTestInfrastructureFunc {

// Send the CloudEvent (either with or without tracing inside the SendEvents Pod).
if senderPublishTrace {
client.SendEventToAddressable(senderName, broker.Name, lib.BrokerTypeMeta, event, sender.EnableTracing())
client.SendEventToAddressable(senderName, broker.Name, testlib.BrokerTypeMeta, event, sender.EnableTracing())
} else {
client.SendEventToAddressable(senderName, broker.Name, lib.BrokerTypeMeta, event)
client.SendEventToAddressable(senderName, broker.Name, testlib.BrokerTypeMeta, event)
}

domain := utils.GetClusterDomainName()
Expand Down
Loading