Perform apt diffing by default.

Author: dlorenc

cmd/analyze.go

@@ -57,6 +57,12 @@ func checkAnalyzeArgNum(args []string) error {
 }
 
 func analyzeImage(imageArg string, analyzerArgs []string) error {
+	analyzeTypes, err := differs.GetAnalyzers(analyzerArgs)
+	if err != nil {
+		glog.Error(err.Error())
+		return errors.New("Could not perform image analysis")
+	}
+
 	cli, err := NewClient()
 	if err != nil {
 		return fmt.Errorf("Error getting docker client for differ: %s", err)
@@ -75,11 +81,6 @@ func analyzeImage(imageArg string, analyzerArgs []string) error {
 		glog.Error(err.Error())
 		return errors.New("Could not perform image analysis")
 	}
-	analyzeTypes, err := differs.GetAnalyzers(analyzerArgs)
-	if err != nil {
-		glog.Error(err.Error())
-		return errors.New("Could not perform image analysis")
-	}
 
 	req := differs.SingleRequest{image, analyzeTypes}
 	analyses, err := req.GetAnalysis()

cmd/diff.go

@@ -58,6 +58,12 @@ func checkDiffArgNum(args []string) error {
 }
 
 func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
+	diffTypes, err := differs.GetAnalyzers(diffArgs)
+	if err != nil {
+		glog.Error(err.Error())
+		return errors.New("Could not perform image diff")
+	}
+
 	cli, err := NewClient()
 	if err != nil {
 		return fmt.Errorf("Error getting docker client for differ: %s", err)
@@ -93,12 +99,6 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
 		defer pkgutil.CleanupImage(*imageMap[image2Arg])
 	}
 
-	diffTypes, err := differs.GetAnalyzers(diffArgs)
-	if err != nil {
-		glog.Error(err.Error())
-		return errors.New("Could not perform image diff")
-	}
-
 	req := differs.DiffRequest{*imageMap[image1Arg], *imageMap[image2Arg], diffTypes}
 	diffs, err := req.GetDiff()
 	if err != nil {

cmd/root.go

@@ -131,7 +131,7 @@ func init() {
 
 func addSharedFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolVarP(&json, "json", "j", false, "JSON Output defines if the diff should be returned in a human readable format (false) or a JSON (true).")
-	cmd.Flags().StringVarP(&types, "types", "t", "", "This flag sets the list of analyzer types to use.  It expects a comma separated list of supported analyzers.")
+	cmd.Flags().StringVarP(&types, "types", "t", "apt", "This flag sets the list of analyzer types to use.  It expects a comma separated list of supported analyzers.")
 	cmd.Flags().BoolVarP(&save, "save", "s", false, "Set this flag to save rather than remove the final image filesystems on exit.")
 	cmd.Flags().BoolVarP(&util.SortSize, "order", "o", false, "Set this flag to sort any file/package results by descending size. Otherwise, they will be sorted by name.")
 }