Fix some go vet errors. (#152)

Author: dlorenc

cmd/analyze.go

@@ -78,7 +78,9 @@ func analyzeImage(imageName string, analyzerArgs []string) error {
 		return fmt.Errorf("Error processing image: %s", err)
 	}
 
-	req := differs.SingleRequest{image, analyzeTypes}
+	req := differs.SingleRequest{
+		Image:        image,
+		AnalyzeTypes: analyzeTypes}
 	analyses, err := req.GetAnalysis()
 	if err != nil {
 		return fmt.Errorf("Error performing image analysis: %s", err)

cmd/diff.go

@@ -113,7 +113,10 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
 	}
 
 	fmt.Fprintln(os.Stderr, "Computing diffs")
-	req := differs.DiffRequest{*imageMap[image1Arg], *imageMap[image2Arg], diffTypes}
+	req := differs.DiffRequest{
+		Image1:    *imageMap[image1Arg],
+		Image2:    *imageMap[image2Arg],
+		DiffTypes: diffTypes}
 	diffs, err := req.GetDiff()
 	if err != nil {
 		return fmt.Errorf("Could not retrieve diff: %s", err)

differs/apt_diff_test.go

@@ -88,7 +88,7 @@ func TestParseLine(t *testing.T) {
 			t.Errorf("Expected current package to be: %s, but got: %s.", test.expPackage, currPackage)
 		}
 		if !reflect.DeepEqual(test.packages, test.expected) {
-			t.Errorf("Expected: %s but got: %s", test.expected, test.packages)
+			t.Errorf("Expected: %v but got: %v", test.expected, test.packages)
 		}
 	}
 }
@@ -131,7 +131,7 @@ func TestGetAptPackages(t *testing.T) {
 			t.Errorf("Expected error but got none.")
 		}
 		if !reflect.DeepEqual(packages, test.expected) {
-			t.Errorf("Expected: %s but got: %s", test.expected, packages)
+			t.Errorf("Expected: %v but got: %v", test.expected, packages)
 		}
 	}
 }

differs/node_diff_test.go

@@ -71,7 +71,7 @@ func TestGetNodePackages(t *testing.T) {
 			t.Errorf("Expected error but got none.")
 		}
 		if !reflect.DeepEqual(packages, test.expected) {
-			t.Errorf("Expected: %s but got: %s", test.expected, packages)
+			t.Errorf("Expected: %v but got: %v", test.expected, packages)
 		}
 	}
 }

differs/pip_diff_test.go

@@ -154,7 +154,7 @@ func TestGetPythonPackages(t *testing.T) {
 		d := PipAnalyzer{}
 		packages, _ := d.getPackages(test.image)
 		if !reflect.DeepEqual(packages, test.expectedPackages) {
-			t.Errorf("%s\nExpected: %s\nGot: %s", test.descrip, test.expectedPackages, packages)
+			t.Errorf("%s\nExpected: %v\nGot: %v", test.descrip, test.expectedPackages, packages)
 		}
 	}
 }

pkg/util/daemon_prepper.go

@@ -63,7 +63,7 @@ func (p DaemonPrepper) GetConfig() (ConfigSchema, error) {
 func (p DaemonPrepper) GetHistory() []ImageHistoryItem {
 	history, err := p.Client.ImageHistory(context.Background(), p.Source)
 	if err != nil {
-		logrus.Error("Could not obtain image history for %s: %s", p.Source, err)
+		logrus.Errorf("Could not obtain image history for %s: %s", p.Source, err)
 	}
 	historyItems := []ImageHistoryItem{}
 	for _, item := range history {

util/fs_utils_test.go

@@ -28,9 +28,9 @@ type difftestpair struct {
 	expected_output []string
 }
 
-var d1 = pkgutil.Directory{"Dir1", []string{}}
-var d2 = pkgutil.Directory{"Dir2", []string{"file1"}}
-var d3 = pkgutil.Directory{"Dir2", []string{"file1", "file2"}}
+var d1 = pkgutil.Directory{Root: "Dir1", Content: []string{}}
+var d2 = pkgutil.Directory{Root: "Dir2", Content: []string{"file1"}}
+var d3 = pkgutil.Directory{Root: "Dir2", Content: []string{"file1", "file2"}}
 
 func TestGetAddedEntries(t *testing.T) {
 	var additiontests = []difftestpair{
@@ -65,10 +65,10 @@ func TestGetDeletedEntries(t *testing.T) {
 }
 
 func TestGetModifiedEntries(t *testing.T) {
-	var testdir1 = pkgutil.Directory{"test_files/dir1/", []string{"file1", "file2", "file3"}}
-	var testdir2 = pkgutil.Directory{"test_files/dir2/", []string{"file1", "file2", "file4"}}
-	var testdir3 = pkgutil.Directory{"test_files/dir1_copy/", []string{"file1", "file2", "file3"}}
-	var testdir4 = pkgutil.Directory{"test_files/dir2_modified/", []string{"file1", "file2", "file4"}}
+	var testdir1 = pkgutil.Directory{Root: "test_files/dir1/", Content: []string{"file1", "file2", "file3"}}
+	var testdir2 = pkgutil.Directory{Root: "test_files/dir2/", Content: []string{"file1", "file2", "file4"}}
+	var testdir3 = pkgutil.Directory{Root: "test_files/dir1_copy/", Content: []string{"file1", "file2", "file3"}}
+	var testdir4 = pkgutil.Directory{Root: "test_files/dir2_modified/", Content: []string{"file1", "file2", "file4"}}
 
 	var modifiedtests = []difftestpair{
 		{[2]pkgutil.Directory{d1, d1}, []string{}},
@@ -150,7 +150,7 @@ func TestCheckSameFile(t *testing.T) {
 				t.Errorf("Expected error but got none")
 			} else {
 				if output != test.expected_output {
-					t.Errorf("\nExpected: %s\nGot: %s\n", test.expected_output, output)
+					t.Errorf("\nExpected: %v\nGot: %v\n", test.expected_output, output)
 				}
 			}
 		}