Add options to test namespace creation

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

Diff for: test/e2e/bundle_e2e_test.go

@@ -40,7 +40,7 @@ var _ = Describe("Installing bundles with new object types", func() {
 		dynamicClient = ctx.Ctx().DynamicClient()
 
 		By("creating a test namespace")
-		generatedNamespace = SetupGeneratedTestNamespace(genName("bundle-e2e-"))
+		generatedNamespace = SetupGeneratedTestNamespace(genName("bundle-e2e-"), WithOwnNamespaceOperatorGroup())
 	})
 
 	AfterEach(func() {

Diff for: test/e2e/crd_e2e_test.go

@@ -26,7 +26,7 @@ var _ = Describe("CRD Versions", func() {
 	)
 
 	BeforeEach(func() {
-		ns = SetupGeneratedTestNamespace(genName("crd-e2e-"))
+		ns = SetupGeneratedTestNamespace(genName("crd-e2e-"), WithOwnNamespaceOperatorGroup())
 	})
 
 	AfterEach(func() {

Diff for: test/e2e/gc_e2e_test.go

@@ -34,8 +34,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
 		kubeClient = ctx.Ctx().KubeClient()
 		operatorClient = ctx.Ctx().OperatorClient()
 
-		namespaceName := genName("gc-e2e-")
-		ns = SetupGeneratedTestNamespace(namespaceName, namespaceName)
+		ns = SetupGeneratedTestNamespace(genName("gc-e2e-"), WithAllNamespaceOperatorGroup())
 	})
 
 	AfterEach(func() {

Diff for: test/e2e/subscription_e2e_test.go

@@ -55,7 +55,7 @@ var _ = Describe("Subscription", func() {
 	)
 
 	BeforeEach(func() {
-		generatedNamespace = SetupGeneratedTestNamespace(genName("subscription-e2e-"))
+		generatedNamespace = SetupGeneratedTestNamespace(genName("subscription-e2e-"), WithAllNamespaceOperatorGroup())
 	})
 
 	AfterEach(func() {

Diff for: test/e2e/util.go

@@ -984,18 +984,143 @@ func SetupGeneratedTestNamespaceWithOperatorGroup(name string, og operatorsv1.Op
 	return ns
 }
 
-func SetupGeneratedTestNamespace(name string, targetNamespaces ...string) corev1.Namespace {
-	og := operatorsv1.OperatorGroup{
+type TestNamespaceOption func(cfg *testNamespaceConfiguration)
+type TestNamespaceModifier func(ns *corev1.Namespace)
+
+type testNamespaceConfiguration struct {
+	preCreateHooks  []TestNamespaceModifier
+	postCreateHooks []TestNamespaceModifier
+}
+
+func (t *testNamespaceConfiguration) ApplyPreCreateHooks(ns *corev1.Namespace) {
+	for _, hook := range t.preCreateHooks {
+		hook(ns)
+	}
+}
+
+func (t *testNamespaceConfiguration) ApplyPostCreateHooks(ns *corev1.Namespace) {
+	for _, hook := range t.postCreateHooks {
+		hook(ns)
+	}
+}
+
+func (t *testNamespaceConfiguration) RegisterPreCreateHook(fn TestNamespaceModifier) {
+	if fn == nil {
+		panic("test namespace modifier is nil")
+	}
+	t.preCreateHooks = append(t.preCreateHooks, fn)
+}
+
+func (t *testNamespaceConfiguration) RegisterPostCreateHook(fn TestNamespaceModifier) {
+	if fn == nil {
+		panic("test namespace modifier is nil")
+	}
+	t.postCreateHooks = append(t.postCreateHooks, fn)
+}
+
+func WithAllNamespaceOperatorGroup() TestNamespaceOption {
+	return func(cfg *testNamespaceConfiguration) {
+		cfg.RegisterPostCreateHook(func(ns *corev1.Namespace) {
+			og := operatorsv1.OperatorGroup{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      fmt.Sprintf("%s-operatorgroup", ns.GetName()),
+					Namespace: ns.GetName(),
+				},
+			}
+			Eventually(func() error {
+				return ctx.Ctx().Client().Create(context.Background(), &og)
+			}).Should(Succeed())
+		})
+	}
+}
+
+func WithOwnNamespaceOperatorGroup() TestNamespaceOption {
+	return func(cfg *testNamespaceConfiguration) {
+		cfg.RegisterPostCreateHook(func(ns *corev1.Namespace) {
+			og := operatorsv1.OperatorGroup{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      fmt.Sprintf("%s-operatorgroup", ns.GetName()),
+					Namespace: ns.GetName(),
+				},
+				Spec: operatorsv1.OperatorGroupSpec{
+					TargetNamespaces: []string{ns.GetName()},
+				},
+			}
+			Eventually(func() error {
+				return ctx.Ctx().Client().Create(context.Background(), &og)
+			}).Should(Succeed())
+		})
+	}
+}
+
+func WithSingleNamespaceOperatorGroup(watchedNamespace string) TestNamespaceOption {
+	return func(cfg *testNamespaceConfiguration) {
+		cfg.RegisterPostCreateHook(func(ns *corev1.Namespace) {
+			og := operatorsv1.OperatorGroup{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      fmt.Sprintf("%s-operatorgroup", ns.GetName()),
+					Namespace: ns.GetName(),
+				},
+				Spec: operatorsv1.OperatorGroupSpec{
+					TargetNamespaces: []string{watchedNamespace},
+				},
+			}
+			Eventually(func() error {
+				return ctx.Ctx().Client().Create(context.Background(), &og)
+			}).Should(Succeed())
+		})
+	}
+}
+
+func WithMultiNamespaceOperatorGroup(watchedNamespaceNames ...string) TestNamespaceOption {
+	return func(cfg *testNamespaceConfiguration) {
+		cfg.RegisterPostCreateHook(func(ns *corev1.Namespace) {
+			og := operatorsv1.OperatorGroup{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      fmt.Sprintf("%s-operatorgroup", ns.GetName()),
+					Namespace: ns.GetNamespace(),
+				},
+				Spec: operatorsv1.OperatorGroupSpec{
+					TargetNamespaces: watchedNamespaceNames,
+				},
+			}
+			Eventually(func() error {
+				return ctx.Ctx().Client().Create(context.Background(), &og)
+			}).Should(Succeed())
+		})
+	}
+}
+
+func WithLabels(labels map[string]string) TestNamespaceOption {
+	return func(cfg *testNamespaceConfiguration) {
+		cfg.RegisterPreCreateHook(func(ns *corev1.Namespace) {
+			ns.SetLabels(labels)
+		})
+	}
+}
+
+func SetupGeneratedTestNamespace(name string, options ...TestNamespaceOption) corev1.Namespace {
+	// Setup test namespace configuration
+	cfg := testNamespaceConfiguration{}
+	for _, opt := range options {
+		opt(&cfg)
+	}
+	ns := corev1.Namespace{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      fmt.Sprintf("%s-operatorgroup", name),
-			Namespace: name,
-		},
-		Spec: operatorsv1.OperatorGroupSpec{
-			TargetNamespaces: targetNamespaces,
+			Name: name,
 		},
 	}
 
-	return SetupGeneratedTestNamespaceWithOperatorGroup(name, og)
+	ctx.Ctx().Logf("applying pre hooks")
+	cfg.ApplyPreCreateHooks(&ns)
+	ctx.Ctx().Logf("creating")
+	Eventually(func() error {
+		return ctx.Ctx().Client().Create(context.Background(), &ns)
+	}).Should(Succeed())
+	ctx.Ctx().Logf("applying post hooks")
+	cfg.ApplyPostCreateHooks(&ns)
+
+	return ns
 }
 
 func TeardownNamespace(ns string) {