add integration test

Author: nkubala

cmd/analyze.go

@@ -87,7 +87,7 @@ func analyzeImage(imageName string, analyzerArgs []string) error {
 		return fmt.Errorf("Error performing image analysis: %s", err)
 	}
 
-	output.PrintToStdErr("Retrieving analyses")
+	output.PrintToStdErr("Retrieving analyses\n")
 	outputResults(analyses)
 
 	if save {

cmd/diff.go

@@ -113,7 +113,7 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
 		defer pkgutil.CleanupImage(*imageMap[image2Arg])
 	}
 
-	output.PrintToStdErr("Computing diffs")
+	output.PrintToStdErr("Computing diffs\n")
 	req := differs.DiffRequest{
 		Image1:    *imageMap[image1Arg],
 		Image2:    *imageMap[image2Arg],
@@ -125,7 +125,7 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
 	outputResults(diffs)
 
 	if filename != "" {
-		output.PrintToStdErr("Computing filename diffs")
+		output.PrintToStdErr("Computing filename diffs\n")
 		err := diffFile(imageMap[image1Arg], imageMap[image2Arg])
 		if err != nil {
 			return err

tests/integration_test.go

@@ -39,6 +39,9 @@ const (
 	diffBase     = "gcr.io/gcp-runtimes/diff-base"
 	diffModified = "gcr.io/gcp-runtimes/diff-modified"
 
+	metadataBase     = "gcr.io/gcp-runtimes/metadata-base"
+	metadataModified = "gcr.io/gcp-runtimes/metadata-modified"
+
 	aptBase     = "gcr.io/gcp-runtimes/apt-base"
 	aptModified = "gcr.io/gcp-runtimes/apt-modified"
 
@@ -152,6 +155,14 @@ func TestDiffAndAnalysis(t *testing.T) {
 			differFlags:  []string{"--type=history"},
 			expectedFile: "hist_diff_expected.json",
 		},
+		{
+			description:  "metadata differ",
+			subcommand:   "diff",
+			imageA:       metadataBase,
+			imageB:       metadataModified,
+			differFlags:  []string{"--type=metadata"},
+			expectedFile: "metadata_diff_expected.json",
+		},
 		{
 			description:  "apt sorted differ",
 			subcommand:   "diff",

tests/metadata_diff_expected.json

@@ -0,0 +1,17 @@
+[
+  {
+    "Image1": "gcr.io/gcp-runtimes/metadata-base:latest",
+    "Image2": "gcr.io/gcp-runtimes/metadata-modified:latest",
+    "DiffType": "Metadata",
+    "Diff": {
+      "Adds": [
+        "Entrypoint: /entrypoint",
+        "ExposedPorts: map[1234/tcp:{}]"
+      ],
+      "Dels": [
+        "Entrypoint: ",
+        "ExposedPorts: map[1234/tcp:{} 4321/tcp:{}]"
+      ]
+    }
+  }
+]