Test

Author: thetechnick

internal/operator-controller/applier/boxcutter.go

@@ -10,7 +10,6 @@ import (
 	"hash"
 	"io/fs"
 	"maps"
-	"regexp"
 	"slices"
 	"strings"
 
@@ -55,7 +54,7 @@ func (r *SimpleRevisionGenerator) GenerateRevisionFromHelmRelease(
 	helmRelease *release.Release, ext *ocv1.ClusterExtension,
 	objectLabels map[string]string,
 ) (*ocv1.ClusterExtensionRevision, error) {
-	docs := splitYAMLDocuments(helmRelease.Manifest)
+	docs := splitManifestDocuments(helmRelease.Manifest)
 	objs := make([]ocv1.ClusterExtensionRevisionObject, 0, len(docs))
 	for _, doc := range docs {
 		obj := unstructured.Unstructured{}
@@ -171,16 +170,6 @@ func (m *BoxcutterStorageMigrator) Migrate(ctx context.Context, ext *ocv1.Cluste
 		return err
 	}
 
-	docs := splitYAMLDocuments(helmRelease.Manifest)
-	objs := make([]unstructured.Unstructured, 0, len(docs))
-	for _, doc := range docs {
-		obj := unstructured.Unstructured{}
-		if err := yaml.Unmarshal([]byte(doc), &obj); err != nil {
-			return err
-		}
-		objs = append(objs, obj)
-	}
-
 	rev, err := m.RevisionGenerator.GenerateRevisionFromHelmRelease(helmRelease, ext, objectLabels)
 	if err != nil {
 		return err
@@ -388,12 +377,13 @@ func (r *RegistryV1BundleRenderer) Render(bundleFS fs.FS, ext *ocv1.ClusterExten
 	return r.BundleRenderer.Render(reg, ext.Spec.Namespace, render.WithTargetNamespaces(watchNamespace), render.WithCertificateProvider(r.CertificateProvider))
 }
 
-var splitYAMLDocumentsRegEx = regexp.MustCompile(`(?m)^---$`)
-
-// Splits a YAML file into multiple documents.
-func splitYAMLDocuments(file string) (docs []string) {
-	for _, yamlDocument := range splitYAMLDocumentsRegEx.Split(string(strings.Trim(file, "---\n")), -1) {
-		docs = append(docs, strings.TrimSpace(string(yamlDocument)))
+func splitManifestDocuments(file string) (docs []string) {
+	for _, yamlDocument := range strings.Split(file, "\n") {
+		yamlDocument = strings.TrimSpace(string(yamlDocument))
+		if len(yamlDocument) == 0 {
+			continue
+		}
+		docs = append(docs, yamlDocument)
 	}
 	return docs
 }