Merge pull request #271 from seans3/destroy-preview-init

Moves destroyer Initialize() to immediately before Run()

Author: k8s-ci-robot

cmd/destroy/cmddestroy.go

@@ -55,11 +55,6 @@ type DestroyRunner struct {
 }
 
 func (r *DestroyRunner) RunE(cmd *cobra.Command, args []string) error {
-	err := r.Destroyer.Initialize()
-	if err != nil {
-		return err
-	}
-
 	// Retrieve the inventory object.
 	reader, err := r.provider.ManifestReader(cmd.InOrStdin(), args)
 	if err != nil {
@@ -76,6 +71,10 @@ func (r *DestroyRunner) RunE(cmd *cobra.Command, args []string) error {
 
 	// Run the destroyer. It will return a channel where we can receive updates
 	// to keep track of progress and any issues.
+	err = r.Destroyer.Initialize()
+	if err != nil {
+		return err
+	}
 	ch := r.Destroyer.Run(inv)
 
 	// The printer will print updates from the channel. It will block

cmd/preview/cmdpreview.go

@@ -82,10 +82,6 @@ func (r *PreviewRunner) RunE(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	var ch <-chan event.Event
-	err = r.Destroyer.Initialize()
-	if err != nil {
-		return err
-	}
 
 	drs := common.DryRunClient
 	if r.serverSideOptions.ServerSideApply {
@@ -134,6 +130,10 @@ func (r *PreviewRunner) RunE(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
+		err = r.Destroyer.Initialize()
+		if err != nil {
+			return err
+		}
 		ch = r.Destroyer.Run(inv)
 	}