changed to two environments

knative · May 23, 2024 · f8a08b0 · f8a08b0
1 parent 384d975
commit f8a08b0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/test/rekt/crossnamespace_test.go b/test/rekt/crossnamespace_test.go
@@ -26,33 +26,39 @@ import (
 	"knative.dev/reconciler-test/pkg/knative"
 
 	"knative.dev/eventing/test/rekt/features/broker"
-	cn "knative.dev/eventing/test/rekt/features/crossnamespace"
 	"knative.dev/eventing/test/rekt/features/featureflags"
+	"knative.dev/eventing/test/rekt/features/trigger"
 )
 
 func TestBrokerTriggerCrossNamespaceReference(t *testing.T) {
 	t.Parallel()
 
-	ctx, env := global.Environment(
+	// namespaces and names for the broker and trigger
+	brokerNamespace := feature.MakeRandomK8sName("broker-namespace")
+	triggerNamespace := feature.MakeRandomK8sName("trigger-namespace")
+	brokerName := feature.MakeRandomK8sName("broker")
+	triggerName := feature.MakeRandomK8sName("trigger")
+
+	brokerEnvCtx, brokerEnv := global.Environment(
 		knative.WithKnativeNamespace(system.Namespace()),
 		knative.WithLoggingConfig,
 		knative.WithTracingConfig,
 		k8s.WithEventListener,
 		environment.Managed(t),
 	)
 
-	// namespaces and names for the broker and trigger
-	brokerNamespace := feature.MakeRandomK8sName("broker-namespace")
-	triggerNamespace := feature.MakeRandomK8sName("trigger-namespace")
-	brokerName := feature.MakeRandomK8sName("broker")
-	triggerName := feature.MakeRandomK8sName("trigger")
+	triggerEnvCtx, triggerEnv := global.Environment(
+		knative.WithKnativeNamespace(system.Namespace()),
+		knative.WithLoggingConfig,
+		knative.WithTracingConfig,
+		k8s.WithEventListener,
+		environment.Managed(t),
+	)
 
-	env.Prerequisite("Cross Namespace Event Links is enabled", featureflags.CrossEventLinksEnabled())
-	// namespaces for the broker and trigger if they do not exist
-	env.Prerequisite(ctx, t, env.CreateNamespaceIfNeeded(brokerNamespace))
-	env.Prerequisite(ctx, t, env.CreateNamespaceIfNeeded(triggerNamespace))
+	triggerEnv.Prerequisite("Cross Namespace Event Links is enabled", featureflags.CrossEventLinksEnabled())
+	brokerEnv.Prerequisite("Cross Namespace Event Links is enabled", featureflags.CrossEventLinksEnabled())
 
-	env.Test(ctx, t, broker.GoesReadyInDifferentNamespace(brokerName, brokerNamespace))
-	env.Test(ctx, t, broker.TriggerGoesReady(triggerName, brokerName))
-	env.Test(ctx, t, cn.TriggerSendsEventsToBroker(brokerNamespace, brokerName, triggerNamespace, triggerName))
+	brokerEnv.Test(brokerEnvCtx, t, broker.GoesReadyInDifferentNamespace(brokerName, brokerNamespace))
+	brokerEnv.Test(brokerEnvCtx, t, broker.TriggerGoesReady(triggerName, brokerName))
+	triggerEnv.Test(triggerEnvCtx, t, trigger.CrossNamespaceEventLinks(brokerEnvCtx, brokerNamespace, brokerName, triggerNamespace, triggerName))
 }
diff --git a/...features/crossnamespace/trigger_broker.go → test/rekt/features/trigger/crossnamespace.go b/...features/crossnamespace/trigger_broker.go → test/rekt/features/trigger/crossnamespace.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package crossnamespace
+package trigger
 
 import (
 	"context"
@@ -30,7 +30,7 @@ import (
 	"knative.dev/eventing/test/rekt/resources/broker"
 )
 
-func TriggerSendsEventsToBroker(brokerNamespace, brokerName, triggerNamespace, triggerName string) *feature.Feature {
+func CrossNamespaceEventLinks(ctx context.Context, brokerNamespace, brokerName, triggerNamespace, triggerName string) *feature.Feature {
 	f := feature.NewFeature()
 
 	sourceName := feature.MakeRandomK8sName("source")