From 71569770fe028c4fd975d8482314b8dcf54e24f1 Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Tue, 7 May 2024 11:26:53 +0200 Subject: [PATCH 1/4] Assert EventTypes references for IMC and ContainerSource test --- test/experimental/features/eventtype_autocreate/features.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/experimental/features/eventtype_autocreate/features.go b/test/experimental/features/eventtype_autocreate/features.go index b46e5dd45e9..07c8933d7e3 100644 --- a/test/experimental/features/eventtype_autocreate/features.go +++ b/test/experimental/features/eventtype_autocreate/features.go @@ -68,7 +68,8 @@ func AutoCreateEventTypesOnIMC() *feature.Feature { Must("deliver events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasId(event.ID())).AtLeast(1)). Must("create event type", eventtype.WaitForEventType( eventtype.AssertReady(expectedTypes), - eventtype.AssertPresent(expectedTypes))) + eventtype.AssertPresent(expectedTypes), + eventtype.AssertReferencePresent(channel_impl.AsRef(channelName)))) return f } @@ -247,7 +248,8 @@ func AutoCreateEventTypesOnContainerSource() *feature.Feature { Must("delivers events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasId(event.ID())).AtLeast(1)). Must("create event type", eventtype.WaitForEventType( eventtype.AssertReady(expectedTypes), - eventtype.AssertExactPresent(expectedTypes))) + eventtype.AssertExactPresent(expectedTypes), + eventtype.AssertReferencePresent(service.AsKReference(sink)))) return f } From 0cc6fa9fdaaa47fc537f9f0d28514b8f7cfd6e5f Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Tue, 7 May 2024 12:06:59 +0200 Subject: [PATCH 2/4] Do not use ID as the attribute to match the event The id is different for each event when using container source. Use just the type, like other tests for container source. --- test/experimental/features/eventtype_autocreate/features.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/experimental/features/eventtype_autocreate/features.go b/test/experimental/features/eventtype_autocreate/features.go index 07c8933d7e3..a81239998d2 100644 --- a/test/experimental/features/eventtype_autocreate/features.go +++ b/test/experimental/features/eventtype_autocreate/features.go @@ -245,7 +245,7 @@ func AutoCreateEventTypesOnContainerSource() *feature.Feature { expectedTypes := sets.New(event.Type()) f.Stable("containersource"). - Must("delivers events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasId(event.ID())).AtLeast(1)). + Must("delivers events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasType(event.Type())).AtLeast(1)). Must("create event type", eventtype.WaitForEventType( eventtype.AssertReady(expectedTypes), eventtype.AssertExactPresent(expectedTypes), From c98041b4eafdb64c403d5f5e8aea40142d04fb59 Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Tue, 7 May 2024 12:22:08 +0200 Subject: [PATCH 3/4] Fix type --- .../experimental/features/eventtype_autocreate/features.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/experimental/features/eventtype_autocreate/features.go b/test/experimental/features/eventtype_autocreate/features.go index a81239998d2..4af4ff0ce00 100644 --- a/test/experimental/features/eventtype_autocreate/features.go +++ b/test/experimental/features/eventtype_autocreate/features.go @@ -227,8 +227,7 @@ func AutoCreateEventTypeEventsFromPingSource() *feature.Feature { func AutoCreateEventTypesOnContainerSource() *feature.Feature { f := feature.NewFeature() - event := cetest.FullEvent() - event.SetType("test.containersource.custom.event.type") + csEventType := "dev.knative.eventing.samples.heartbeat" sourceName := feature.MakeRandomK8sName("containersource") sink := feature.MakeRandomK8sName("sink") @@ -242,10 +241,10 @@ func AutoCreateEventTypesOnContainerSource() *feature.Feature { f.Setup("containersource is ready", containersource.IsReady(sourceName)) - expectedTypes := sets.New(event.Type()) + expectedTypes := sets.New(csEventType) f.Stable("containersource"). - Must("delivers events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasType(event.Type())).AtLeast(1)). + Must("delivers events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasType(csEventType)).AtLeast(1)). Must("create event type", eventtype.WaitForEventType( eventtype.AssertReady(expectedTypes), eventtype.AssertExactPresent(expectedTypes), From 2da0d09543d0169a61ea5caa7089da447d2bc54d Mon Sep 17 00:00:00 2001 From: Martin Gencur Date: Tue, 7 May 2024 16:10:07 +0200 Subject: [PATCH 4/4] Remove test for ContainerSource EventType creation It is not supported. --- .../experimental/eventtype_autocreate_test.go | 14 --------- .../features/eventtype_autocreate/features.go | 30 ------------------- 2 files changed, 44 deletions(-) diff --git a/test/experimental/eventtype_autocreate_test.go b/test/experimental/eventtype_autocreate_test.go index 51f315d86d8..fab76eb66ff 100644 --- a/test/experimental/eventtype_autocreate_test.go +++ b/test/experimental/eventtype_autocreate_test.go @@ -102,17 +102,3 @@ func TestPingSourceEventTypeMatch(t *testing.T) { env.Test(ctx, t, eventtype_autocreate.AutoCreateEventTypeEventsFromPingSource()) } - -func TestContainerSourceEventTypeAutoCreate(t *testing.T) { - t.Parallel() - - ctx, env := global.Environment( - knative.WithKnativeNamespace(system.Namespace()), - knative.WithLoggingConfig, - knative.WithTracingConfig, - k8s.WithEventListener, - environment.Managed(t), - ) - - env.Test(ctx, t, eventtype_autocreate.AutoCreateEventTypesOnContainerSource()) -} diff --git a/test/experimental/features/eventtype_autocreate/features.go b/test/experimental/features/eventtype_autocreate/features.go index 4af4ff0ce00..1c33d7abc70 100644 --- a/test/experimental/features/eventtype_autocreate/features.go +++ b/test/experimental/features/eventtype_autocreate/features.go @@ -29,7 +29,6 @@ import ( sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1" "knative.dev/eventing/test/rekt/resources/broker" "knative.dev/eventing/test/rekt/resources/channel_impl" - "knative.dev/eventing/test/rekt/resources/containersource" "knative.dev/eventing/test/rekt/resources/eventtype" "knative.dev/eventing/test/rekt/resources/pingsource" "knative.dev/eventing/test/rekt/resources/subscription" @@ -223,32 +222,3 @@ func AutoCreateEventTypeEventsFromPingSource() *feature.Feature { return f } - -func AutoCreateEventTypesOnContainerSource() *feature.Feature { - f := feature.NewFeature() - - csEventType := "dev.knative.eventing.samples.heartbeat" - - sourceName := feature.MakeRandomK8sName("containersource") - sink := feature.MakeRandomK8sName("sink") - - f.Setup("install sink", eventshub.Install(sink, eventshub.StartReceiver)) - - destination := &duckv1.Destination{ - Ref: service.AsKReference(sink), - } - f.Setup("install containersource", containersource.Install(sourceName, containersource.WithSink(destination))) - - f.Setup("containersource is ready", containersource.IsReady(sourceName)) - - expectedTypes := sets.New(csEventType) - - f.Stable("containersource"). - Must("delivers events to subscriber", assert.OnStore(sink).MatchEvent(cetest.HasType(csEventType)).AtLeast(1)). - Must("create event type", eventtype.WaitForEventType( - eventtype.AssertReady(expectedTypes), - eventtype.AssertExactPresent(expectedTypes), - eventtype.AssertReferencePresent(service.AsKReference(sink)))) - - return f -}