Refactor ApplyFromCache to avoid duplicate loops

Signed-off-by: alexander-demicev <alexandr.demicev@suse.com>

Author: alexander-demicev

internal/controller/genericprovider_controller.go

@@ -485,8 +485,6 @@ func (p *PhaseReconciler) ApplyFromCache(ctx context.Context) (*Result, error) {
 
 	log.Info("Applying provider configuration from cache")
 
-	errs := []error{}
-
 	mr := configclient.NewMemoryReader()
 
 	if err := mr.Init(ctx, ""); err != nil {
@@ -498,64 +496,56 @@ func (p *PhaseReconciler) ApplyFromCache(ctx context.Context) (*Result, error) {
 		return &Result{}, err
 	}
 
-	for _, manifest := range secret.Data {
-		if secret.GetAnnotations()[operatorv1.CompressedAnnotation] == operatorv1.TrueValue {
-			break
-		}
+	compressed := secret.GetAnnotations()[operatorv1.CompressedAnnotation] == operatorv1.TrueValue
 
-		manifests := []unstructured.Unstructured{}
+	if err := p.applyManifestsFromData(ctx, secret.Data, compressed); err != nil {
+		log.Error(err, "failed to apply objects from cache")
 
-		err := json.Unmarshal(manifest, &manifests)
-		if err != nil {
-			log.Error(err, "failed to convert yaml to unstructured")
+		return &Result{}, err
+	}
 
-			return &Result{}, err
-		}
+	log.Info("Applied all objects from cache")
 
-		for _, manifest := range manifests {
-			if err := p.ctrlClient.Patch(ctx, &manifest, client.Apply, client.ForceOwnership, client.FieldOwner(cacheOwner)); err != nil {
-				errs = append(errs, err)
-			}
-		}
-	}
+	return &Result{Completed: true}, nil
+}
 
-	for _, binaryManifest := range secret.Data {
-		if secret.GetAnnotations()[operatorv1.CompressedAnnotation] != operatorv1.TrueValue {
-			break
-		}
+// applyManifestsFromData unmarshals and applies manifests via server-side apply.
+// If compressed is true, each data value is decompressed before processing.
+func (p *PhaseReconciler) applyManifestsFromData(ctx context.Context, data map[string][]byte, compressed bool) error {
+	log := log.FromContext(ctx)
 
-		manifest, err := decompressData(binaryManifest)
-		if err != nil {
-			log.Error(err, "failed to decompress yaml")
+	var errs []error
+
+	for _, raw := range data {
+		manifest := raw
+
+		if compressed {
+			var err error
 
-			return &Result{}, err
+			manifest, err = decompressData(raw)
+			if err != nil {
+				log.Error(err, "failed to decompress yaml")
+
+				return err
+			}
 		}
 
-		manifests := []unstructured.Unstructured{}
+		var manifests []unstructured.Unstructured
 
-		err = json.Unmarshal(manifest, &manifests)
-		if err != nil {
+		if err := json.Unmarshal(manifest, &manifests); err != nil {
 			log.Error(err, "failed to convert yaml to unstructured")
 
-			return &Result{}, err
+			return err
 		}
 
-		for _, manifest := range manifests {
-			if err := p.ctrlClient.Patch(ctx, &manifest, client.Apply, client.ForceOwnership, client.FieldOwner(cacheOwner)); err != nil {
+		for i := range manifests {
+			if err := p.ctrlClient.Patch(ctx, &manifests[i], client.Apply, client.ForceOwnership, client.FieldOwner(cacheOwner)); err != nil {
 				errs = append(errs, err)
 			}
 		}
 	}
 
-	if err := kerrors.NewAggregate(errs); err != nil {
-		log.Error(err, "failed to apply objects from cache")
-
-		return &Result{}, err
-	}
-
-	log.Info("Applied all objects from cache")
-
-	return &Result{Completed: true}, nil
+	return kerrors.NewAggregate(errs)
 }
 
 // setCacheHash calculates current provider and secret hash, and updates it on the secret.