Backport fix to e2e tests infra - Cherry-pick #2176 (#2181)

* fix a nit variable naming (#2166) (#2173)

* Channel tests key off of a full TypeMeta (#2176)

* Channel tests key off of a full TypeMeta, not just a Kind that assumes messaging.knative.dev/v1alpha1.

* Update the parallel and sequence tests.

* Flag specified channels assume all features.

# Conflicts:
#	test/e2e/flows_parallel_test.go
#	test/e2e/flows_sequence_test.go

Author: nachocano

test/common/config.go

@@ -17,16 +17,23 @@ limitations under the License.
 package common
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"knative.dev/eventing/test/base/resources"
 )
 
 // DefaultChannel is the default channel we will run tests against.
-const DefaultChannel = resources.InMemoryChannelKind
+var DefaultChannel = InMemoryChannelTypeMeta
+
+// InMemoryChannelTypeMeta is the metav1.TypeMeta for InMemoryChannel.
+var InMemoryChannelTypeMeta = metav1.TypeMeta{
+	APIVersion: resources.MessagingAPIVersion,
+	Kind:       resources.InMemoryChannelKind,
+}
 
 // ChannelFeatureMap saves the channel-features mapping.
 // Each pair means the channel support the list of features.
-var ChannelFeatureMap = map[string][]Feature{
-	resources.InMemoryChannelKind: {FeatureBasic},
+var ChannelFeatureMap = map[metav1.TypeMeta][]Feature{
+	InMemoryChannelTypeMeta: {FeatureBasic},
 }
 
 // Feature is the feature supported by the channel.

test/common/test_runner.go

@@ -45,21 +45,25 @@ const TestPullSecretName = "kn-eventing-test-pull-secret"
 
 // ChannelTestRunner is used to run tests against channels.
 type ChannelTestRunner struct {
-	ChannelFeatureMap map[string][]Feature
-	ChannelsToTest    []string
+	ChannelFeatureMap map[metav1.TypeMeta][]Feature
+	ChannelsToTest    []metav1.TypeMeta
 }
 
 // RunTests will use all channels that support the given feature, to run
 // a test for the testFunc.
 func (tr *ChannelTestRunner) RunTests(
 	t *testing.T,
 	feature Feature,
-	testFunc func(st *testing.T, channel string),
+	testFunc func(st *testing.T, channel metav1.TypeMeta),
 ) {
 	t.Parallel()
 	for _, channel := range tr.ChannelsToTest {
-		features := tr.ChannelFeatureMap[channel]
-		if contains(features, feature) {
+		// If a Channel is not present in the map, then assume it has all properties. This is so an
+		// unknown Channel can be specified via the --channel flag and have tests run.
+		// TODO Use a flag to specify the features of the flag based Channel, rather than assuming
+		// it supports all features.
+		features, present := tr.ChannelFeatureMap[channel]
+		if !present || contains(features, feature) {
 			t.Run(fmt.Sprintf("%s-%s", t.Name(), channel), func(st *testing.T) {
 				testFunc(st, channel)
 			})

test/common/typemeta.go

@@ -55,11 +55,6 @@ func SourcesTypeMeta(kind string) *metav1.TypeMeta {
 	}
 }
 
-// GetChannelTypeMeta gets the actual typemeta of the typed channel.
-func GetChannelTypeMeta(channelKind string) *metav1.TypeMeta {
-	return MessagingTypeMeta(channelKind)
-}
-
 // ChannelTypeMeta is the TypeMeta ref for Channel.
 var ChannelTypeMeta = MessagingTypeMeta(resources.ChannelKind)
 

test/conformance/helpers/broker_tracing_test_helper.go

@@ -37,13 +37,12 @@ func BrokerTracingTestHelperWithChannelTestRunner(
 	channelTestRunner common.ChannelTestRunner,
 	setupClient SetupClientFunc,
 ) {
-	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel string) {
+	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
 		// Don't accidentally use t, use st instead. To ensure this, shadow 't' to a useless type.
 		t := struct{}{}
 		_ = fmt.Sprintf("%s", t)
 
-		channelTypeMeta := common.GetChannelTypeMeta(channel)
-		BrokerTracingTestHelper(st, *channelTypeMeta, setupClient)
+		BrokerTracingTestHelper(st, channel, setupClient)
 	})
 }
 

test/conformance/helpers/channel_header_single_event_helper.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"testing"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"knative.dev/eventing/test/base/resources"
 	"knative.dev/eventing/test/common"
@@ -39,15 +40,14 @@ func SingleEventHelperForChannelTestHelper(t *testing.T, encoding string, channe
 	subscriptionName := "conformance-headers-subscription-" + encoding
 	loggerPodName := "conformance-headers-logger-pod-" + encoding
 
-	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel string) {
+	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
 		st.Logf("Running header conformance test with channel %q", channel)
 		client := common.Setup(st, true)
 		defer common.TearDown(client)
 
 		// create channel
 		st.Logf("Creating channel")
-		channelTypeMeta := common.GetChannelTypeMeta(channel)
-		client.CreateChannelOrFail(channelName, channelTypeMeta)
+		client.CreateChannelOrFail(channelName, &channel)
 
 		// create logger service as the subscriber
 		pod := resources.EventDetailsPod(loggerPodName)
@@ -57,7 +57,7 @@ func SingleEventHelperForChannelTestHelper(t *testing.T, encoding string, channe
 		client.CreateSubscriptionOrFail(
 			subscriptionName,
 			channelName,
-			channelTypeMeta,
+			&channel,
 			resources.WithSubscriberForSubscription(loggerPodName),
 		)
 
@@ -78,7 +78,7 @@ func SingleEventHelperForChannelTestHelper(t *testing.T, encoding string, channe
 		}
 
 		st.Logf("Sending event with tracing headers to %s", senderName)
-		if err := client.SendFakeEventWithTracingToAddressable(senderName, channelName, channelTypeMeta, event); err != nil {
+		if err := client.SendFakeEventWithTracingToAddressable(senderName, channelName, &channel, event); err != nil {
 			st.Fatalf("Failed to send fake CloudEvent to the channel %q", channelName)
 		}
 

test/conformance/helpers/channel_tracing_test_helper.go

@@ -67,13 +67,12 @@ func ChannelTracingTestHelperWithChannelTestRunner(
 	channelTestRunner common.ChannelTestRunner,
 	setupClient SetupClientFunc,
 ) {
-	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel string) {
+	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
 		// Don't accidentally use t, use st instead. To ensure this, shadow 't' to a useless type.
 		t := struct{}{}
 		_ = fmt.Sprintf("%s", t)
 
-		channelTypeMeta := common.GetChannelTypeMeta(channel)
-		ChannelTracingTestHelper(st, *channelTypeMeta, setupClient)
+		ChannelTracingTestHelper(st, channel, setupClient)
 	})
 }
 

test/conformance/main_test.go

@@ -25,16 +25,11 @@ import (
 	"knative.dev/pkg/test/zipkin"
 )
 
-var setup = common.Setup
-var tearDown = common.TearDown
-var getChannelTypeMeta = common.GetChannelTypeMeta
-var channels test.Channels
 var channelTestRunner common.ChannelTestRunner
 
 func TestMain(m *testing.M) {
 	os.Exit(func() int {
 		test.InitializeEventingFlags()
-		channels = test.EventingFlags.Channels
 		channelTestRunner = common.ChannelTestRunner{
 			ChannelFeatureMap: common.ChannelFeatureMap,
 			ChannelsToTest:    test.EventingFlags.Channels,

test/e2e/helpers/broker_channel_flow_test_helper.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"testing"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"knative.dev/eventing/pkg/apis/eventing/v1alpha1"
 	"knative.dev/eventing/test/base/resources"
@@ -50,16 +51,15 @@ func BrokerChannelFlowTestHelper(t *testing.T, channelTestRunner common.ChannelT
 		subscriptionName = "e2e-brokerchannel-subscription"
 	)
 
-	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel string) {
+	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
 		client := common.Setup(st, true)
 		defer common.TearDown(client)
-		channelTypeMeta := common.GetChannelTypeMeta(channel)
 
 		// create required RBAC resources including ServiceAccounts and ClusterRoleBindings for Brokers
 		client.CreateRBACResourcesForBrokers()
 
 		// create a new broker
-		client.CreateBrokerOrFail(brokerName, channelTypeMeta)
+		client.CreateBrokerOrFail(brokerName, &channel)
 		client.WaitForResourceReady(brokerName, common.BrokerTypeMeta)
 
 		// create the event we want to transform to
@@ -96,11 +96,11 @@ func BrokerChannelFlowTestHelper(t *testing.T, channelTestRunner common.ChannelT
 		)
 
 		// create channel for trigger3
-		client.CreateChannelOrFail(channelName, channelTypeMeta)
-		client.WaitForResourceReady(channelName, channelTypeMeta)
+		client.CreateChannelOrFail(channelName, &channel)
+		client.WaitForResourceReady(channelName, &channel)
 
 		// create trigger3 to receive the transformed event, and send it to the channel
-		channelURL, err := client.GetAddressableURI(channelName, channelTypeMeta)
+		channelURL, err := client.GetAddressableURI(channelName, &channel)
 		if err != nil {
 			st.Fatalf("Failed to get the url for the channel %q: %v", channelName, err)
 		}
@@ -119,7 +119,7 @@ func BrokerChannelFlowTestHelper(t *testing.T, channelTestRunner common.ChannelT
 		client.CreateSubscriptionOrFail(
 			subscriptionName,
 			channelName,
-			channelTypeMeta,
+			&channel,
 			resources.WithSubscriberForSubscription(loggerPodName2),
 		)
 

test/e2e/helpers/broker_event_transformation_test_helper.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"testing"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"knative.dev/eventing/pkg/apis/eventing/v1alpha1"
 	"knative.dev/eventing/test/base/resources"
@@ -45,16 +46,15 @@ func EventTransformationForTriggerTestHelper(t *testing.T, channelTestRunner com
 		loggerPodName         = "logger-pod"
 	)
 
-	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel string) {
+	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
 		client := common.Setup(st, true)
 		defer common.TearDown(client)
-		channelTypeMeta := common.GetChannelTypeMeta(channel)
 
 		// create required RBAC resources including ServiceAccounts and ClusterRoleBindings for Brokers
 		client.CreateRBACResourcesForBrokers()
 
 		// create a new broker
-		client.CreateBrokerOrFail(brokerName, channelTypeMeta)
+		client.CreateBrokerOrFail(brokerName, &channel)
 		client.WaitForResourceReady(brokerName, common.BrokerTypeMeta)
 
 		// create the event we want to transform to

test/e2e/helpers/channel_chain_test_helper.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"testing"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"knative.dev/eventing/test/base/resources"
 	"knative.dev/eventing/test/common"
@@ -37,14 +38,13 @@ func ChannelChainTestHelper(t *testing.T, channelTestRunner common.ChannelTestRu
 	// subscriptionNames2 corresponds to Subscriptions on channelNames[1]
 	subscriptionNames2 := []string{"e2e-channelchain-subs21"}
 
-	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel string) {
+	channelTestRunner.RunTests(t, common.FeatureBasic, func(st *testing.T, channel metav1.TypeMeta) {
 		client := common.Setup(st, true)
 		defer common.TearDown(client)
 
 		// create channels
-		channelTypeMeta := common.GetChannelTypeMeta(channel)
-		client.CreateChannelsOrFail(channelNames, channelTypeMeta)
-		client.WaitForResourcesReady(channelTypeMeta)
+		client.CreateChannelsOrFail(channelNames, &channel)
+		client.WaitForResourcesReady(&channel)
 
 		// create loggerPod and expose it as a service
 		pod := resources.EventLoggerPod(loggerPodName)
@@ -54,14 +54,14 @@ func ChannelChainTestHelper(t *testing.T, channelTestRunner common.ChannelTestRu
 		client.CreateSubscriptionsOrFail(
 			subscriptionNames1,
 			channelNames[0],
-			channelTypeMeta,
-			resources.WithReplyForSubscription(channelNames[1], channelTypeMeta),
+			&channel,
+			resources.WithReplyForSubscription(channelNames[1], &channel),
 		)
 		// create subscriptions that subscribe the second channel, and call the logging service
 		client.CreateSubscriptionsOrFail(
 			subscriptionNames2,
 			channelNames[1],
-			channelTypeMeta,
+			&channel,
 			resources.WithSubscriberForSubscription(loggerPodName),
 		)
 
@@ -78,7 +78,7 @@ func ChannelChainTestHelper(t *testing.T, channelTestRunner common.ChannelTestRu
 			Data:     fmt.Sprintf(`{"msg":%q}`, body),
 			Encoding: resources.CloudEventDefaultEncoding,
 		}
-		if err := client.SendFakeEventToAddressable(senderName, channelNames[0], channelTypeMeta, event); err != nil {
+		if err := client.SendFakeEventToAddressable(senderName, channelNames[0], &channel, event); err != nil {
 			st.Fatalf("Failed to send fake CloudEvent to the channel %q", channelNames[0])
 		}