Move cert provider option to render

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

Author: Per Goncalves da Silva

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

@@ -271,7 +271,7 @@ func (c Converter) Convert(rv1 render.RegistryV1, installNamespace string, targe
 		rv1,
 		installNamespace,
 		render.WithTargetNamespaces(targetNamespaces...),
-		certproviders.WithCertManagerCertificateProvider(),
+		render.WithCertificateProvider(certproviders.CertManagerCertificateProvider{}),
 	)
 	if err != nil {
 		return nil, err

internal/operator-controller/rukpak/render/certproviders/certmanager.go

@@ -20,12 +20,6 @@ const (
 	certManagerInjectCAAnnotation = "cert-manager.io/inject-ca-from"
 )
 
-func WithCertManagerCertificateProvider() render.Option {
-	return func(o *render.Options) {
-		o.CertificateProvider = CertManagerCertificateProvider{}
-	}
-}
-
 var _ render.CertificateProvider = (*CertManagerCertificateProvider)(nil)
 
 type CertManagerCertificateProvider struct{}

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

@@ -92,6 +92,12 @@ func WithUniqueNameGenerator(generator UniqueNameGenerator) Option {
 	}
 }
 
+func WithCertificateProvider(provider CertificateProvider) Option {
+	return func(o *Options) {
+		o.CertificateProvider = provider
+	}
+}
+
 type BundleRenderer struct {
 	BundleValidator    BundleValidator
 	ResourceGenerators []ResourceGenerator

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

@@ -12,6 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/render"
+	. "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/util/testing"
 )
 
 func Test_BundleRenderer_NoConfig(t *testing.T) {
@@ -81,6 +82,13 @@ func Test_WithUniqueNameGenerator(t *testing.T) {
 	require.Equal(t, "a man needs a name", generatedName)
 }
 
+func Test_WithCertificateProvide(t *testing.T) {
+	opts := &render.Options{}
+	expectedCertProvider := FakeCertProvider{}
+	render.WithCertificateProvider(expectedCertProvider)(opts)
+	require.Equal(t, expectedCertProvider, opts.CertificateProvider)
+}
+
 func Test_BundleRenderer_CallsResourceGenerators(t *testing.T) {
 	renderer := render.BundleRenderer{
 		ResourceGenerators: []render.ResourceGenerator{