fix(cov): coverage boltdb+dynamo (#2018)

Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>

pkg/extensions/search/convert/convert_test.go

@@ -796,3 +796,24 @@ func TestIndexAnnotations(t *testing.T) {
 		So(err, ShouldBeNil)
 	})
 }
+
+func TestConvertErrors(t *testing.T) {
+	ctx := context.Background()
+	log := log.NewLogger("debug", "")
+
+	Convey("Errors", t, func() {
+		Convey("RepoMeta2ExpandedRepoInfo", func() {
+			_, imgSums := convert.RepoMeta2ExpandedRepoInfo(ctx,
+				mTypes.RepoMeta{
+					Tags: map[string]mTypes.Descriptor{"tag": {MediaType: "bad-type", Digest: "digest"}},
+				},
+				map[string]mTypes.ImageMeta{
+					"digest": {},
+				},
+				convert.SkipQGLField{}, nil,
+				log,
+			)
+			So(len(imgSums), ShouldEqual, 0)
+		})
+	})
+}

pkg/extensions/search/convert/metadb.go

@@ -175,12 +175,12 @@ func GetFullImageMeta(tag string, repoMeta mTypes.RepoMeta, imageMeta mTypes.Ima
 	}
 }
 
-func GetFullManifestMeta(repoMeta mTypes.RepoMeta, manifests []mTypes.ManifestData) []mTypes.FullManifestMeta {
+func GetFullManifestMeta(repoMeta mTypes.RepoMeta, manifests []mTypes.ManifestMeta) []mTypes.FullManifestMeta {
 	results := make([]mTypes.FullManifestMeta, 0, len(manifests))
 
 	for i := range manifests {
 		results = append(results, mTypes.FullManifestMeta{
-			ManifestData: manifests[i],
+			ManifestMeta: manifests[i],
 			Referrers:    repoMeta.Referrers[manifests[i].Digest.String()],
 			Statistics:   repoMeta.Statistics[manifests[i].Digest.String()],
 			Signatures:   repoMeta.Signatures[manifests[i].Digest.String()],

pkg/extensions/search/cve/cve_internal_test.go

@@ -3,17 +3,64 @@
 package cveinfo
 
 import (
+	"errors"
 	"testing"
 	"time"
 
+	"github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	. "github.com/smartystreets/goconvey/convey"
 
 	cvemodel "zotregistry.io/zot/pkg/extensions/search/cve/model"
+	"zotregistry.io/zot/pkg/meta/types"
+	"zotregistry.io/zot/pkg/test/mocks"
 )
 
+var ErrTestError = errors.New("test error")
+
 func TestUtils(t *testing.T) {
 	Convey("Utils", t, func() {
+		Convey("getConfigAndDigest", func() {
+			_, _, err := getConfigAndDigest(mocks.MetaDBMock{}, "bad-digest")
+			So(err, ShouldNotBeNil)
+
+			_, _, err = getConfigAndDigest(mocks.MetaDBMock{
+				GetImageMetaFn: func(digest digest.Digest) (types.ImageMeta, error) {
+					return types.ImageMeta{}, ErrTestError
+				},
+			}, ispec.DescriptorEmptyJSON.Digest.String())
+			So(err, ShouldNotBeNil)
+
+			// bad media type of config
+			_, _, err = getConfigAndDigest(mocks.MetaDBMock{
+				GetImageMetaFn: func(digest digest.Digest) (types.ImageMeta, error) {
+					return types.ImageMeta{Manifests: []types.ManifestMeta{
+						{Manifest: ispec.Manifest{Config: ispec.Descriptor{MediaType: "bad-type"}}},
+					}}, nil
+				},
+			}, ispec.DescriptorEmptyJSON.Digest.String())
+			So(err, ShouldNotBeNil)
+		})
+		Convey("getIndexContent", func() {
+			_, err := getIndexContent(mocks.MetaDBMock{}, "bad-digest")
+			So(err, ShouldNotBeNil)
+
+			_, err = getIndexContent(mocks.MetaDBMock{
+				GetImageMetaFn: func(digest digest.Digest) (types.ImageMeta, error) {
+					return types.ImageMeta{}, ErrTestError
+				},
+			}, ispec.DescriptorEmptyJSON.Digest.String())
+			So(err, ShouldNotBeNil)
+
+			// nil index
+			_, err = getIndexContent(mocks.MetaDBMock{
+				GetImageMetaFn: func(digest digest.Digest) (types.ImageMeta, error) {
+					return types.ImageMeta{}, nil
+				},
+			}, ispec.DescriptorEmptyJSON.Digest.String())
+			So(err, ShouldNotBeNil)
+		})
+
 		Convey("mostRecentUpdate", func() {
 			// empty
 			timestamp := mostRecentUpdate([]cvemodel.DescriptorInfo{})

pkg/extensions/search/cve/trivy/scanner.go

@@ -243,10 +243,6 @@ func (scanner Scanner) isManifestScanable(digestStr string) (bool, error) {
 		return false, err
 	}
 
-	if manifestData.MediaType != ispec.MediaTypeImageManifest {
-		return false, zerr.ErrUnexpectedMediaType
-	}
-
 	for _, imageLayer := range manifestData.Manifests[0].Manifest.Layers {
 		switch imageLayer.MediaType {
 		case ispec.MediaTypeImageLayerGzip, ispec.MediaTypeImageLayer, string(regTypes.DockerLayer):
@@ -259,15 +255,11 @@ func (scanner Scanner) isManifestScanable(digestStr string) (bool, error) {
 	return true, nil
 }
 
-func (scanner Scanner) isManifestDataScannable(manifestData mTypes.ManifestData) (bool, error) {
+func (scanner Scanner) isManifestDataScannable(manifestData mTypes.ManifestMeta) (bool, error) {
 	if scanner.cache.Get(manifestData.Digest.String()) != nil {
 		return true, nil
 	}
 
-	if manifestData.Manifest.MediaType != ispec.MediaTypeImageManifest {
-		return false, zerr.ErrScanNotSupported
-	}
-
 	for _, imageLayer := range manifestData.Manifest.Layers {
 		switch imageLayer.MediaType {
 		case ispec.MediaTypeImageLayerGzip, ispec.MediaTypeImageLayer, string(regTypes.DockerLayer):
@@ -290,7 +282,7 @@ func (scanner Scanner) isIndexScannable(digestStr string) (bool, error) {
 		return false, err
 	}
 
-	if indexData.MediaType != ispec.MediaTypeImageIndex || indexData.Index == nil {
+	if indexData.Index == nil {
 		return false, zerr.ErrUnexpectedMediaType
 	}
 

pkg/extensions/search/cve/trivy/scanner_test.go

@@ -3,6 +3,7 @@
 package trivy_test
 
 import (
+	"errors"
 	"path/filepath"
 	"testing"
 	"time"
@@ -19,13 +20,17 @@ import (
 	"zotregistry.io/zot/pkg/log"
 	"zotregistry.io/zot/pkg/meta"
 	"zotregistry.io/zot/pkg/meta/boltdb"
+	"zotregistry.io/zot/pkg/meta/types"
 	"zotregistry.io/zot/pkg/storage"
 	"zotregistry.io/zot/pkg/storage/local"
 	. "zotregistry.io/zot/pkg/test/common"
 	"zotregistry.io/zot/pkg/test/deprecated"
 	. "zotregistry.io/zot/pkg/test/image-utils"
+	"zotregistry.io/zot/pkg/test/mocks"
 )
 
+var ErrTestError = errors.New("test error")
+
 func TestScanBigTestFile(t *testing.T) {
 	Convey("Scan zot-test", t, func() {
 		projRootDir, err := GetProjectRootDir()
@@ -200,3 +205,74 @@ func TestVulnerableLayer(t *testing.T) {
 		So(cveMap, ShouldContainKey, "CVE-2023-3446")
 	})
 }
+
+func TestScannerErrors(t *testing.T) {
+	Convey("Errors", t, func() {
+		storeController := storage.StoreController{}
+		metaDB := mocks.MetaDBMock{}
+		log := log.NewLogger("debug", "")
+
+		Convey("IsImageFormatScannable", func() {
+			storeController.DefaultStore = mocks.MockedImageStore{}
+			metaDB.GetImageMetaFn = func(digest godigest.Digest) (types.ImageMeta, error) {
+				return types.ImageMeta{}, ErrTestError
+			}
+			scanner := trivy.NewScanner(storeController, metaDB, "ghcr.io/project-zot/trivy-db", "", log)
+
+			_, err := scanner.IsImageFormatScannable("repo", godigest.FromString("dig").String())
+			So(err, ShouldNotBeNil)
+		})
+		Convey("IsImageMediaScannable", func() {
+			storeController.DefaultStore = mocks.MockedImageStore{}
+			metaDB.GetImageMetaFn = func(digest godigest.Digest) (types.ImageMeta, error) {
+				return types.ImageMeta{}, ErrTestError
+			}
+			scanner := trivy.NewScanner(storeController, metaDB, "ghcr.io/project-zot/trivy-db", "", log)
+
+			Convey("Manifest", func() {
+				_, err := scanner.IsImageMediaScannable("repo", godigest.FromString("dig").String(), ispec.MediaTypeImageManifest)
+				So(err, ShouldNotBeNil)
+			})
+			Convey("Index", func() {
+				_, err := scanner.IsImageMediaScannable("repo", godigest.FromString("dig").String(), ispec.MediaTypeImageIndex)
+				So(err, ShouldNotBeNil)
+			})
+			Convey("Index with nil index", func() {
+				metaDB.GetImageMetaFn = func(digest godigest.Digest) (types.ImageMeta, error) {
+					return types.ImageMeta{}, nil
+				}
+				scanner := trivy.NewScanner(storeController, metaDB, "ghcr.io/project-zot/trivy-db", "", log)
+
+				_, err := scanner.IsImageMediaScannable("repo", godigest.FromString("dig").String(), ispec.MediaTypeImageIndex)
+				So(err, ShouldNotBeNil)
+			})
+			Convey("Index with good index", func() {
+				metaDB.GetImageMetaFn = func(digest godigest.Digest) (types.ImageMeta, error) {
+					return types.ImageMeta{
+						Index: &ispec.Index{
+							Manifests: []ispec.Descriptor{{MediaType: ispec.MediaTypeImageLayer}},
+						},
+						Manifests: []types.ManifestMeta{{Manifest: ispec.Manifest{
+							Layers: []ispec.Descriptor{{MediaType: ispec.MediaTypeImageLayer}},
+						}}},
+					}, nil
+				}
+				scanner := trivy.NewScanner(storeController, metaDB, "ghcr.io/project-zot/trivy-db", "", log)
+
+				_, err := scanner.IsImageMediaScannable("repo", godigest.FromString("dig").String(), ispec.MediaTypeImageIndex)
+				So(err, ShouldBeNil)
+			})
+		})
+		Convey("ScanImage", func() {
+			storeController.DefaultStore = mocks.MockedImageStore{}
+			metaDB.GetImageMetaFn = func(digest godigest.Digest) (types.ImageMeta, error) {
+				return types.ImageMeta{}, ErrTestError
+			}
+
+			scanner := trivy.NewScanner(storeController, metaDB, "ghcr.io/project-zot/trivy-db", "", log)
+
+			_, err := scanner.ScanImage("image@" + godigest.FromString("digest").String())
+			So(err, ShouldNotBeNil)
+		})
+	})
+}

pkg/extensions/search/resolver_test.go

@@ -244,6 +244,39 @@ func TestRepoListWithNewestImage(t *testing.T) {
 	})
 }
 
+func TestGetFilteredPaginatedRepos(t *testing.T) {
+	ctx := context.Background()
+	log := log.NewLogger("debug", "")
+
+	Convey("getFilteredPaginatedRepos", t, func() {
+		metaDB := mocks.MetaDBMock{}
+
+		Convey("FilterRepos", func() {
+			metaDB.FilterReposFn = func(ctx context.Context, rankName mTypes.FilterRepoNameFunc,
+				filterFunc mTypes.FilterFullRepoFunc,
+			) ([]mTypes.RepoMeta, error) {
+				return nil, ErrTestError
+			}
+			_, err := getFilteredPaginatedRepos(ctx, nil, func(repo string) bool { return true }, log,
+				&gql_generated.PageInput{}, metaDB)
+			So(err, ShouldNotBeNil)
+		})
+		Convey("FilterImageMeta", func() {
+			metaDB.FilterImageMetaFn = func(ctx context.Context, digests []string) (map[string]mTypes.ImageMeta, error) {
+				return nil, ErrTestError
+			}
+			_, err := getFilteredPaginatedRepos(ctx, nil, func(repo string) bool { return true }, log,
+				&gql_generated.PageInput{}, metaDB)
+			So(err, ShouldNotBeNil)
+		})
+		Convey("PaginatedRepoMeta2RepoSummaries", func() {
+			_, err := getFilteredPaginatedRepos(ctx, nil, func(repo string) bool { return true }, log,
+				&gql_generated.PageInput{Limit: ref(-10)}, metaDB)
+			So(err, ShouldNotBeNil)
+		})
+	})
+}
+
 func TestGetBookmarkedRepos(t *testing.T) {
 	Convey("getBookmarkedRepos", t, func() {
 		responseContext := graphql.WithResponseContext(context.Background(), graphql.DefaultErrorPresenter,
@@ -426,6 +459,24 @@ func TestImageListForDigest(t *testing.T) {
 	})
 }
 
+func TestGetImageSummaryError(t *testing.T) {
+	Convey("getImageSummary", t, func() {
+		metaDB := mocks.MetaDBMock{
+			GetRepoMetaFn: func(ctx context.Context, repo string) (mTypes.RepoMeta, error) {
+				return mTypes.RepoMeta{Tags: map[string]mTypes.Descriptor{"tag": {}}}, nil
+			},
+			FilterImageMetaFn: func(ctx context.Context, digests []string) (map[string]mTypes.ImageMeta, error) {
+				return nil, ErrTestError
+			},
+		}
+		log := log.NewLogger("debug", "")
+
+		_, err := getImageSummary(context.Background(), "repo", "tag", nil, convert.SkipQGLField{},
+			metaDB, nil, log)
+		So(err, ShouldNotBeNil)
+	})
+}
+
 func TestImageListError(t *testing.T) {
 	Convey("getImageList", t, func() {
 		testLogger := log.NewLogger("debug", "/dev/null")
@@ -588,6 +639,18 @@ func TestQueryResolverErrors(t *testing.T) {
 			So(err, ShouldNotBeNil)
 		})
 
+		Convey("GlobalSearch error filte image meta", func() {
+			resolverConfig := NewResolver(log, storage.StoreController{}, mocks.MetaDBMock{
+				FilterImageMetaFn: func(ctx context.Context, digests []string) (map[string]mTypes.ImageMeta, error) {
+					return nil, ErrTestError
+				},
+			}, mocks.CveInfoMock{})
+			resolver := queryResolver{resolverConfig}
+
+			_, err := resolver.GlobalSearch(ctx, "some_string", &gql_generated.Filter{}, getPageInput(1, 1))
+			So(err, ShouldNotBeNil)
+		})
+
 		Convey("ImageListForCve error in GetMultipleRepoMeta", func() {
 			resolverConfig := NewResolver(
 				log,
@@ -651,6 +714,30 @@ func TestQueryResolverErrors(t *testing.T) {
 			So(err, ShouldNotBeNil)
 		})
 
+		Convey("RepoListWithNewestImage repoListWithNewestImage() filter image meta error", func() {
+			resolverConfig := NewResolver(
+				log,
+				storage.StoreController{
+					DefaultStore: mocks.MockedImageStore{},
+				},
+				mocks.MetaDBMock{
+					SearchReposFn: func(ctx context.Context, searchText string,
+					) ([]mTypes.RepoMeta, error) {
+						return []mTypes.RepoMeta{}, nil
+					},
+					FilterImageMetaFn: func(ctx context.Context, digests []string) (map[string]mTypes.ImageMeta, error) {
+						return nil, ErrTestError
+					},
+				},
+				mocks.CveInfoMock{},
+			)
+
+			qr := queryResolver{resolverConfig}
+
+			_, err := qr.RepoListWithNewestImage(ctx, &gql_generated.PageInput{})
+			So(err, ShouldNotBeNil)
+		})
+
 		Convey("RepoListWithNewestImage repoListWithNewestImage() errors mocked StoreController", func() {
 			resolverConfig := NewResolver(
 				log,