Add Broker control plane tests for Broker v1beta1

test/conformance/broker_control_plane_test.go

@@ -0,0 +1,30 @@
+// +build e2e
+
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package conformance
+
+import (
+	"testing"
+
+	"knative.dev/eventing/test/conformance/helpers"
+	"knative.dev/eventing/test/lib"
+)
+
+func TestBrokerV1Beta1ControlPlane(t *testing.T) {
+	helpers.BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(t, brokerClass, channelTestRunner, lib.SetupClientOptionNoop)
+}

test/conformance/helpers/broker_control_plane_test_helper.go

@@ -0,0 +1,157 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package helpers
+
+import (
+	"testing"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	eventingv1beta1 "knative.dev/eventing/pkg/apis/eventing/v1beta1"
+
+	"knative.dev/eventing/test/lib"
+	"knative.dev/eventing/test/lib/duck"
+	"knative.dev/eventing/test/lib/resources"
+)
+
+//This tests if the broker control plane:
+//1. Trigger can be created before Broker (with attributes filter)
+//2. Broker can be created and progresses to Ready
+//3. Ready Broker is Addressable
+//4. Trigger with Ready broker progresses to Ready
+//5. Trigger with no broker, updated with broker, updates status to include subscriberURI
+//6. Ready Trigger includes status.subscriberUri
+func BrokerV1Beta1ControlPlaneTestHelperWithChannelTestRunner(
+	t *testing.T,
+	brokerClass string,
+	channelTestRunner lib.ChannelTestRunner,
+	setupClient ...lib.SetupClientOption,
+) {
+	channelTestRunner.RunTests(t, lib.FeatureBasic, func(t *testing.T, channel metav1.TypeMeta) {
+		client := lib.Setup(t, true, setupClient...)
+		defer lib.TearDown(client)
+		brokerName := "br"
+		triggerNoBroker := "trigger-no-broker"
+		triggerWithBroker := "trigger-with-broker"
+
+		t.Run("Trigger V1Beta1 can be crated before Broker (with attributes filter)", func(t *testing.T) {
+			TriggerV1Beta1BeforeBrokerHelper(t, triggerNoBroker, client)
+		})
+
+		t.Run("Broker V1Beta1 can be created and progresses to Ready", func(t *testing.T) {
+			BrokerV1Beta1CreatedToReadyHelper(t, brokerName, brokerClass, client, channel)
+		})
+
+		t.Run("Ready Broker V1Beta1 is Addressable", func(t *testing.T) {
+			ReadyBrokerV1Beta1AvailableHelper(t, brokerName, client)
+		})
+
+		t.Run("Trigger V1Beta1 with Ready broker progresses to Ready", func(t *testing.T) {
+			TriggerV1Beta1ReadyBrokerReadyHelper(t, triggerWithBroker, brokerName, client)
+		})
+
+		t.Run("Ready Trigger V1Beta1 (no Broker) set Broker and includes status.subscriber Uri", func(t *testing.T) {
+			TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t, triggerNoBroker, brokerName, client)
+		})
+
+		t.Run("Ready Trigger V1Beta1 includes status.subscriber Uri", func(t *testing.T) {
+			TriggerV1Beta1ReadyIncludesSubURI(t, triggerWithBroker, client)
+		})
+	})
+
+}
+
+func TriggerV1Beta1BeforeBrokerHelper(t *testing.T, triggerName string, client *lib.Client) {
+	const etLogger = "logger"
+	const loggerPodName = "logger-pod"
+
+	logPod := resources.EventRecordPod(loggerPodName)
+	client.CreatePodOrFail(logPod, lib.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) {
+	client.CreateBrokerConfigMapOrFail(brokerName, &channel)
+
+	broker := client.CreateBrokerV1Beta1OrFail(
+		"br",
+		resources.WithBrokerClassForBrokerV1Beta1(brokerClass),
+		resources.WithConfigMapForBrokerConfig(),
+	)
+
+	client.WaitForResourceReadyOrFail(broker.Name, lib.BrokerTypeMeta)
+
+}
+
+func ReadyBrokerV1Beta1AvailableHelper(t *testing.T, brokerName string, client *lib.Client) {
+	client.WaitForResourceReadyOrFail(brokerName, lib.BrokerTypeMeta)
+	obj := resources.NewMetaResource(brokerName, client.Namespace, lib.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) {
+	const etLogger = "logger"
+	const loggerPodName = "logger-pod"
+
+	trigger := client.CreateTriggerOrFailV1Beta1(triggerName,
+		resources.WithAttributesTriggerFilterV1Beta1(eventingv1beta1.TriggerAnyFilter, etLogger, map[string]interface{}{}),
+		resources.WithSubscriberServiceRefForTriggerV1Beta1(loggerPodName),
+		resources.WithBrokerV1Beta1(brokerName),
+	)
+
+	client.WaitForResourceReadyOrFail(trigger.Name, lib.TriggerTypeMeta)
+}
+
+func TriggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, brokerName string, client *lib.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)
+	}
+	tr.Spec.Broker = brokerName
+	_, err = client.Eventing.EventingV1beta1().Triggers(client.Namespace).Update(tr)
+	if err != nil {
+		t.Fatalf("Error: Could not update trigger %s: %v", triggerName, err)
+	}
+	time.Sleep(5 * time.Second)
+	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)
+	}
+	if tr.Status.SubscriberURI == nil {
+		t.Fatalf("Error: trigger.Status.SubscriberURI is nil but Broker Addressable & Ready")
+	}
+
+}
+
+func TriggerV1Beta1ReadyIncludesSubURI(t *testing.T, triggerName string, client *lib.Client) {
+	client.WaitForResourceReadyOrFail(triggerName, lib.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)
+	}
+	if tr.Status.SubscriberURI == nil {
+		t.Fatalf("Error: trigger.Status.SubscriberURI is nil but resource reported Ready")
+	}
+}