Fixes bug in destroy command

Author: seans3

pkg/apply/destroyer.go

@@ -84,6 +84,7 @@ func (d *Destroyer) Run() <-chan event.Event {
 
 	go func() {
 		defer close(ch)
+		d.invClient.SetDryRunStrategy(d.DryRunStrategy)
 		infos, err := d.ApplyOptions.GetObjects()
 		if err != nil {
 			ch <- event.Event{
@@ -94,12 +95,10 @@ func (d *Destroyer) Run() <-chan event.Event {
 			}
 			return
 		}
-		// Clear the data/inventory section of the inventory object configmap,
-		// so the prune will calculate the prune set as all the objects,
-		// deleting everything. We can ignore the error, since the Prune
-		// will catch the same problems.
-		invInfo, nonInvInfos, _ := inventory.SplitInfos(infos)
-		invInfo, err = d.invClient.ClearInventoryObj(invInfo)
+		// Force a pruning of all cluster resources by clearing out the
+		// local resources, and sending only the inventory object to the
+		// prune.
+		invInfo, _, err := inventory.SplitInfos(infos)
 		if err != nil {
 			ch <- event.Event{
 				Type: event.ErrorType,
@@ -109,7 +108,7 @@ func (d *Destroyer) Run() <-chan event.Event {
 			}
 			return
 		}
-		infos = append([]*resource.Info{invInfo}, nonInvInfos...)
+		infos = []*resource.Info{invInfo}
 
 		// Start the event transformer goroutine so we can transform
 		// the Prune events emitted from the Prune function to Delete
@@ -123,7 +122,6 @@ func (d *Destroyer) Run() <-chan event.Event {
 		// Now delete the inventory object as well.
 		inv := inventory.FindInventoryObj(infos)
 		if inv != nil {
-			d.invClient.SetDryRunStrategy(d.DryRunStrategy)
 			_ = d.invClient.DeleteInventoryObj(inv)
 		}
 

pkg/inventory/fake-inventory-client.go

@@ -63,11 +63,6 @@ func (fic *FakeInventoryClient) DeleteInventoryObj(inv *resource.Info) error {
 	return nil
 }
 
-// ClearInventoryObj implements InventoryClient interface function. It does nothing for now.
-func (fic *FakeInventoryClient) ClearInventoryObj(inv *resource.Info) (*resource.Info, error) {
-	return inv, nil
-}
-
 func (fic *FakeInventoryClient) SetDryRunStrategy(drs common.DryRunStrategy) {}
 
 func (fic *FakeInventoryClient) SetInventoryFactoryFunc(fn InventoryFactoryFunc) {}

pkg/inventory/inventory-client.go

@@ -34,9 +34,6 @@ type InventoryClient interface {
 	Replace(inv *resource.Info, objs []object.ObjMetadata) error
 	// DeleteInventoryObj deletes the passed inventory object from the APIServer.
 	DeleteInventoryObj(inv *resource.Info) error
-	// ClearInventoryObj clears all obj references from the passed inventory object,
-	// returning the cleared inventory object or an error.
-	ClearInventoryObj(inv *resource.Info) (*resource.Info, error)
 	// SetDryRunStrategy sets the dry run strategy on whether this we actually mutate.
 	SetDryRunStrategy(drs common.DryRunStrategy)
 	// Sets the function to create the Inventory object.
@@ -389,22 +386,6 @@ func (cic *ClusterInventoryClient) DeleteInventoryObj(info *resource.Info) error
 	return err
 }
 
-// ClearInventoryObj sets an empty inventory, which is used in destroy. Returns the
-// cleared inventory or an error if one occurred.
-func (cic *ClusterInventoryClient) ClearInventoryObj(invInfo *resource.Info) (*resource.Info, error) {
-	if invInfo == nil {
-		return nil, fmt.Errorf("clearing nil inventory object")
-	}
-	if !IsInventoryObject(invInfo) {
-		return nil, fmt.Errorf("attempting to clear non-inventory object")
-	}
-	wrapped := cic.InventoryFactoryFunc(invInfo)
-	if err := wrapped.Store([]object.ObjMetadata{}); err != nil {
-		return nil, err
-	}
-	return wrapped.GetObject()
-}
-
 // SetDryRun sets whether the inventory client will mutate the inventory
 // object in the cluster.
 func (cic *ClusterInventoryClient) SetDryRunStrategy(drs common.DryRunStrategy) {

pkg/inventory/inventory-client_test.go

@@ -472,64 +472,6 @@ func TestDeleteInventoryObj(t *testing.T) {
 	}
 }
 
-func TestClearInventoryObject(t *testing.T) {
-	pod1 := ignoreErrInfoToObjMeta(pod1Info)
-	pod3 := ignoreErrInfoToObjMeta(pod3Info)
-	inv := storeObjsInInventory(invInfo, []object.ObjMetadata{pod1, pod3})
-	tests := map[string]struct {
-		invInfo *resource.Info
-		isError bool
-	}{
-		"Nil info should error": {
-			invInfo: nil,
-			isError: true,
-		},
-		"Info with nil Object should error": {
-			invInfo: nilInfo,
-			isError: true,
-		},
-		"Single non-inventory object should error": {
-			invInfo: pod1Info,
-			isError: true,
-		},
-		"Single inventory object without data should stay cleared": {
-			invInfo: invInfo,
-			isError: false,
-		},
-		"Single inventory object with data should be cleared": {
-			invInfo: inv,
-			isError: false,
-		},
-	}
-	tf := cmdtesting.NewTestFactory().WithNamespace(testNamespace)
-	defer tf.Cleanup()
-
-	for name, tc := range tests {
-		t.Run(name, func(t *testing.T) {
-			invClient, _ := NewInventoryClient(tf)
-			invInfo, err := invClient.ClearInventoryObj(tc.invInfo)
-			if tc.isError {
-				if err == nil {
-					t.Errorf("Should have produced an error, but returned none.")
-				}
-			}
-			if !tc.isError {
-				if err != nil {
-					t.Fatalf("Received unexpected error: %s", err)
-				}
-				wrapped := WrapInventoryObj(invInfo)
-				objs, err := wrapped.Load()
-				if err != nil {
-					t.Fatalf("Received unexpected error: %s", err)
-				}
-				if len(objs) > 0 {
-					t.Errorf("Inventory object inventory not cleared: %#v\n", objs)
-				}
-			}
-		})
-	}
-}
-
 type invAndObjs struct {
 	inv     *resource.Info
 	invObjs []object.ObjMetadata