Corrects nits in parseListKind

Author: somtochiama

pkg/patterns/declarative/reconciler.go

@@ -19,10 +19,11 @@ package declarative
 import (
 	"context"
 	"fmt"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"path/filepath"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -131,9 +132,9 @@ func (r *Reconciler) reconcileExists(ctx context.Context, name types.NamespacedN
 		}
 	}()
 
-	err = parseListKind(objects)
+	objects, err = parseListKind(objects)
 
-	if err != nil{
+	if err != nil {
 		log.Error(err, "Parsing list kind")
 		return reconcile.Result{}, fmt.Errorf("error parsing list kind: %v", err)
 	}
@@ -412,29 +413,36 @@ func (r *Reconciler) SetSink(sink Sink) {
 	r.options.sink = sink
 }
 
-func parseListKind(infos *manifest.Objects) error{
-		for i, item := range infos.Items{
-			if item.Kind == "List" {
-				fmt.Println("haaa!")
-				obj := item.UnstructuredObject()
-
-				err := obj.EachListItem(func(obj runtime.Object) error{
-					castItem := obj.(*unstructured.Unstructured)
-					newObj, err := manifest.NewObject(castItem)
-					if err != nil {
-						return err
-					}
-					infos.Items = append(infos.Items, newObj)
-					return nil
-				})
+func parseListKind(infos *manifest.Objects) (*manifest.Objects, error) {
+	var out []*manifest.Object
+
+	for _, item := range infos.Items {
+		if item.Group == "v1" && item.Kind == "List" {
+			itemObj := item.UnstructuredObject()
 
+			err := itemObj.EachListItem(func(obj runtime.Object) error {
+				itemUnstructured := obj.(*unstructured.Unstructured)
+				newObj, err := manifest.NewObject(itemUnstructured)
 				if err != nil {
 					return err
 				}
+				out = append(out, newObj)
+				return nil
+			})
 
-				infos.Items = append(infos.Items[:i], infos.Items[i+1:]...)
+			if err != nil {
+				return nil, err
 			}
+		} else {
+			out = append(out, item)
 		}
+	}
 
-	return nil
+	ret := manifest.Objects{
+		Items: out,
+		Blobs: infos.Blobs,
+		Path:  infos.Path,
+	}
+
+	return &ret, nil
 }