From 7544330bc2bbd4f81fbcc9866aa7b3e7fa5c9cbe Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 30 Jun 2020 09:25:25 -0400 Subject: [PATCH] json img presenter needs to degrade nicely when file metadata is not present Signed-off-by: Alfredo Deza --- imgbom/presenter/json/imgs/presenter.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/imgbom/presenter/json/imgs/presenter.go b/imgbom/presenter/json/imgs/presenter.go index fdb259289..8782a5afc 100644 --- a/imgbom/presenter/json/imgs/presenter.go +++ b/imgbom/presenter/json/imgs/presenter.go @@ -93,14 +93,18 @@ func (pres *Presenter) Present(output io.Writer) error { for idx, src := range p.Source { fileMetadata, err := pres.img.FileCatalog.Get(src) + var layer int if err != nil { // TODO: test case - log.Errorf("could not get metadata from catalog (presenter=json): %+v", src) + log.Errorf("could not get metadata from catalog (presenter=json): %+v - error: %w", src, err) + layer = 0 + } else { + layer = int(fileMetadata.Source.Metadata.Index) } srcObj := source{ FoundBy: p.FoundBy, - Layer: int(fileMetadata.Source.Metadata.Index), + Layer: layer, Effects: []string{}, // TODO } art.Sources[idx] = srcObj