Improve .spec.config unmarshallig

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

Author: Per Goncalves da Silva

internal/operator-controller/applier/provider.go

@@ -3,13 +3,16 @@ package applier
 import (
 	"crypto/sha256"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/fs"
+	"strings"
 
 	"helm.sh/helm/v3/pkg/chart"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/yaml"
 
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 
@@ -32,6 +35,9 @@ type RegistryV1ManifestProvider struct {
 	IsWebhookSupportEnabled     bool
 	IsSingleOwnNamespaceEnabled bool
 }
+type registryV1Config struct {
+	WatchNamespace string `json:"watchNamespace"`
+}
 
 func (r *RegistryV1ManifestProvider) Get(bundleFS fs.FS, ext *ocv1.ClusterExtension) ([]client.Object, error) {
 	rv1, err := source.FromFS(bundleFS).GetBundle()
@@ -70,7 +76,7 @@ func (r *RegistryV1ManifestProvider) Get(bundleFS fs.FS, ext *ocv1.ClusterExtens
 
 	watchNamespace, err := r.getWatchNamespace(ext)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("invalid bundle configuration: %w", err)
 	}
 
 	if watchNamespace != "" {
@@ -89,11 +95,12 @@ func (r *RegistryV1ManifestProvider) getWatchNamespace(ext *ocv1.ClusterExtensio
 
 	var watchNamespace string
 	if ext.Spec.Config != nil && ext.Spec.Config.Inline != nil {
-		cfg := struct {
-			WatchNamespace string `json:"watchNamespace"`
-		}{}
-		if err := json.Unmarshal(ext.Spec.Config.Inline.Raw, &cfg); err != nil {
-			return "", fmt.Errorf("invalid bundle configuration: %w", err)
+		cfg := &registryV1Config{}
+		// Using k8s.io/yaml package as that is able to handle both json and yaml
+		// In most cases, at this point we should have a valid JSON/YAML object in the byte slice and failures will
+		// be related to object structure (e.g. additional fields).
+		if err := yaml.UnmarshalStrict(ext.Spec.Config.Inline.Raw, cfg); err != nil {
+			return "", fmt.Errorf("error unmarshalling registry+v1 configuration: %w", formatUnmarshallError(err))
 		}
 		watchNamespace = cfg.WatchNamespace
 	} else {
@@ -153,3 +160,27 @@ func (r *RegistryV1HelmChartProvider) Get(bundleFS fs.FS, ext *ocv1.ClusterExten
 
 	return chrt, nil
 }
+
+func formatUnmarshallError(err error) error {
+	var unmarshalErr *json.UnmarshalTypeError
+	if errors.As(err, &unmarshalErr) {
+		if unmarshalErr.Field == "" {
+			return errors.New("input is not a valid JSON object")
+		} else {
+			return fmt.Errorf("invalid value type for field %q: expected %q but got %q", unmarshalErr.Field, unmarshalErr.Type.String(), unmarshalErr.Value)
+		}
+	}
+
+	// unwrap error until the core and process it
+	for {
+		unwrapped := errors.Unwrap(err)
+		if unwrapped == nil {
+			// usually the errors present in the form json: <message> or yaml: <message>
+			// we want to extract <message> if we can
+			errMessageComponents := strings.Split(err.Error(), ":")
+			coreErrMessage := strings.TrimSpace(errMessageComponents[len(errMessageComponents)-1])
+			return errors.New(coreErrMessage)
+		}
+		err = unwrapped
+	}
+}

internal/operator-controller/applier/provider_test.go

@@ -188,6 +188,77 @@ func Test_RegistryV1ManifestProvider_WebhookSupport(t *testing.T) {
 	})
 }
 
+func Test_RegistryV1ManifestProvider_ConfigUnmarshalling(t *testing.T) {
+	for _, tc := range []struct {
+		name               string
+		configBytes        []byte
+		expectedErrMessage string
+	}{
+		{
+			name:        "accepts json config",
+			configBytes: []byte(`{"watchNamespace": "some-namespace"}`),
+		},
+		{
+			name:        "accepts yaml config",
+			configBytes: []byte(`watchNamespace: some-namespace`),
+		},
+		{
+			name:               "rejects invalid json",
+			configBytes:        []byte(`{"hello`),
+			expectedErrMessage: `invalid bundle configuration: error unmarshalling registry+v1 configuration: found unexpected end of stream`,
+		},
+		{
+			name:               "rejects valid json that isn't of object type",
+			configBytes:        []byte(`true`),
+			expectedErrMessage: `invalid bundle configuration: error unmarshalling registry+v1 configuration: input is not a valid JSON object`,
+		},
+		{
+			name:               "rejects additional fields",
+			configBytes:        []byte(`somekey: somevalue`),
+			expectedErrMessage: `invalid bundle configuration: error unmarshalling registry+v1 configuration: unknown field "somekey"`,
+		},
+		{
+			name:               "rejects valid json but invalid registry+v1",
+			configBytes:        []byte(`{"watchNamespace": {"hello": "there"}}`),
+			expectedErrMessage: `invalid bundle configuration: error unmarshalling registry+v1 configuration: invalid value type for field "watchNamespace": expected "string" but got "object"`,
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			provider := applier.RegistryV1ManifestProvider{
+				BundleRenderer: render.BundleRenderer{
+					ResourceGenerators: []render.ResourceGenerator{
+						func(rv1 *bundle.RegistryV1, opts render.Options) ([]client.Object, error) {
+							return nil, nil
+						},
+					},
+				},
+				IsSingleOwnNamespaceEnabled: true,
+			}
+
+			bundleFS := bundlefs.Builder().WithPackageName("test").
+				WithCSV(clusterserviceversion.Builder().WithInstallModeSupportFor(v1alpha1.InstallModeTypeSingleNamespace).Build()).Build()
+
+			_, err := provider.Get(bundleFS, &ocv1.ClusterExtension{
+				Spec: ocv1.ClusterExtensionSpec{
+					Namespace: "install-namespace",
+					Config: &ocv1.ClusterExtensionConfig{
+						ConfigType: ocv1.ClusterExtensionConfigTypeInline,
+						Inline: &apiextensionsv1.JSON{
+							Raw: tc.configBytes,
+						},
+					},
+				},
+			})
+			if tc.expectedErrMessage != "" {
+				require.Error(t, err)
+				require.Contains(t, err.Error(), tc.expectedErrMessage)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
 func Test_RegistryV1ManifestProvider_SingleOwnNamespaceSupport(t *testing.T) {
 	t.Run("rejects bundles without AllNamespaces install mode when Single/OwnNamespace install mode support is disabled", func(t *testing.T) {
 		provider := applier.RegistryV1ManifestProvider{