Merge pull request #70 from dlorenc/reflect

Remove more reflect usage.

Author: dlorenc

cmd/root.go

@@ -7,7 +7,6 @@ import (
 	goflag "flag"
 	"fmt"
 	"os"
-	"reflect"
 	"sort"
 
 	"github.com/GoogleCloudPlatform/container-diff/utils"
@@ -81,7 +80,7 @@ func outputResults(resultMap map[string]utils.Result) {
 }
 
 func cleanupImage(image utils.Image) {
-	if !reflect.DeepEqual(image, (utils.Image{})) {
+	if image.FSPath != "" {
 		glog.Infof("Removing image filesystem directory %s from system", image.FSPath)
 		errMsg := remove(image.FSPath, true)
 		if errMsg != "" {

differs/apt_diff.go

@@ -14,6 +14,10 @@ import (
 type AptAnalyzer struct {
 }
 
+func (a AptAnalyzer) Name() string {
+	return "AptAnalyzer"
+}
+
 // AptDiff compares the packages installed by apt-get.
 func (a AptAnalyzer) Diff(image1, image2 utils.Image) (utils.Result, error) {
 	diff, err := singleVersionDiff(image1, image2, a)

differs/differs.go

@@ -3,7 +3,6 @@ package differs
 import (
 	"errors"
 	"fmt"
-	"reflect"
 
 	"github.com/GoogleCloudPlatform/container-diff/utils"
 	"github.com/golang/glog"
@@ -23,6 +22,7 @@ type SingleRequest struct {
 type Analyzer interface {
 	Diff(image1, image2 utils.Image) (utils.Result, error)
 	Analyze(image utils.Image) (utils.Result, error)
+	Name() string
 }
 
 var analyzers = map[string]Analyzer{
@@ -40,11 +40,10 @@ func (req DiffRequest) GetDiff() (map[string]utils.Result, error) {
 
 	results := map[string]utils.Result{}
 	for _, differ := range diffs {
-		differName := reflect.TypeOf(differ).Name()
 		if diff, err := differ.Diff(img1, img2); err == nil {
-			results[differName] = diff
+			results[differ.Name()] = diff
 		} else {
-			glog.Errorf("Error getting diff with %s: %s", differName, err)
+			glog.Errorf("Error getting diff with %s: %s", differ.Name(), err)
 		}
 	}
 
@@ -64,7 +63,7 @@ func (req SingleRequest) GetAnalysis() (map[string]utils.Result, error) {
 
 	results := map[string]utils.Result{}
 	for _, analyzer := range analyses {
-		analyzeName := reflect.TypeOf(analyzer).Name()
+		analyzeName := analyzer.Name()
 		if analysis, err := analyzer.Analyze(img); err == nil {
 			results[analyzeName] = analysis
 		} else {

differs/file_diff.go

@@ -7,6 +7,10 @@ import (
 type FileAnalyzer struct {
 }
 
+func (a FileAnalyzer) Name() string {
+	return "FileAnalyzer"
+}
+
 // FileDiff diffs two packages and compares their contents
 func (a FileAnalyzer) Diff(image1, image2 utils.Image) (utils.Result, error) {
 	diff, err := diffImageFiles(image1, image2)

differs/history_diff.go

@@ -14,6 +14,10 @@ type HistDiff struct {
 	Dels []string
 }
 
+func (a HistoryAnalyzer) Name() string {
+	return "HistoryAnalyzer"
+}
+
 func (a HistoryAnalyzer) Diff(image1, image2 utils.Image) (utils.Result, error) {
 	diff, err := getHistoryDiff(image1, image2)
 	return &utils.HistDiffResult{

differs/node_diff.go

@@ -14,6 +14,10 @@ import (
 type NodeAnalyzer struct {
 }
 
+func (a NodeAnalyzer) Name() string {
+	return "NodeAnalyzer"
+}
+
 // NodeDiff compares the packages installed by apt-get.
 func (a NodeAnalyzer) Diff(image1, image2 utils.Image) (utils.Result, error) {
 	diff, err := multiVersionDiff(image1, image2, a)

differs/package_differs.go

@@ -1,18 +1,19 @@
 package differs
 
 import (
-	"reflect"
 	"strings"
 
 	"github.com/GoogleCloudPlatform/container-diff/utils"
 )
 
 type MultiVersionPackageAnalyzer interface {
 	getPackages(image utils.Image) (map[string]map[string]utils.PackageInfo, error)
+	Name() string
 }
 
 type SingleVersionPackageAnalyzer interface {
 	getPackages(image utils.Image) (map[string]utils.PackageInfo, error)
+	Name() string
 }
 
 func multiVersionDiff(image1, image2 utils.Image, differ MultiVersionPackageAnalyzer) (*utils.MultiVersionPackageDiffResult, error) {
@@ -29,7 +30,7 @@ func multiVersionDiff(image1, image2 utils.Image, differ MultiVersionPackageAnal
 	return &utils.MultiVersionPackageDiffResult{
 		Image1:   image1.Source,
 		Image2:   image2.Source,
-		DiffType: strings.TrimSuffix(reflect.TypeOf(differ).Name(), "Analyzer"),
+		DiffType: strings.TrimSuffix(differ.Name(), "Analyzer"),
 		Diff:     diff,
 	}, nil
 }
@@ -48,7 +49,7 @@ func singleVersionDiff(image1, image2 utils.Image, differ SingleVersionPackageAn
 	return &utils.SingleVersionPackageDiffResult{
 		Image1:   image1.Source,
 		Image2:   image2.Source,
-		DiffType: strings.TrimSuffix(reflect.TypeOf(differ).Name(), "Analyzer"),
+		DiffType: strings.TrimSuffix(differ.Name(), "Analyzer"),
 		Diff:     diff,
 	}, nil
 }
@@ -61,7 +62,7 @@ func multiVersionAnalysis(image utils.Image, analyzer MultiVersionPackageAnalyze
 
 	analysis := utils.MultiVersionPackageAnalyzeResult{
 		Image:       image.Source,
-		AnalyzeType: strings.TrimSuffix(reflect.TypeOf(analyzer).Name(), "Analyzer"),
+		AnalyzeType: strings.TrimSuffix(analyzer.Name(), "Analyzer"),
 		Analysis:    pack,
 	}
 	return &analysis, nil
@@ -75,7 +76,7 @@ func singleVersionAnalysis(image utils.Image, analyzer SingleVersionPackageAnaly
 
 	analysis := utils.SingleVersionPackageAnalyzeResult{
 		Image:       image.Source,
-		AnalyzeType: strings.TrimSuffix(reflect.TypeOf(analyzer).Name(), "Analyzer"),
+		AnalyzeType: strings.TrimSuffix(analyzer.Name(), "Analyzer"),
 		Analysis:    pack,
 	}
 	return &analysis, nil

differs/pip_diff.go

@@ -3,7 +3,6 @@ package differs
 import (
 	"io/ioutil"
 	"path/filepath"
-	"reflect"
 	"regexp"
 	"strings"
 
@@ -14,6 +13,10 @@ import (
 type PipAnalyzer struct {
 }
 
+func (a PipAnalyzer) Name() string {
+	return "PipAnalyzer"
+}
+
 // PipDiff compares pip-installed Python packages between layers of two different images.
 func (a PipAnalyzer) Diff(image1, image2 utils.Image) (utils.Result, error) {
 	diff, err := multiVersionDiff(image1, image2, a)
@@ -29,7 +32,7 @@ func (a PipAnalyzer) getPackages(image utils.Image) (map[string]map[string]utils
 	path := image.FSPath
 	packages := make(map[string]map[string]utils.PackageInfo)
 	pythonPaths := []string{}
-	if !reflect.DeepEqual(utils.ConfigSchema{}, image.Config) {
+	if image.Config.Config.Env != nil {
 		paths := getPythonPaths(image.Config.Config.Env)
 		for _, p := range paths {
 			pythonPaths = append(pythonPaths, p)