refactor(proto): change proto structs

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

pkg/cli/client/cve_cmd_test.go

@@ -760,7 +760,7 @@ func getMockCveScanner(metaDB mTypes.MetaDB) cveinfo.Scanner {
 				return false, err
 			}
 
-			for _, imageLayer := range manifestData.Manifests[0].Layers {
+			for _, imageLayer := range manifestData.Manifests[0].Manifest.Layers {
 				switch imageLayer.MediaType {
 				case ispec.MediaTypeImageLayerGzip, ispec.MediaTypeImageLayer, string(regTypes.DockerLayer):
 

pkg/extensions/search/convert/metadb.go

@@ -498,7 +498,7 @@ func ImageIndex2ImageSummary(ctx context.Context, repo, tag, digest string, repo
 			indexLastUpdated = *imageManifestSummary.LastUpdated
 		}
 
-		annotations := GetAnnotations(imageManifest.Annotations, imageManifest.ConfigContent.Config.Labels)
+		annotations := GetAnnotations(imageManifest.Manifest.Annotations, imageManifest.Config.Config.Labels)
 
 		if manifestAnnotations == nil {
 			manifestAnnotations = &annotations
@@ -586,7 +586,7 @@ func FullImageIndex2ImageSummary(ctx context.Context, imageData mTypes.FullImage
 			indexLastUpdated = *imageManifestSummary.LastUpdated
 		}
 
-		annotations := GetAnnotations(imageManifest.Annotations, imageManifest.ConfigContent.Config.Labels)
+		annotations := GetAnnotations(imageManifest.Manifest.Annotations, imageManifest.Config.Config.Labels)
 		if manifestAnnotations == nil {
 			manifestAnnotations = &annotations
 		}
@@ -636,28 +636,29 @@ func ImageManifest2ImageSummary(ctx context.Context, repo, tag string, repoMeta
 
 	var (
 		repoName         = repo
-		configDigest     = manifest.Config.Digest.String()
-		configSize       = manifest.Config.Size
+		configDigest     = manifest.Manifest.Config.Digest.String()
+		configSize       = manifest.Manifest.Config.Size
 		manifestDigest   = manifest.Digest.String()
 		manifestSize     = manifest.Size
-		mediaType        = manifest.MediaType
+		mediaType        = manifest.Manifest.MediaType
 		artifactType     = zcommon.GetManifestArtifactType(imageData.Manifests[0].Manifest)
-		platform         = getPlatform(manifest.ConfigContent.Platform)
-		imageLastUpdated = zcommon.GetImageLastUpdated(manifest.ConfigContent)
+		platform         = getPlatform(manifest.Config.Platform)
+		imageLastUpdated = zcommon.GetImageLastUpdated(manifest.Config)
 		downloadCount    = repoMeta.Statistics[manifest.Digest.String()].DownloadCount
 		isSigned         = isImageSigned(repoMeta.Signatures[manifest.Digest.String()])
 	)
 
-	imageSize, imageBlobsMap := getImageBlobsInfo(manifestDigest, manifestSize, configDigest, configSize, manifest.Layers)
+	imageSize, imageBlobsMap := getImageBlobsInfo(manifestDigest, manifestSize, configDigest, configSize,
+		manifest.Manifest.Layers)
 	imageSizeStr := strconv.FormatInt(imageSize, 10)
-	annotations := GetAnnotations(manifest.Annotations, manifest.ConfigContent.Config.Labels)
+	annotations := GetAnnotations(manifest.Manifest.Annotations, manifest.Config.Config.Labels)
 
 	authors := annotations.Authors
 	if authors == "" {
-		authors = manifest.ConfigContent.Author
+		authors = manifest.Config.Author
 	}
 
-	historyEntries, err := getAllHistory(manifest.Manifest, manifest.ConfigContent)
+	historyEntries, err := getAllHistory(manifest.Manifest, manifest.Config)
 	if err != nil {
 		graphql.AddError(ctx, gqlerror.Errorf("error generating history on tag %s in repo %s: "+
 			"manifest digest: %s, error: %s", tag, repo, manifest.Digest, err.Error()))
@@ -712,28 +713,29 @@ func FullImageManifest2ImageSummary(ctx context.Context, imageData mTypes.FullIm
 	var (
 		repoName         = imageData.Repo
 		tag              = imageData.Tag
-		configDigest     = manifest.Config.Digest.String()
-		configSize       = manifest.Config.Size
+		configDigest     = manifest.Manifest.Config.Digest.String()
+		configSize       = manifest.Manifest.Config.Size
 		manifestDigest   = manifest.Digest.String()
 		manifestSize     = manifest.Size
-		mediaType        = manifest.MediaType
+		mediaType        = manifest.Manifest.MediaType
 		artifactType     = zcommon.GetManifestArtifactType(imageData.Manifests[0].Manifest)
-		platform         = getPlatform(manifest.ConfigContent.Platform)
-		imageLastUpdated = zcommon.GetImageLastUpdated(manifest.ConfigContent)
+		platform         = getPlatform(manifest.Config.Platform)
+		imageLastUpdated = zcommon.GetImageLastUpdated(manifest.Config)
 		downloadCount    = imageData.Statistics.DownloadCount
 		isSigned         = isImageSigned(imageData.Signatures)
 	)
 
-	imageSize, imageBlobsMap := getImageBlobsInfo(manifestDigest, manifestSize, configDigest, configSize, manifest.Layers)
+	imageSize, imageBlobsMap := getImageBlobsInfo(manifestDigest, manifestSize, configDigest, configSize,
+		manifest.Manifest.Layers)
 	imageSizeStr := strconv.FormatInt(imageSize, 10)
-	annotations := GetAnnotations(manifest.Annotations, manifest.ConfigContent.Config.Labels)
+	annotations := GetAnnotations(manifest.Manifest.Annotations, manifest.Config.Config.Labels)
 
 	authors := annotations.Authors
 	if authors == "" {
-		authors = manifest.ConfigContent.Author
+		authors = manifest.Config.Author
 	}
 
-	historyEntries, err := getAllHistory(manifest.Manifest, manifest.ConfigContent)
+	historyEntries, err := getAllHistory(manifest.Manifest, manifest.Config)
 	if err != nil {
 		graphql.AddError(ctx, gqlerror.Errorf("error generating history on tag %s in repo %s: "+
 			"manifest digest: %s, error: %s", tag, repoName, manifest.Digest, err.Error()))

pkg/extensions/search/cve/cve.go

@@ -310,12 +310,12 @@ func getConfigAndDigest(metaDB mTypes.MetaDB, manifestDigestStr string) (ispec.I
 		return ispec.Image{}, "", err
 	}
 
-	// we'll fail the execution if the config is not compatibe with ispec.Image because we can't scan this type of images.
-	if manifestData.Manifests[0].Config.MediaType != ispec.MediaTypeImageConfig {
+	// we'll fail the execution if the config is not compatible with ispec.Image because we can't scan this type of images.
+	if manifestData.Manifests[0].Manifest.Config.MediaType != ispec.MediaTypeImageConfig {
 		return ispec.Image{}, "", zerr.ErrWrongMediaType
 	}
 
-	return manifestData.Manifests[0].ConfigContent, manifestDigest, err
+	return manifestData.Manifests[0].Config, manifestDigest, err
 }
 
 func filterCVEList(cveMap map[string]cvemodel.CVE, searchedCVE string, pageFinder *CvePageFinder) {

pkg/extensions/search/cve/cve_test.go

@@ -1082,7 +1082,7 @@ func TestCVEStruct(t *testing.T) { //nolint:gocyclo
 					return false, err
 				}
 
-				for _, imageLayer := range manifestData.Manifests[0].Layers {
+				for _, imageLayer := range manifestData.Manifests[0].Manifest.Layers {
 					switch imageLayer.MediaType {
 					case ispec.MediaTypeImageLayerGzip, ispec.MediaTypeImageLayer, string(regTypes.DockerLayer):
 

pkg/extensions/search/cve/scan_test.go

@@ -380,7 +380,7 @@ func TestScanGeneratorWithMockedData(t *testing.T) { //nolint: gocyclo
 					return false, err
 				}
 
-				for _, imageLayer := range manifestData.Manifests[0].Layers {
+				for _, imageLayer := range manifestData.Manifests[0].Manifest.Layers {
 					switch imageLayer.MediaType {
 					case ispec.MediaTypeImageLayerGzip, ispec.MediaTypeImageLayer, string(regTypes.DockerLayer):
 

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

@@ -247,7 +247,7 @@ func (scanner Scanner) isManifestScanable(digestStr string) (bool, error) {
 		return false, zerr.ErrWrongMediaType
 	}
 
-	for _, imageLayer := range manifestData.Manifests[0].Layers {
+	for _, imageLayer := range manifestData.Manifests[0].Manifest.Layers {
 		switch imageLayer.MediaType {
 		case ispec.MediaTypeImageLayerGzip, ispec.MediaTypeImageLayer, string(regTypes.DockerLayer):
 			continue
@@ -264,11 +264,11 @@ func (scanner Scanner) isManifestDataScannable(manifestData mTypes.ManifestData)
 		return true, nil
 	}
 
-	if manifestData.MediaType != ispec.MediaTypeImageManifest {
+	if manifestData.Manifest.MediaType != ispec.MediaTypeImageManifest {
 		return false, zerr.ErrScanNotSupported
 	}
 
-	for _, imageLayer := range manifestData.Layers {
+	for _, imageLayer := range manifestData.Manifest.Layers {
 		switch imageLayer.MediaType {
 		case ispec.MediaTypeImageLayerGzip, ispec.MediaTypeImageLayer, string(regTypes.DockerLayer):
 			continue

pkg/extensions/search/resolver.go

@@ -90,13 +90,13 @@ func FilterByDigest(digest string) mTypes.FilterFunc {
 
 		// Check the image config matches the search digest
 		// This is a blob with mediaType application/vnd.oci.image.config.v1+json
-		if strings.Contains(manifest.Config.Digest.String(), lookupDigest) {
+		if strings.Contains(manifest.Manifest.Config.Digest.String(), lookupDigest) {
 			contains = true
 		}
 
 		// Check to see if the individual layers in the oci image manifest match the digest
 		// These are blobs with mediaType application/vnd.oci.image.layer.v1.tar+gzip
-		for _, layer := range manifest.Layers {
+		for _, layer := range manifest.Manifest.Layers {
 			if strings.Contains(layer.Digest.String(), lookupDigest) {
 				contains = true
 			}
@@ -118,10 +118,10 @@ func getImageListForDigest(ctx context.Context, digest string, metaDB mTypes.Met
 	}
 
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
 		),
 	}
 
@@ -198,10 +198,10 @@ func getCVEListForImage(
 	}
 
 	pageInput := cvemodel.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: cvemodel.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaSeverity),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaSeverity),
 		),
 	}
 
@@ -365,10 +365,10 @@ func getImageListForCVE(
 
 	// Actual page requested by user
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
 		),
 	}
 
@@ -438,10 +438,10 @@ func getImageListWithCVEFixed(
 
 	// Actual page requested by user
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
 		),
 	}
 
@@ -484,10 +484,10 @@ func repoListWithNewestImage(
 	}
 
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
 		),
 	}
 
@@ -576,10 +576,10 @@ func getFilteredPaginatedRepos(
 	}
 
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
 		),
 	}
 
@@ -638,10 +638,10 @@ func globalSearch(ctx context.Context, query string, metaDB mTypes.MetaDB, filte
 		}
 
 		pageInput := pagination.PageInput{
-			Limit:  safeDereferencing(requestedPage.Limit, 0),
-			Offset: safeDereferencing(requestedPage.Offset, 0),
+			Limit:  deref(requestedPage.Limit, 0),
+			Offset: deref(requestedPage.Offset, 0),
 			SortBy: pagination.SortCriteria(
-				safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
+				deref(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
 			),
 		}
 
@@ -677,10 +677,10 @@ func globalSearch(ctx context.Context, query string, metaDB mTypes.MetaDB, filte
 		}
 
 		pageInput := pagination.PageInput{
-			Limit:  safeDereferencing(requestedPage.Limit, 0),
-			Offset: safeDereferencing(requestedPage.Offset, 0),
+			Limit:  deref(requestedPage.Limit, 0),
+			Offset: deref(requestedPage.Offset, 0),
 			SortBy: pagination.SortCriteria(
-				safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
+				deref(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
 			),
 		}
 
@@ -721,10 +721,10 @@ func derivedImageList(ctx context.Context, image string, digest *string, metaDB
 	}
 
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
 		),
 	}
 
@@ -785,7 +785,7 @@ func filterDerivedImages(image *gql_generated.ImageSummary) mTypes.FilterFunc {
 			imageLayers := image.Manifests[i].Layers
 
 			addImageToList = false
-			layers := imageManifest.Layers
+			layers := imageManifest.Manifest.Layers
 
 			sameLayer := 0
 
@@ -821,10 +821,10 @@ func baseImageList(ctx context.Context, image string, digest *string, metaDB mTy
 	}
 
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaUpdateTime),
 		),
 	}
 
@@ -886,7 +886,7 @@ func filterBaseImages(image *gql_generated.ImageSummary) mTypes.FilterFunc {
 
 			addImageToList = true
 
-			for _, l := range manifest.Layers {
+			for _, l := range manifest.Manifest.Layers {
 				foundLayer := false
 
 				for _, k := range image.Manifests[i].Layers {
@@ -1096,7 +1096,7 @@ func (p timeSlice) Swap(i, j int) {
 	p[i], p[j] = p[j], p[i]
 }
 
-func safeDereferencing[T any](pointer *T, defaultVal T) T {
+func deref[T any](pointer *T, defaultVal T) T {
 	if pointer != nil {
 		return *pointer
 	}
@@ -1120,10 +1120,10 @@ func getImageList(ctx context.Context, repo string, metaDB mTypes.MetaDB, cveInf
 	}
 
 	pageInput := pagination.PageInput{
-		Limit:  safeDereferencing(requestedPage.Limit, 0),
-		Offset: safeDereferencing(requestedPage.Offset, 0),
+		Limit:  deref(requestedPage.Limit, 0),
+		Offset: deref(requestedPage.Offset, 0),
 		SortBy: pagination.SortCriteria(
-			safeDereferencing(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
+			deref(requestedPage.SortBy, gql_generated.SortCriteriaRelevance),
 		),
 	}
 

pkg/extensions/search/resolver_test.go

@@ -2065,7 +2065,7 @@ func TestMockedBaseImageList(t *testing.T) {
 	})
 }
 
-func TestExpandedRepoInfo(t *testing.T) {
+func TestExpandedRepoInfoErrors(t *testing.T) {
 	log := log.NewLogger("debug", "")
 
 	Convey("Access error", t, func() {