Refactor converter to use validated bundle config

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

Author: Per Goncalves da Silva

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

@@ -7,7 +7,7 @@ import (
 
 	"helm.sh/helm/v3/pkg/chart"
 
-	bundlepkg "github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/bundle"
+	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/bundle/bundlecfg"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/bundle/source"
 	"github.com/operator-framework/operator-controller/internal/operator-controller/rukpak/render"
 )
@@ -24,15 +24,6 @@ func (r *BundleToHelmChartConverter) ToHelmChart(bundle source.BundleSource, ins
 		return nil, err
 	}
 
-	opts := []render.Option{
-		render.WithCertificateProvider(r.CertificateProvider),
-	}
-	if config != nil {
-		if watchNs, ok := config[bundlepkg.BundleConfigWatchNamespaceKey].(string); ok {
-			opts = append(opts, render.WithTargetNamespaces(watchNs))
-		}
-	}
-
 	if len(rv1.CSV.Spec.APIServiceDefinitions.Owned) > 0 {
 		return nil, fmt.Errorf("unsupported bundle: apiServiceDefintions are not supported")
 	}
@@ -49,6 +40,18 @@ func (r *BundleToHelmChartConverter) ToHelmChart(bundle source.BundleSource, ins
 		return nil, fmt.Errorf("unsupported bundle: webhookDefinitions are not supported")
 	}
 
+	opts := []render.Option{
+		render.WithCertificateProvider(r.CertificateProvider),
+	}
+
+	bundleConfig, err := bundlecfg.Unmarshall(rv1, installNamespace, config)
+	if err != nil {
+		return nil, err
+	}
+	if bundleConfig != nil && bundleConfig.WatchNamespace != "" {
+		opts = append(opts, render.WithTargetNamespaces(bundleConfig.WatchNamespace))
+	}
+
 	objs, err := r.BundleRenderer.Render(rv1, installNamespace, opts...)
 
 	if err != nil {

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

@@ -32,6 +32,21 @@ func Test_BundleToHelmChartConverter_ToHelmChart_ReturnsBundleSourceFailures(t *
 	require.Contains(t, err.Error(), "some error")
 }
 
+func Test_BundleToHelmChartConverter_ToHelmChart_ReturnsBundleConfigFailures(t *testing.T) {
+	converter := convert.BundleToHelmChartConverter{}
+	b := source.FromBundle(
+		bundle.RegistryV1{
+			CSV: MakeCSV(WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces)),
+		},
+	)
+	config := map[string]interface{}{
+		bundle.BundleConfigWatchNamespaceKey: "some-namespace",
+	}
+	_, err := converter.ToHelmChart(b, "install-namespace", config)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "'watchNamespace' not allowed")
+}
+
 func Test_BundleToHelmChartConverter_ToHelmChart_ReturnsBundleRendererFailures(t *testing.T) {
 	converter := convert.BundleToHelmChartConverter{
 		BundleRenderer: render.BundleRenderer{
@@ -45,12 +60,12 @@ func Test_BundleToHelmChartConverter_ToHelmChart_ReturnsBundleRendererFailures(t
 
 	b := source.FromBundle(
 		bundle.RegistryV1{
-			CSV: MakeCSV(WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces)),
+			CSV: MakeCSV(WithInstallModeSupportFor(v1alpha1.InstallModeTypeSingleNamespace)),
 		},
 	)
 
 	config := map[string]interface{}{
-		bundle.BundleConfigWatchNamespaceKey: "",
+		bundle.BundleConfigWatchNamespaceKey: "some-namespace",
 	}
 	_, err := converter.ToHelmChart(b, "install-namespace", config)
 	require.Error(t, err)
@@ -121,22 +136,22 @@ func Test_BundleToHelmChartConverter_ToHelmChart_WebhooksWithCertProvider(t *tes
 	b := source.FromBundle(
 		bundle.RegistryV1{
 			CSV: MakeCSV(
-				WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces),
+				WithInstallModeSupportFor(v1alpha1.InstallModeTypeSingleNamespace),
 				WithWebhookDefinitions(v1alpha1.WebhookDescription{}),
 			),
 		},
 	)
 
 	config := map[string]interface{}{
-		bundle.BundleConfigWatchNamespaceKey: "",
+		bundle.BundleConfigWatchNamespaceKey: "some-namespace",
 	}
 	_, err := converter.ToHelmChart(b, "install-namespace", config)
 	require.NoError(t, err)
 }
 
 func Test_BundleToHelmChartConverter_ToHelmChart_BundleRendererIntegration(t *testing.T) {
 	expectedInstallNamespace := "install-namespace"
-	expectedWatchNamespace := ""
+	expectedWatchNamespace := "some-namespaces"
 	expectedCertProvider := FakeCertProvider{}
 
 	converter := convert.BundleToHelmChartConverter{
@@ -156,7 +171,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_BundleRendererIntegration(t *te
 
 	b := source.FromBundle(
 		bundle.RegistryV1{
-			CSV: MakeCSV(WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces)),
+			CSV: MakeCSV(WithInstallModeSupportFor(v1alpha1.InstallModeTypeSingleNamespace)),
 		},
 	)
 
@@ -186,7 +201,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_Success(t *testing.T) {
 		bundle.RegistryV1{
 			CSV: MakeCSV(
 				WithAnnotations(map[string]string{"foo": "bar"}),
-				WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces),
+				WithInstallModeSupportFor(v1alpha1.InstallModeTypeAllNamespaces, v1alpha1.InstallModeTypeSingleNamespace),
 			),
 			Others: []unstructured.Unstructured{
 				*ToUnstructuredT(t, &corev1.Service{
@@ -203,7 +218,7 @@ func Test_BundleToHelmChartConverter_ToHelmChart_Success(t *testing.T) {
 	)
 
 	config := map[string]interface{}{
-		bundle.BundleConfigWatchNamespaceKey: "",
+		bundle.BundleConfigWatchNamespaceKey: "some-namespace",
 	}
 	chart, err := converter.ToHelmChart(b, "install-namespace", config)
 	require.NoError(t, err)