Addressing Nick's comments

Author: cftorres

utils/analyze_output_utils.go

@@ -1,5 +1,12 @@
 package utils
 
+import (
+	"errors"
+	"fmt"
+
+	"github.com/golang/glog"
+)
+
 type Result interface {
 	OutputStruct() interface{}
 	OutputText(resultType string) error
@@ -18,14 +25,24 @@ func (r ListAnalyzeResult) OutputStruct() interface{} {
 }
 
 func (r ListAnalyzeResult) OutputText(resultType string) error {
-	r.Analysis = r.Analysis.([]string)
+	analysis, valid := r.Analysis.([]string)
+	if !valid {
+		glog.Error("Unexpected structure of Analysis.  Should be of type []string")
+		return errors.New(fmt.Sprintf("Could not output %s analysis result", r.AnalyzeType))
+	}
+	r.Analysis = analysis
+
 	return TemplateOutput(r, "ListAnalyze")
 }
 
 type MultiVersionPackageAnalyzeResult AnalyzeResult
 
 func (r MultiVersionPackageAnalyzeResult) OutputStruct() interface{} {
-	analysis := r.Analysis.(map[string]map[string]PackageInfo)
+	analysis, valid := r.Analysis.(map[string]map[string]PackageInfo)
+	if !valid {
+		glog.Error("Unexpected structure of Analysis.  Should be of type map[string]map[string]PackageInfo")
+		return errors.New(fmt.Sprintf("Could not output %s analysis result", r.AnalyzeType))
+	}
 	analysisOutput := getMultiVersionPackageOutput(analysis)
 	output := struct {
 		Image       string
@@ -40,7 +57,11 @@ func (r MultiVersionPackageAnalyzeResult) OutputStruct() interface{} {
 }
 
 func (r MultiVersionPackageAnalyzeResult) OutputText(resultType string) error {
-	analysis := r.Analysis.(map[string]map[string]PackageInfo)
+	analysis, valid := r.Analysis.(map[string]map[string]PackageInfo)
+	if !valid {
+		glog.Error("Unexpected structure of Analysis.  Should be of type map[string]map[string]PackageInfo")
+		return errors.New(fmt.Sprintf("Could not output %s analysis result", r.AnalyzeType))
+	}
 	analysisOutput := getMultiVersionPackageOutput(analysis)
 
 	strAnalysis := stringifyPackages(analysisOutput)
@@ -59,7 +80,11 @@ func (r MultiVersionPackageAnalyzeResult) OutputText(resultType string) error {
 type SingleVersionPackageAnalyzeResult AnalyzeResult
 
 func (r SingleVersionPackageAnalyzeResult) OutputStruct() interface{} {
-	analysis := r.Analysis.(map[string]PackageInfo)
+	analysis, valid := r.Analysis.(map[string]PackageInfo)
+	if !valid {
+		glog.Error("Unexpected structure of Analysis.  Should be of type map[string]PackageInfo")
+		return errors.New(fmt.Sprintf("Could not output %s analysis result", r.AnalyzeType))
+	}
 	analysisOutput := getSingleVersionPackageOutput(analysis)
 	output := struct {
 		Image       string
@@ -74,7 +99,11 @@ func (r SingleVersionPackageAnalyzeResult) OutputStruct() interface{} {
 }
 
 func (r SingleVersionPackageAnalyzeResult) OutputText(diffType string) error {
-	analysis := r.Analysis.(map[string]PackageInfo)
+	analysis, valid := r.Analysis.(map[string]PackageInfo)
+	if !valid {
+		glog.Error("Unexpected structure of Analysis.  Should be of type map[string]PackageInfo")
+		return errors.New(fmt.Sprintf("Could not output %s analysis result", r.AnalyzeType))
+	}
 	analysisOutput := getSingleVersionPackageOutput(analysis)
 
 	strAnalysis := stringifyPackages(analysisOutput)
@@ -130,7 +159,12 @@ func getMultiVersionPackageOutput(packageMap map[string]map[string]PackageInfo)
 type FileAnalyzeResult AnalyzeResult
 
 func (r FileAnalyzeResult) OutputStruct() interface{} {
-	analysis := r.Analysis.([]DirectoryEntry)
+	analysis, valid := r.Analysis.([]DirectoryEntry)
+	if !valid {
+		glog.Error("Unexpected structure of Analysis.  Should be of type []DirectoryEntry")
+		return errors.New("Could not output FileAnalyzer analysis result")
+	}
+
 	if SortSize {
 		directoryBy(directorySizeSort).Sort(analysis)
 	} else {
@@ -141,7 +175,12 @@ func (r FileAnalyzeResult) OutputStruct() interface{} {
 }
 
 func (r FileAnalyzeResult) OutputText(analyzeType string) error {
-	analysis := r.Analysis.([]DirectoryEntry)
+	analysis, valid := r.Analysis.([]DirectoryEntry)
+	if !valid {
+		glog.Error("Unexpected structure of Analysis.  Should be of type []DirectoryEntry")
+		return errors.New("Could not output FileAnalyzer analysis result")
+	}
+
 	if SortSize {
 		directoryBy(directorySizeSort).Sort(analysis)
 	} else {

utils/diff_output_utils.go

@@ -1,5 +1,12 @@
 package utils
 
+import (
+	"errors"
+	"fmt"
+
+	"github.com/golang/glog"
+)
+
 type DiffResult struct {
 	Image1   string
 	Image2   string
@@ -10,7 +17,12 @@ type DiffResult struct {
 type MultiVersionPackageDiffResult DiffResult
 
 func (r MultiVersionPackageDiffResult) OutputStruct() interface{} {
-	diff := r.Diff.(MultiVersionPackageDiff)
+	diff, valid := r.Diff.(MultiVersionPackageDiff)
+	if !valid {
+		glog.Error("Unexpected structure of Diff.  Should follow the MultiVersionPackageDiff struct")
+		return errors.New(fmt.Sprintf("Could not output %s diff result", r.DiffType))
+	}
+
 	diffOutput := struct {
 		Packages1 []PackageOutput
 		Packages2 []PackageOutput
@@ -25,7 +37,11 @@ func (r MultiVersionPackageDiffResult) OutputStruct() interface{} {
 }
 
 func (r MultiVersionPackageDiffResult) OutputText(diffType string) error {
-	diff := r.Diff.(MultiVersionPackageDiff)
+	diff, valid := r.Diff.(MultiVersionPackageDiff)
+	if !valid {
+		glog.Error("Unexpected structure of Diff.  Should follow the MultiVersionPackageDiff struct")
+		return errors.New(fmt.Sprintf("Could not output %s diff result", r.DiffType))
+	}
 
 	strPackages1 := stringifyPackages(getMultiVersionPackageOutput(diff.Packages1))
 	strPackages2 := stringifyPackages(getMultiVersionPackageOutput(diff.Packages2))
@@ -67,7 +83,12 @@ func getMultiVersionInfoDiffOutput(infoDiff []MultiVersionInfo) []MultiVersionIn
 type SingleVersionPackageDiffResult DiffResult
 
 func (r SingleVersionPackageDiffResult) OutputStruct() interface{} {
-	diff := r.Diff.(PackageDiff)
+	diff, valid := r.Diff.(PackageDiff)
+	if !valid {
+		glog.Error("Unexpected structure of Diff.  Should follow the PackageDiff struct")
+		return errors.New(fmt.Sprintf("Could not output %s diff result", r.DiffType))
+	}
+
 	diffOutput := struct {
 		Packages1 []PackageOutput
 		Packages2 []PackageOutput
@@ -82,7 +103,11 @@ func (r SingleVersionPackageDiffResult) OutputStruct() interface{} {
 }
 
 func (r SingleVersionPackageDiffResult) OutputText(diffType string) error {
-	diff := r.Diff.(PackageDiff)
+	diff, valid := r.Diff.(PackageDiff)
+	if !valid {
+		glog.Error("Unexpected structure of Diff.  Should follow the PackageDiff struct")
+		return errors.New(fmt.Sprintf("Could not output %s diff result", r.DiffType))
+	}
 
 	strPackages1 := stringifyPackages(getSingleVersionPackageOutput(diff.Packages1))
 	strPackages2 := stringifyPackages(getSingleVersionPackageOutput(diff.Packages2))
@@ -134,12 +159,23 @@ func (r HistDiffResult) OutputText(diffType string) error {
 type DirDiffResult DiffResult
 
 func (r DirDiffResult) OutputStruct() interface{} {
-	r.Diff = sortDirDiff(r.Diff.(DirDiff))
+	diff, valid := r.Diff.(DirDiff)
+	if !valid {
+		glog.Error("Unexpected structure of Diff.  Should follow the DirDiff struct")
+		return errors.New("Could not output FileAnalyzer diff result")
+	}
+
+	r.Diff = sortDirDiff(diff)
 	return r
 }
 
 func (r DirDiffResult) OutputText(diffType string) error {
-	diff := sortDirDiff(r.Diff.(DirDiff))
+	diff, valid := r.Diff.(DirDiff)
+	if !valid {
+		glog.Error("Unexpected structure of Diff.  Should follow the DirDiff struct")
+		return errors.New("Could not output FileAnalyzer diff result")
+	}
+	diff = sortDirDiff(diff)
 
 	strAdds := stringifyDirectoryEntries(diff.Adds)
 	strDels := stringifyDirectoryEntries(diff.Dels)

utils/output_sort_utils.go

@@ -80,7 +80,7 @@ func (s *singleVersionInfoSorter) Less(i, j int) bool {
 }
 
 func (s *singleVersionInfoSorter) Swap(i, j int) {
-	s.packageDiffs[i], s.packageDiffs[j] = s.packageDiffs[i], s.packageDiffs[j]
+	s.packageDiffs[i], s.packageDiffs[j] = s.packageDiffs[j], s.packageDiffs[i]
 }
 
 var singleInfoNameSort = func(a, b *Info) bool {
@@ -89,11 +89,7 @@ var singleInfoNameSort = func(a, b *Info) bool {
 
 // Sorts MultiVersionInfos by package instance with the largest size in the first image, in descending order
 var singleInfoSizeSort = func(a, b *Info) bool {
-	aInfo1 := a.Info1
-	bInfo1 := b.Info1
-
-	// Compares the sizes of the packages in the first image
-	return aInfo1.Size > bInfo1.Size
+	return a.Info1.Size > b.Info1.Size
 }
 
 type multiInfoBy func(a, b *MultiVersionInfo) bool
@@ -120,7 +116,7 @@ func (s *multiVersionInfoSorter) Less(i, j int) bool {
 }
 
 func (s *multiVersionInfoSorter) Swap(i, j int) {
-	s.packageDiffs[i], s.packageDiffs[j] = s.packageDiffs[i], s.packageDiffs[j]
+	s.packageDiffs[i], s.packageDiffs[j] = s.packageDiffs[j], s.packageDiffs[i]
 }
 
 var multiInfoNameSort = func(a, b *MultiVersionInfo) bool {
@@ -250,7 +246,7 @@ func (s *entryDiffSorter) Less(i, j int) bool {
 }
 
 func (s *entryDiffSorter) Swap(i, j int) {
-	s.entryDiffs[i], s.entryDiffs[j] = s.entryDiffs[i], s.entryDiffs[j]
+	s.entryDiffs[i], s.entryDiffs[j] = s.entryDiffs[j], s.entryDiffs[i]
 }
 
 var entryDiffNameSort = func(a, b *EntryDiff) bool {