Merge pull request openshift#8720 from r4f4/del-capi-artifacts

CORS-2775: cmd: destroy: remove deprecated github.com/pkg/errors

Author: openshift-merge-bot[bot]

cmd/openshift-install/destroy.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
@@ -65,54 +65,52 @@ func runDestroyCmd(directory string, reportQuota bool) error {
 	timer.StartTimer(timer.TotalTimeElapsed)
 	destroyer, err := destroy.New(logrus.StandardLogger(), directory)
 	if err != nil {
-		return errors.Wrap(err, "Failed while preparing to destroy cluster")
+		return fmt.Errorf("failed while preparing to destroy cluster: %w", err)
 	}
 	quota, err := destroyer.Run()
 	if err != nil {
-		return errors.Wrap(err, "Failed to destroy cluster")
+		return fmt.Errorf("failed to destroy cluster: %w", err)
 	}
 
 	if reportQuota {
 		if err := quotaasset.WriteQuota(directory, quota); err != nil {
-			return errors.Wrap(err, "failed to record quota")
+			return fmt.Errorf("failed to record quota: %w", err)
 		}
 	}
 
 	store, err := assetstore.NewStore(directory)
 	if err != nil {
-		return errors.Wrap(err, "failed to create asset store")
+		return fmt.Errorf("failed to create asset store: %w", err)
 	}
 	for _, asset := range clusterTarget.assets {
 		if err := store.Destroy(asset); err != nil {
-			return errors.Wrapf(err, "failed to destroy asset %q", asset.Name())
+			return fmt.Errorf("failed to destroy asset %q: %w", asset.Name(), err)
 		}
 	}
 
 	// delete the state file as well
 	err = store.DestroyState()
 	if err != nil {
-		return errors.Wrap(err, "failed to remove state file")
+		return fmt.Errorf("failed to remove state file: %w", err)
 	}
 
 	// delete terraform files
 	tfstateFiles, err := filepath.Glob(filepath.Join(directory, "*.tfstate"))
 	if err != nil {
-		return errors.Wrap(err, "failed to glob for tfstate files")
+		return fmt.Errorf("failed to glob for tfstate files: %w", err)
 	}
 	tfvarsFiles, err := filepath.Glob(filepath.Join(directory, "*.tfvars.json"))
 	if err != nil {
-		return errors.Wrap(err, "failed to glob for tfvars files")
+		return fmt.Errorf("failed to glob for tfvars files: %w", err)
 	}
 	for _, f := range append(tfstateFiles, tfvarsFiles...) {
 		if err := os.Remove(f); err != nil {
-			return errors.Wrapf(err, "failed to remove terraform file %q", f)
+			return fmt.Errorf("failed to remove terraform file %q: %w", f, err)
 		}
 	}
 
-	// ensure capi etcd data store is cleaned up
-	clusterapi.System().CleanEtcd()
-
-	capiArtifactsDir := filepath.Join(command.RootOpts.Dir, clusterapi.ArtifactsDir)
+	// ensure capi etcd data store and capi artifacts are cleaned up
+	capiArtifactsDir := filepath.Join(directory, clusterapi.ArtifactsDir)
 	if err := os.RemoveAll(capiArtifactsDir); err != nil {
 		logrus.Warnf("failed to remove %s: %v", capiArtifactsDir, err)
 	}