Remove extra bundles argo used to try to validate regretion in favor of cover scenarios with mocks and unit tests

Author: camilamacedo86

Makefile

@@ -167,15 +167,9 @@ generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyI
 	$(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: verify
-verify: k8s-pin kind-verify-versions fmt generate manifests crd-ref-docs generate-test-data #HELP Verify all generated code is up-to-date. Runs k8s-pin instead of just tidy.
+verify: k8s-pin kind-verify-versions fmt generate manifests crd-ref-docs #HELP Verify all generated code is up-to-date. Runs k8s-pin instead of just tidy.
 	git diff --exit-code
 
-# Renders registry+v1 bundles in test/convert
-# Used by CI in verify to catch regressions in the registry+v1 -> plain conversion code
-.PHONY: generate-test-data
-generate-test-data:
-	go run test/convert/generate-manifests.go
-
 .PHONY: fix-lint
 fix-lint: $(GOLANGCI_LINT) #EXHELP Fix lint issues
 	$(GOLANGCI_LINT) run --fix --build-tags $(GO_BUILD_TAGS) $(GOLANGCI_LINT_ARGS)

go.mod

@@ -30,6 +30,7 @@ require (
 	golang.org/x/sync v0.16.0
 	golang.org/x/tools v0.35.0
 	gopkg.in/yaml.v2 v2.4.0
+	gotest.tools/v3 v3.5.2
 	helm.sh/helm/v3 v3.18.4
 	k8s.io/api v0.33.2
 	k8s.io/apiextensions-apiserver v0.33.2

internal/operator-controller/rukpak/render/render_test.go

@@ -6,9 +6,13 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -267,3 +271,182 @@ func Test_BundleValidatorCallsAllValidationFnsInOrder(t *testing.T) {
 	require.NoError(t, val.Validate(nil))
 	require.Equal(t, "hi", actual)
 }
+
+// Test_Render_ValidatesOutputForAllInstallModes ensures that the BundleRenderer
+// correctly generates and returns the exact list of client.Objects produced by the
+// ResourceGenerators, across all supported install modes (AllNamespaces, SingleNamespace, OwnNamespace).
+func Test_Render_ValidatesOutputForAllInstallModes(t *testing.T) {
+	testCases := []struct {
+		name             string
+		installNamespace string
+		watchNamespace   string
+		installModes     []v1alpha1.InstallMode
+		expectedNS       string
+	}{
+		{
+			name:             "AllNamespaces",
+			installNamespace: "mock-system",
+			watchNamespace:   "",
+			installModes: []v1alpha1.InstallMode{
+				{Type: v1alpha1.InstallModeTypeAllNamespaces, Supported: true},
+			},
+			expectedNS: "mock-system",
+		},
+		{
+			name:             "SingleNamespace",
+			installNamespace: "mock-system",
+			watchNamespace:   "mock-watch",
+			installModes: []v1alpha1.InstallMode{
+				{Type: v1alpha1.InstallModeTypeSingleNamespace, Supported: true},
+			},
+			expectedNS: "mock-watch",
+		},
+		{
+			name:             "OwnNamespace",
+			installNamespace: "mock-system",
+			watchNamespace:   "mock-system",
+			installModes: []v1alpha1.InstallMode{
+				{Type: v1alpha1.InstallModeTypeOwnNamespace, Supported: true},
+			},
+			expectedNS: "mock-system",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			expectedObjects := []client.Object{
+				fakeUnstructured("ClusterRole", "", "mock-clusterrole"),
+				fakeUnstructured("ClusterRoleBinding", "", "mock-clusterrolebinding"),
+				fakeUnstructured("Role", tc.expectedNS, "mock-role"),
+				fakeUnstructured("RoleBinding", tc.expectedNS, "mock-rolebinding"),
+				fakeUnstructured("ConfigMap", tc.expectedNS, "mock-config"),
+				fakeUnstructured("Secret", tc.expectedNS, "mock-secret"),
+				fakeUnstructured("Service", tc.expectedNS, "mock-service"),
+				fakeUnstructured("Deployment", tc.expectedNS, "mock-deployment"),
+				fakeUnstructured("ServiceAccount", tc.expectedNS, "mock-sa"),
+				fakeUnstructured("NetworkPolicy", tc.expectedNS, "mock-netpol"),
+			}
+
+			mockGen := render.ResourceGenerator(func(_ *bundle.RegistryV1, _ render.Options) ([]client.Object, error) {
+				return expectedObjects, nil
+			})
+
+			mockBundle := bundle.RegistryV1{
+				CSV: v1alpha1.ClusterServiceVersion{
+					Spec: v1alpha1.ClusterServiceVersionSpec{
+						InstallModes: tc.installModes,
+					},
+				},
+			}
+
+			renderer := render.BundleRenderer{
+				BundleValidator: render.BundleValidator{
+					func(_ *bundle.RegistryV1) []error { return nil },
+				},
+				ResourceGenerators: []render.ResourceGenerator{mockGen},
+			}
+
+			opts := []render.Option{
+				render.WithTargetNamespaces(tc.watchNamespace),
+				render.WithUniqueNameGenerator(render.DefaultUniqueNameGenerator),
+			}
+
+			objs, err := renderer.Render(mockBundle, tc.installNamespace, opts...)
+			require.NoError(t, err)
+			require.Len(t, objs, len(expectedObjects))
+
+			// Compare expected vs actual objects
+			gotMap := make(map[string]client.Object)
+			for _, obj := range objs {
+				gotMap[objectKey(obj)] = obj
+			}
+
+			for _, exp := range expectedObjects {
+				key := objectKey(exp)
+				got, exists := gotMap[key]
+				require.True(t, exists, "missing expected object: %s", key)
+
+				expObj := exp.(*unstructured.Unstructured)
+				gotObj := got.(*unstructured.Unstructured)
+
+				if diff := cmp.Diff(expObj.Object, gotObj.Object, cmpopts.EquateEmpty()); diff != "" {
+					t.Errorf("object content mismatch for %s (-want +got):\n%s", key, diff)
+				}
+			}
+		})
+	}
+}
+
+// fakeUnstructured creates a fake unstructured client.Object with the specified kind, namespace, and name.
+func fakeUnstructured(kind, namespace, name string) client.Object {
+	obj := &unstructured.Unstructured{}
+	obj.Object = make(map[string]interface{})
+
+	group := ""
+	version := "v1"
+
+	switch kind {
+	case "NetworkPolicy":
+		err := unstructured.SetNestedField(obj.Object, map[string]interface{}{
+			"podSelector": map[string]interface{}{
+				"matchLabels": map[string]interface{}{"app": "my-app"},
+			},
+			"policyTypes": []interface{}{"Ingress"},
+		}, "spec")
+		if err != nil {
+			panic(fmt.Sprintf("failed to set spec for NetworkPolicy: %v", err))
+		}
+	case "Service":
+		_ = unstructured.SetNestedField(obj.Object, map[string]interface{}{
+			"ports": []interface{}{
+				map[string]interface{}{
+					"port":       int64(8080),
+					"targetPort": "http",
+				},
+			},
+			"selector": map[string]interface{}{
+				"app": "mock-app",
+			},
+		}, "spec")
+	case "Deployment":
+		_ = unstructured.SetNestedField(obj.Object, map[string]interface{}{
+			"replicas": int64(1),
+			"selector": map[string]interface{}{
+				"matchLabels": map[string]interface{}{"app": "mock-app"},
+			},
+			"template": map[string]interface{}{
+				"metadata": map[string]interface{}{
+					"labels": map[string]interface{}{"app": "mock-app"},
+				},
+				"spec": map[string]interface{}{
+					"containers": []interface{}{
+						map[string]interface{}{
+							"name":  "controller",
+							"image": "mock-controller:latest",
+						},
+					},
+				},
+			},
+		}, "spec")
+	case "ConfigMap":
+		_ = unstructured.SetNestedField(obj.Object, map[string]interface{}{
+			"controller": "enabled",
+		}, "data")
+	}
+
+	obj.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   group,
+		Version: version,
+		Kind:    kind,
+	})
+	obj.SetNamespace(namespace)
+	obj.SetName(name)
+
+	return obj
+}
+
+// objectKey returns a unique key for a Kubernetes object based on Kind/Namespace/Name.
+func objectKey(obj client.Object) string {
+	gvk := obj.GetObjectKind().GroupVersionKind()
+	return fmt.Sprintf("%s/%s/%s", gvk.Kind, obj.GetNamespace(), obj.GetName())
+}