remove mutators

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

internal/operator-controller/rukpak/convert/generate.go renamed to internal/operator-controller/rukpak/convert/generators.go

@@ -45,12 +45,6 @@ func ChainedResourceGenerator(resourceGenerators ...ResourceGenerator) ResourceG
 	}
 }
 
-var BundleRBACResourceGenerator = ChainedResourceGenerator(
-	BundleServiceAccountGenerator,
-	BundlePermissionsGenerator,
-	BundleClusterPermissionsGenerator,
-)
-
 func BundleDeploymentGenerator(rv1 *RegistryV1, opts Options) ([]client.Object, error) {
 	if rv1 == nil {
 		return nil, fmt.Errorf("bundle cannot be nil")

internal/operator-controller/rukpak/convert/generate_test.go renamed to internal/operator-controller/rukpak/convert/generators_test.go

@@ -220,7 +220,9 @@ var PlainConverter = Converter{
 	BundleRenderer: BundleRenderer{
 		BundleValidator: RegistryV1BundleValidator,
 		ResourceGenerators: []ResourceGenerator{
-			BundleRBACResourceGenerator,
+			BundleServiceAccountGenerator,
+			BundlePermissionsGenerator,
+			BundleClusterPermissionsGenerator,
 			BundleCRDGenerator,
 			BundleAdditionalResourcesGenerator,
 			BundleDeploymentGenerator,

internal/operator-controller/rukpak/convert/mutate.go

@@ -2,7 +2,6 @@ package convert
 
 import (
 	"fmt"
-	"slices"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -25,9 +24,8 @@ func (o *options) apply(opts ...Option) *options {
 }
 
 type BundleRenderer struct {
-	BundleValidator          BundleValidator
-	ResourceGenerators       []ResourceGenerator
-	ResourceMutatorFactories []ResourceMutatorFactory
+	BundleValidator    BundleValidator
+	ResourceGenerators []ResourceGenerator
 }
 
 func (r BundleRenderer) Render(rv1 RegistryV1, installNamespace string, watchNamespaces []string, opts ...Option) ([]client.Object, error) {
@@ -47,23 +45,12 @@ func (r BundleRenderer) Render(rv1 RegistryV1, installNamespace string, watchNam
 		UniqueNameGenerator: renderOptions.UniqueNameGenerator,
 	}
 
-	// generate object mutators
-	objMutators, err := ChainedResourceMutatorFactory(r.ResourceMutatorFactories).MakeResourceMutators(&rv1, genOpts)
-	if err != nil {
-		return nil, err
-	}
-
 	// generate bundle objects
 	objs, err := ChainedResourceGenerator(r.ResourceGenerators...).GenerateResources(&rv1, genOpts)
 	if err != nil {
 		return nil, err
 	}
 
-	// mutate objects
-	if err := objMutators.MutateObjects(slices.Values(objs)); err != nil {
-		return nil, err
-	}
-
 	return objs, nil
 }
 

internal/operator-controller/rukpak/convert/mutate_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/convert"
@@ -51,73 +50,6 @@ func Test_BundleRenderer_CallsResourceGenerators(t *testing.T) {
 	require.Equal(t, []client.Object{&corev1.Namespace{}, &corev1.Service{}, &appsv1.Deployment{}}, objs)
 }
 
-func Test_BundleRenderer_CallsResourceMutators(t *testing.T) {
-	renderer := convert.BundleRenderer{
-		ResourceGenerators: []convert.ResourceGenerator{
-			func(rv1 *convert.RegistryV1, opts convert.Options) ([]client.Object, error) {
-				return []client.Object{&corev1.Namespace{}, &corev1.Service{}}, nil
-			},
-		},
-		ResourceMutatorFactories: []convert.ResourceMutatorFactory{
-			func(rv1 *convert.RegistryV1, opts convert.Options) (convert.ResourceMutators, error) {
-				return []convert.ResourceMutator{
-					func(object client.Object) error {
-						switch object.(type) {
-						case *corev1.Namespace:
-							object.SetName("some-namespace")
-						case *corev1.Service:
-							object.SetName("some-service")
-						}
-						return nil
-					},
-					func(object client.Object) error {
-						object.SetLabels(map[string]string{
-							"some": "label",
-						})
-						return nil
-					},
-				}, nil
-			},
-			func(rv1 *convert.RegistryV1, opts convert.Options) (convert.ResourceMutators, error) {
-				return []convert.ResourceMutator{
-					func(object client.Object) error {
-						object.SetAnnotations(map[string]string{
-							"some": "annotation",
-						})
-						return nil
-					},
-				}, nil
-			},
-		},
-	}
-	objs, err := renderer.Render(convert.RegistryV1{}, "", nil)
-	require.NoError(t, err)
-	require.Equal(t, []client.Object{
-		&corev1.Namespace{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "some-namespace",
-				Labels: map[string]string{
-					"some": "label",
-				},
-				Annotations: map[string]string{
-					"some": "annotation",
-				},
-			},
-		},
-		&corev1.Service{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "some-service",
-				Labels: map[string]string{
-					"some": "label",
-				},
-				Annotations: map[string]string{
-					"some": "annotation",
-				},
-			},
-		},
-	}, objs, objs)
-}
-
 func Test_BundleRenderer_ReturnsResourceGeneratorErrors(t *testing.T) {
 	renderer := convert.BundleRenderer{
 		ResourceGenerators: []convert.ResourceGenerator{
@@ -134,45 +66,3 @@ func Test_BundleRenderer_ReturnsResourceGeneratorErrors(t *testing.T) {
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "generator error")
 }
-
-func Test_BundleRenderer_ReturnsResourceMutatorFactoryErrors(t *testing.T) {
-	renderer := convert.BundleRenderer{
-		ResourceGenerators: []convert.ResourceGenerator{
-			func(rv1 *convert.RegistryV1, opts convert.Options) ([]client.Object, error) {
-				return []client.Object{&corev1.Namespace{}, &corev1.Service{}}, nil
-			},
-		},
-		ResourceMutatorFactories: []convert.ResourceMutatorFactory{
-			func(rv1 *convert.RegistryV1, opts convert.Options) (convert.ResourceMutators, error) {
-				return nil, errors.New("mutator factory error")
-			},
-		},
-	}
-	objs, err := renderer.Render(convert.RegistryV1{}, "", nil)
-	require.Nil(t, objs)
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "mutator factory error")
-}
-
-func Test_BundleRenderer_ReturnsResourceMutatorErrors(t *testing.T) {
-	renderer := convert.BundleRenderer{
-		ResourceGenerators: []convert.ResourceGenerator{
-			func(rv1 *convert.RegistryV1, opts convert.Options) ([]client.Object, error) {
-				return []client.Object{&corev1.Namespace{}, &corev1.Service{}}, nil
-			},
-		},
-		ResourceMutatorFactories: []convert.ResourceMutatorFactory{
-			func(rv1 *convert.RegistryV1, opts convert.Options) (convert.ResourceMutators, error) {
-				return []convert.ResourceMutator{
-					func(object client.Object) error {
-						return errors.New("mutator error")
-					},
-				}, nil
-			},
-		},
-	}
-	objs, err := renderer.Render(convert.RegistryV1{}, "", nil)
-	require.Nil(t, objs)
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "mutator error")
-}