Merge pull request #69 from aaron-prindle/dedup-analyzeimage-diffimage

Removed some duplicated code in analyzeimages and diffimages

Author: dlorenc

cmd/analyze.go

@@ -75,36 +75,36 @@ func analyzeImage(imageArg string, analyzerArgs []string) error {
 		Source: imageArg,
 		Client: cli,
 	}
-
 	image, err := ip.GetImage()
+
+	if !save {
+		defer cleanupImage(image)
+	}
 	if err != nil {
 		glog.Error(err.Error())
-		cleanupImage(image)
 		return errors.New("Could not perform image analysis")
 	}
 	analyzeTypes, err := differs.GetAnalyzers(analyzerArgs)
 	if err != nil {
 		glog.Error(err.Error())
-		cleanupImage(image)
 		return errors.New("Could not perform image analysis")
 	}
 
 	req := differs.SingleRequest{image, analyzeTypes}
-	if analyses, err := req.GetAnalysis(); err == nil {
-		glog.Info("Retrieving analyses")
-		outputResults(analyses)
-		if !save {
-			cleanupImage(image)
-		} else {
-			dir, _ := os.Getwd()
-			glog.Infof("Image was saved at %s as %s", dir, image.FSPath)
-		}
-	} else {
+	analyses, err := req.GetAnalysis()
+	if err != nil {
 		glog.Error(err.Error())
-		cleanupImage(image)
 		return errors.New("Could not perform image analysis")
 	}
 
+	glog.Info("Retrieving analyses")
+	outputResults(analyses)
+
+	if save {
+		dir, _ := os.Getwd()
+		glog.Infof("Image was saved at %s as %s", dir, image.FSPath)
+	}
+
 	return nil
 }
 

cmd/diff.go

@@ -77,64 +77,52 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
 
 	glog.Infof("Starting diff on images %s and %s, using differs: %s", image1Arg, image2Arg, diffArgs)
 
-	var image1, image2 utils.Image
-	go func() {
-		defer wg.Done()
-		ip := utils.ImagePrepper{
-			Source: image1Arg,
-			Client: cli,
-		}
-		image1, err = ip.GetImage()
-		if err != nil {
-			glog.Error(err.Error())
-		}
-	}()
-
-	go func() {
-		defer wg.Done()
-		ip := utils.ImagePrepper{
-			Source: image2Arg,
-			Client: cli,
-		}
-		image2, err = ip.GetImage()
-		if err != nil {
-			glog.Error(err.Error())
-		}
-	}()
+	imageMap := map[string]*utils.Image{
+		image1Arg: {},
+		image2Arg: {},
+	}
+	for imageArg := range imageMap {
+		go func(imageName string, imageMap map[string]*utils.Image) {
+			defer wg.Done()
+			ip := utils.ImagePrepper{
+				Source: imageName,
+				Client: cli,
+			}
+			image, err := ip.GetImage()
+			imageMap[imageName] = &image
+			if err != nil {
+				glog.Error(err.Error())
+			}
+		}(imageArg, imageMap)
+	}
 	wg.Wait()
-	if err != nil {
-		cleanupImage(image1)
-		cleanupImage(image2)
-		return errors.New("Could not perform image diff")
+
+	if !save {
+		defer cleanupImage(*imageMap[image1Arg])
+		defer cleanupImage(*imageMap[image2Arg])
 	}
 
 	diffTypes, err := differs.GetAnalyzers(diffArgs)
 	if err != nil {
 		glog.Error(err.Error())
-		cleanupImage(image1)
-		cleanupImage(image2)
 		return errors.New("Could not perform image diff")
 	}
 
-	req := differs.DiffRequest{image1, image2, diffTypes}
-	if diffs, err := req.GetDiff(); err == nil {
-		glog.Info("Retrieving diffs")
-		outputResults(diffs)
-		if !save {
-			cleanupImage(image1)
-			cleanupImage(image2)
-
-		} else {
-			dir, _ := os.Getwd()
-			glog.Infof("Images were saved at %s as %s and %s", dir, image1.FSPath, image2.FSPath)
-		}
-	} else {
+	req := differs.DiffRequest{*imageMap[image1Arg], *imageMap[image2Arg], diffTypes}
+	diffs, err := req.GetDiff()
+	if err != nil {
 		glog.Error(err.Error())
-		cleanupImage(image1)
-		cleanupImage(image2)
 		return errors.New("Could not perform image diff")
 	}
+	glog.Info("Retrieving diffs")
+	outputResults(diffs)
 
+	if save {
+		dir, _ := os.Getwd()
+		glog.Infof("Images were saved at %s as %s and %s", dir, imageMap[image1Arg].FSPath,
+			imageMap[image2Arg].FSPath)
+
+	}
 	return nil
 }