Merge pull request #260 from mortent/RemoveInfoFromInventoryPackage

Remove resource.Info from inventory package

Author: k8s-ci-robot

cmd/destroy/cmddestroy.go

@@ -62,14 +62,14 @@ func (r *DestroyRunner) RunE(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	inv, _, err := inventory.SplitInfos(infos)
+	inv, _, err := inventory.SplitUnstructureds(object.InfosToUnstructureds(infos))
 	if err != nil {
 		return err
 	}
 
 	// Run the destroyer. It will return a channel where we can receive updates
 	// to keep track of progress and any issues.
-	ch := r.Destroyer.Run(object.InfoToUnstructured(inv))
+	ch := r.Destroyer.Run(inv)
 
 	// The printer will print updates from the channel. It will block
 	// until the channel is closed.

cmd/preview/cmdpreview.go

@@ -119,11 +119,11 @@ func (r *PreviewRunner) RunE(cmd *cobra.Command, args []string) error {
 			DryRunStrategy:   drs,
 		})
 	} else {
-		inv, _, err := inventory.SplitInfos(infos)
+		inv, _, err := inventory.SplitUnstructureds(object.InfosToUnstructureds(infos))
 		if err != nil {
 			return err
 		}
-		ch = r.Destroyer.Run(object.InfoToUnstructured(inv))
+		ch = r.Destroyer.Run(inv)
 	}
 
 	// The printer will print updates from the channel. It will block

cmd/status/cmdstatus.go

@@ -21,6 +21,7 @@ import (
 	"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
 	"sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
 	"sigs.k8s.io/cli-utils/pkg/kstatus/status"
+	"sigs.k8s.io/cli-utils/pkg/object"
 	"sigs.k8s.io/cli-utils/pkg/provider"
 	"sigs.k8s.io/cli-utils/pkg/util/factory"
 )
@@ -84,7 +85,7 @@ func (r *StatusRunner) runE(cmd *cobra.Command, args []string) error {
 	}
 
 	// Find the inventory template among the manifests.
-	inv, _, err := inventory.SplitInfos(infos)
+	inv, _, err := inventory.SplitUnstructureds(object.InfosToUnstructureds(infos))
 	if err != nil {
 		return err
 	}

pkg/apply/applier.go

@@ -95,8 +95,7 @@ func (a *Applier) prepareObjects(objs []*unstructured.Unstructured) (*ResourceOb
 
 	// Ensures the namespace exists before applying the inventory object into it.
 	if invNamespace := inventoryNamespaceInSet(localInv, localObjs); invNamespace != nil {
-		if err = a.invClient.ApplyInventoryNamespace(
-			object.UnstructuredToInfo(invNamespace)); err != nil {
+		if err = a.invClient.ApplyInventoryNamespace(invNamespace); err != nil {
 			return nil, err
 		}
 	}
@@ -105,7 +104,7 @@ func (a *Applier) prepareObjects(objs []*unstructured.Unstructured) (*ResourceOb
 	// returns the objects (pruneIds) to prune after apply. The prune
 	// algorithm requires stopping if the merge is not successful. Otherwise,
 	// the stored objects in inventory could become inconsistent.
-	pruneIds, err := a.invClient.Merge(object.UnstructuredToInfo(localInv), currentObjs)
+	pruneIds, err := a.invClient.Merge(localInv, currentObjs)
 	if err != nil {
 		return nil, err
 	}

pkg/apply/destroyer.go

@@ -14,7 +14,6 @@ import (
 	"sigs.k8s.io/cli-utils/pkg/apply/prune"
 	"sigs.k8s.io/cli-utils/pkg/common"
 	"sigs.k8s.io/cli-utils/pkg/inventory"
-	"sigs.k8s.io/cli-utils/pkg/object"
 	"sigs.k8s.io/cli-utils/pkg/provider"
 )
 
@@ -92,7 +91,7 @@ func (d *Destroyer) Run(inv *unstructured.Unstructured) <-chan event.Event {
 		}
 
 		// Now delete the inventory object as well.
-		err = d.invClient.DeleteInventoryObj(object.UnstructuredToInfo(inv))
+		err = d.invClient.DeleteInventoryObj(inv)
 		if err != nil {
 			ch <- event.Event{
 				Type: event.ErrorType,

pkg/apply/prune/prune.go

@@ -88,7 +88,7 @@ func (po *PruneOptions) Prune(localObjs []*unstructured.Unstructured, currentUID
 	}
 	invNamespace := localInv.GetNamespace()
 	klog.V(4).Infof("prune local inventory object: %s/%s", invNamespace, localInv.GetName())
-	clusterObjs, err := po.InvClient.GetClusterObjs(object.UnstructuredToInfo(localInv))
+	clusterObjs, err := po.InvClient.GetClusterObjs(localInv)
 	if err != nil {
 		return err
 	}
@@ -149,7 +149,7 @@ func (po *PruneOptions) Prune(localObjs []*unstructured.Unstructured, currentUID
 		eventChannel <- createPruneEvent(obj, event.Pruned)
 	}
 	localIds := object.UnstructuredsToObjMetas(localObjs)
-	return po.InvClient.Replace(object.UnstructuredToInfo(localInv), localIds)
+	return po.InvClient.Replace(localInv, localIds)
 }
 
 // preventDeleteAnnotation returns true if the "onRemove:keep"

pkg/apply/prune/prune_test.go

@@ -10,7 +10,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta/testrestmapper"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/dynamic/fake"
 	"k8s.io/kubectl/pkg/scheme"
 	"sigs.k8s.io/cli-utils/pkg/apply/event"
@@ -79,24 +78,15 @@ var role = &unstructured.Unstructured{
 
 // Returns a inventory object with the inventory set from
 // the passed "children".
-func createInventoryInfo(name string, children ...*unstructured.Unstructured) *unstructured.Unstructured {
-	inventoryName := inventoryObjName
-	if len(name) > 0 {
-		inventoryName = name
-	}
+func createInventoryInfo(children ...*unstructured.Unstructured) *unstructured.Unstructured {
 	inventoryObjCopy := inventoryObj.DeepCopy()
-	var inventoryInfo = &resource.Info{
-		Namespace: testNamespace,
-		Name:      inventoryName,
-		Object:    inventoryObjCopy,
-	}
-	wrappedInv := inventory.WrapInventoryObj(inventoryInfo)
+	wrappedInv := inventory.WrapInventoryObj(inventoryObjCopy)
 	objs := object.UnstructuredsToObjMetas(children)
 	if err := wrappedInv.Store(objs); err != nil {
 		return nil
 	}
-	inventoryInfo, _ = wrappedInv.GetObject()
-	return object.InfoToUnstructured(inventoryInfo)
+	inventoryInfo, _ := wrappedInv.GetObject()
+	return inventoryInfo
 }
 
 // preventDelete object contains the "on-remove:keep" lifecycle directive.
@@ -170,7 +160,7 @@ func TestPrune(t *testing.T) {
 				clusterObjs := object.UnstructuredsToObjMetas(tc.pastObjs)
 				po.InvClient = inventory.NewFakeInventoryClient(clusterObjs)
 				// Set up the currently applied objects.
-				currentInventory := createInventoryInfo("current-group", tc.currentObjs...)
+				currentInventory := createInventoryInfo(tc.currentObjs...)
 				currentObjs := append(tc.currentObjs, currentInventory)
 				// Set up the fake dynamic client to recognize all objects, and the RESTMapper.
 				po.client = fake.NewSimpleDynamicClient(scheme.Scheme,

pkg/inventory/fake-inventory-client.go

@@ -4,7 +4,7 @@
 package inventory
 
 import (
-	"k8s.io/cli-runtime/pkg/resource"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/cli-utils/pkg/common"
 	"sigs.k8s.io/cli-utils/pkg/object"
 )
@@ -26,7 +26,7 @@ func NewFakeInventoryClient(initObjs []object.ObjMetadata) *FakeInventoryClient
 }
 
 // GetClusterObjs returns currently stored set of objects.
-func (fic *FakeInventoryClient) GetClusterObjs(inv *resource.Info) ([]object.ObjMetadata, error) {
+func (fic *FakeInventoryClient) GetClusterObjs(inv *unstructured.Unstructured) ([]object.ObjMetadata, error) {
 	if fic.Err != nil {
 		return []object.ObjMetadata{}, fic.Err
 	}
@@ -36,7 +36,7 @@ func (fic *FakeInventoryClient) GetClusterObjs(inv *resource.Info) ([]object.Obj
 // Merge stores the passed objects with the current stored cluster inventory
 // objects. Returns the set difference of the current set of objects minus
 // the passed set of objects, or an error if one is set up.
-func (fic *FakeInventoryClient) Merge(inv *resource.Info, objs []object.ObjMetadata) ([]object.ObjMetadata, error) {
+func (fic *FakeInventoryClient) Merge(inv *unstructured.Unstructured, objs []object.ObjMetadata) ([]object.ObjMetadata, error) {
 	if fic.Err != nil {
 		return []object.ObjMetadata{}, fic.Err
 	}
@@ -47,7 +47,7 @@ func (fic *FakeInventoryClient) Merge(inv *resource.Info, objs []object.ObjMetad
 
 // Replace the stored cluster inventory objs with the passed obj, or an
 // error if one is set up.
-func (fic *FakeInventoryClient) Replace(inv *resource.Info, objs []object.ObjMetadata) error {
+func (fic *FakeInventoryClient) Replace(inv *unstructured.Unstructured, objs []object.ObjMetadata) error {
 	if fic.Err != nil {
 		return fic.Err
 	}
@@ -56,7 +56,7 @@ func (fic *FakeInventoryClient) Replace(inv *resource.Info, objs []object.ObjMet
 }
 
 // DeleteInventoryObj returns an error if one is forced; does nothing otherwise.
-func (fic *FakeInventoryClient) DeleteInventoryObj(inv *resource.Info) error {
+func (fic *FakeInventoryClient) DeleteInventoryObj(inv *unstructured.Unstructured) error {
 	if fic.Err != nil {
 		return fic.Err
 	}
@@ -65,7 +65,7 @@ func (fic *FakeInventoryClient) DeleteInventoryObj(inv *resource.Info) error {
 
 func (fic *FakeInventoryClient) SetDryRunStrategy(drs common.DryRunStrategy) {}
 
-func (fic *FakeInventoryClient) ApplyInventoryNamespace(info *resource.Info) error {
+func (fic *FakeInventoryClient) ApplyInventoryNamespace(inv *unstructured.Unstructured) error {
 	if fic.Err != nil {
 		return fic.Err
 	}