move image cleanup into pkg/util

Author: nkubala

cmd/analyze.go

@@ -69,7 +69,7 @@ func analyzeImage(imageArg string, analyzerArgs []string) error {
 	image, err := ip.GetImage()
 
 	if !save {
-		defer cleanupImage(image)
+		defer pkgutil.CleanupImage(image)
 	}
 	if err != nil {
 		glog.Error(err.Error())

cmd/diff.go

@@ -89,8 +89,8 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
 	wg.Wait()
 
 	if !save {
-		defer cleanupImage(*imageMap[image1Arg])
-		defer cleanupImage(*imageMap[image2Arg])
+		defer pkgutil.CleanupImage(*imageMap[image1Arg])
+		defer pkgutil.CleanupImage(*imageMap[image2Arg])
 	}
 
 	diffTypes, err := differs.GetAnalyzers(diffArgs)

cmd/root.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	goflag "flag"
 	"fmt"
-	"os"
 	"sort"
 	"strings"
 
@@ -84,16 +83,6 @@ func outputResults(resultMap map[string]util.Result) {
 	}
 }
 
-func cleanupImage(image pkgutil.Image) {
-	if image.FSPath != "" {
-		glog.Infof("Removing image filesystem directory %s from system", image.FSPath)
-		errMsg := remove(image.FSPath, true)
-		if errMsg != "" {
-			glog.Error(errMsg)
-		}
-	}
-}
-
 func validateArgs(args []string, validatefxns ...validatefxn) error {
 	for _, validatefxn := range validatefxns {
 		if err := validatefxn(args); err != nil {
@@ -133,24 +122,6 @@ func checkIfValidAnalyzer(flagtypes string) error {
 	return nil
 }
 
-func remove(path string, dir bool) string {
-	var errStr string
-	if path == "" {
-		return ""
-	}
-
-	var err error
-	if dir {
-		err = os.RemoveAll(path)
-	} else {
-		err = os.Remove(path)
-	}
-	if err != nil {
-		errStr = "\nUnable to remove " + path
-	}
-	return errStr
-}
-
 func init() {
 	pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
 }

pkg/util/image_prep_utils.go

@@ -287,3 +287,31 @@ func (p TarPrepper) getConfig() (ConfigSchema, error) {
 
 	return config, nil
 }
+
+func CleanupImage(image Image) {
+	if image.FSPath != "" {
+		glog.Infof("Removing image filesystem directory %s from system", image.FSPath)
+		errMsg := remove(image.FSPath, true)
+		if errMsg != "" {
+			glog.Error(errMsg)
+		}
+	}
+}
+
+func remove(path string, dir bool) string {
+	var errStr string
+	if path == "" {
+		return ""
+	}
+
+	var err error
+	if dir {
+		err = os.RemoveAll(path)
+	} else {
+		err = os.Remove(path)
+	}
+	if err != nil {
+		errStr = "\nUnable to remove " + path
+	}
+	return errStr
+}