Merge pull request #365 from buildpack/bugfix/null-bom

fix inspect-image --bom when image is missing
buildpacks · Oct 22, 2019 · c9cfac7 · c9cfac7
2 parents 443a951 + e059ce8
commit c9cfac7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/commands/inspect_image.go b/commands/inspect_image.go
@@ -55,9 +55,16 @@ type bom struct {
 }
 
 func logBOM(remote *pack.ImageInfo, local *pack.ImageInfo, logger logging.Logger) error {
+	var remoteBOM, localBOM interface{}
+	if remote != nil {
+		remoteBOM = remote.BOM
+	}
+	if local != nil {
+		localBOM = local.BOM
+	}
 	rawBOM, err := json.Marshal(bom{
-		Remote: remote.BOM,
-		Local:  local.BOM,
+		Remote: remoteBOM,
+		Local:  localBOM,
 	})
 	if err != nil {
 		return errors.Wrapf(err, "writing bill of materials")

diff --git a/commands/inspect_image_test.go b/commands/inspect_image_test.go
@@ -53,14 +53,26 @@ func testInspectImageCommand(t *testing.T, when spec.G, it spec.S) {
 
 	when("#InspectImage", func() {
 		when("image cannot be found", func() {
-			it("logs 'Not present'", func() {
+			it.Before(func() {
 				mockClient.EXPECT().InspectImage("some/image", false).Return(nil, nil)
 				mockClient.EXPECT().InspectImage("some/image", true).Return(nil, nil)
+			})
 
+			it("logs 'Not present'", func() {
 				h.AssertNil(t, command.Execute())
 
 				h.AssertContains(t, outBuf.String(), "REMOTE:\n(not present)\n\nLOCAL:\n(not present)\n")
 			})
+
+			when("--bom", func() {
+				it("adds nulls for missing images", func() {
+					command.SetArgs([]string{"some/image", "--bom"})
+					h.AssertNil(t, command.Execute())
+					h.AssertEq(t,
+						outBuf.String(),
+						`{"remote":null,"local":null}`+"\n")
+				})
+			})
 		})
 
 		when("inspector returns an error", func() {