Clean up prune package

- Rename PruneOptions to Pruner (it does the work itself)
- Rename variables and internal methods for clarity/consistency
- Extract deleteObject method to improve readability
- Rename GetObject to getObject (only used internally and by test)
- Modify log messages for readability
- Add log support for prune tests
- Make log messages more consistent

pkg/apply/applier.go

@@ -31,7 +31,7 @@ import (
 
 // NewApplier returns a new Applier.
 func NewApplier(factory cmdutil.Factory, invClient inventory.InventoryClient, statusPoller poller.Poller) (*Applier, error) {
-	pruneOpts, err := prune.NewPruneOptions(factory, invClient)
+	pruner, err := prune.NewPruner(factory, invClient)
 	if err != nil {
 		return nil, err
 	}
@@ -40,7 +40,7 @@ func NewApplier(factory cmdutil.Factory, invClient inventory.InventoryClient, st
 		return nil, err
 	}
 	return &Applier{
-		pruneOptions: pruneOpts,
+		pruner:       pruner,
 		statusPoller: statusPoller,
 		factory:      factory,
 		invClient:    invClient,
@@ -59,7 +59,7 @@ func NewApplier(factory cmdutil.Factory, invClient inventory.InventoryClient, st
 // parameters and/or the set of resources that needs to be applied to the
 // cluster, different sets of tasks might be needed.
 type Applier struct {
-	pruneOptions *prune.PruneOptions
+	pruner       *prune.Pruner
 	statusPoller poller.Poller
 	factory      cmdutil.Factory
 	invClient    inventory.InventoryClient
@@ -100,7 +100,7 @@ func (a *Applier) prepareObjects(localInv inventory.InventoryInfo, localObjs obj
 			}
 		}
 	}
-	pruneObjs, err := a.pruneOptions.GetPruneObjs(localInv, localObjs, prune.Options{
+	pruneObjs, err := a.pruner.GetPruneObjs(localInv, localObjs, prune.Options{
 		DryRunStrategy: o.DryRunStrategy,
 	})
 	if err != nil {
@@ -155,12 +155,12 @@ func (a *Applier) Run(ctx context.Context, invInfo inventory.InventoryInfo, obje
 		// Fetch the queue (channel) of tasks that should be executed.
 		klog.V(4).Infoln("applier building task queue...")
 		taskBuilder := &solver.TaskQueueBuilder{
-			PruneOptions: a.pruneOptions,
-			Factory:      a.factory,
-			InfoHelper:   a.infoHelper,
-			Mapper:       mapper,
-			InvClient:    a.invClient,
-			Destroy:      false,
+			Pruner:     a.pruner,
+			Factory:    a.factory,
+			InfoHelper: a.infoHelper,
+			Mapper:     mapper,
+			InvClient:  a.invClient,
+			Destroy:    false,
 		}
 		opts := solver.Options{
 			ServerSideOptions:      options.ServerSideOptions,

pkg/apply/destroyer.go

@@ -30,12 +30,12 @@ import (
 // handled by a separate printer with the KubectlPrinterAdapter bridging
 // between the two.
 func NewDestroyer(factory cmdutil.Factory, invClient inventory.InventoryClient, statusPoller poller.Poller) (*Destroyer, error) {
-	pruneOpts, err := prune.NewPruneOptions(factory, invClient)
+	pruner, err := prune.NewPruner(factory, invClient)
 	if err != nil {
 		return nil, fmt.Errorf("error setting up PruneOptions: %w", err)
 	}
 	return &Destroyer{
-		pruneOptions: pruneOpts,
+		pruner:       pruner,
 		statusPoller: statusPoller,
 		factory:      factory,
 		invClient:    invClient,
@@ -45,7 +45,7 @@ func NewDestroyer(factory cmdutil.Factory, invClient inventory.InventoryClient,
 // Destroyer performs the step of grabbing all the previous inventory objects and
 // prune them. This also deletes all the previous inventory objects
 type Destroyer struct {
-	pruneOptions *prune.PruneOptions
+	pruner       *prune.Pruner
 	statusPoller poller.Poller
 	factory      cmdutil.Factory
 	invClient    inventory.InventoryClient
@@ -97,7 +97,7 @@ func (d *Destroyer) Run(ctx context.Context, inv inventory.InventoryInfo, option
 		// Retrieve the objects to be deleted from the cluster. Second parameter is empty
 		// because no local objects returns all inventory objects for deletion.
 		emptyLocalObjs := object.UnstructuredSet{}
-		deleteObjs, err := d.pruneOptions.GetPruneObjs(inv, emptyLocalObjs, prune.Options{
+		deleteObjs, err := d.pruner.GetPruneObjs(inv, emptyLocalObjs, prune.Options{
 			DryRunStrategy: options.DryRunStrategy,
 		})
 		if err != nil {
@@ -111,11 +111,11 @@ func (d *Destroyer) Run(ctx context.Context, inv inventory.InventoryInfo, option
 		}
 		klog.V(4).Infoln("destroyer building task queue...")
 		taskBuilder := &solver.TaskQueueBuilder{
-			PruneOptions: d.pruneOptions,
-			Factory:      d.factory,
-			Mapper:       mapper,
-			InvClient:    d.invClient,
-			Destroy:      true,
+			Pruner:    d.pruner,
+			Factory:   d.factory,
+			Mapper:    mapper,
+			InvClient: d.invClient,
+			Destroy:   true,
 		}
 		opts := solver.Options{
 			Prune:                  true,

pkg/apply/prune/main_test.go

@@ -0,0 +1,19 @@
+// Copyright 2021 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package prune
+
+import (
+	"os"
+	"testing"
+
+	"k8s.io/klog/v2"
+)
+
+// TestMain executes the tests for this package, with optional logging.
+// To see all logs, use:
+// go test sigs.k8s.io/cli-utils/pkg/apply/prune -v -args -v=5
+func TestMain(m *testing.M) {
+	klog.InitFlags(nil)
+	os.Exit(m.Run())
+}