Add ArtifactType in index

Author: laurentiuNiculae

pkg/storage/common.go

@@ -16,8 +16,8 @@ import (
 	"github.com/sigstore/cosign/pkg/oci/remote"
 
 	zerr "zotregistry.io/zot/errors"
-	"zotregistry.io/zot/pkg/scheduler"
 	zcommon "zotregistry.io/zot/pkg/common"
+	"zotregistry.io/zot/pkg/scheduler"
 	storageConstants "zotregistry.io/zot/pkg/storage/constants"
 )
 
@@ -59,19 +59,21 @@ func GetManifestDescByReference(index ispec.Index, reference string) (ispec.Desc
 
 func ValidateManifest(imgStore ImageStore, repo, reference, mediaType string, body []byte,
 	log zerolog.Logger,
-) (godigest.Digest, error) {
+) (ispec.Descriptor, error) {
 	// validate the manifest
 	if !IsSupportedMediaType(mediaType) {
 		log.Debug().Interface("actual", mediaType).
 			Msg("bad manifest media type")
 
-		return "", zerr.ErrBadManifest
+		return ispec.Descriptor{}, zerr.ErrBadManifest
 	}
 
+	var descriptor ispec.Descriptor
+
 	if len(body) == 0 {
 		log.Debug().Int("len", len(body)).Msg("invalid body length")
 
-		return "", zerr.ErrBadManifest
+		return ispec.Descriptor{}, zerr.ErrBadManifest
 	}
 
 	switch mediaType {
@@ -80,15 +82,15 @@ func ValidateManifest(imgStore ImageStore, repo, reference, mediaType string, bo
 		if err := json.Unmarshal(body, &manifest); err != nil {
 			log.Error().Err(err).Msg("unable to unmarshal JSON")
 
-			return "", zerr.ErrBadManifest
+			return ispec.Descriptor{}, zerr.ErrBadManifest
 		}
 
 		if manifest.Config.MediaType == ispec.MediaTypeImageConfig {
 			digest, err := validateOCIManifest(imgStore, repo, reference, &manifest, log)
 			if err != nil {
 				log.Error().Err(err).Msg("invalid oci image manifest")
 
-				return digest, err
+				return ispec.Descriptor{Digest: digest}, err
 			}
 		}
 
@@ -97,19 +99,33 @@ func ValidateManifest(imgStore ImageStore, repo, reference, mediaType string, bo
 			if err := json.Unmarshal(body, &m); err != nil {
 				log.Error().Err(err).Msg("unable to unmarshal JSON")
 
-				return "", zerr.ErrBadManifest
+				return ispec.Descriptor{}, zerr.ErrBadManifest
 			}
 		}
+
+		descriptor = ispec.Descriptor{
+			MediaType:    mediaType,
+			Digest:       godigest.FromBytes(body),
+			Size:         int64(len(body)),
+			ArtifactType: zcommon.GetManifestArtifactType(manifest),
+		}
 	case oras.MediaTypeArtifactManifest:
 		var m oras.Descriptor
 		if err := json.Unmarshal(body, &m); err != nil {
 			log.Error().Err(err).Msg("unable to unmarshal JSON")
 
-			return "", zerr.ErrBadManifest
+			return ispec.Descriptor{}, zerr.ErrBadManifest
+		}
+
+		descriptor = ispec.Descriptor{
+			MediaType:    mediaType,
+			Digest:       godigest.FromBytes(body),
+			Size:         int64(len(body)),
+			ArtifactType: m.ArtifactType,
 		}
 	}
 
-	return "", nil
+	return descriptor, nil
 }
 
 func validateOCIManifest(imgStore ImageStore, repo, reference string, manifest *ispec.Manifest, //nolint:unparam

pkg/storage/local/local.go

@@ -467,9 +467,9 @@ func (is *ImageStoreLocal) PutImageManifest(repo, reference, mediaType string, /
 	is.Lock(&lockLatency)
 	defer is.Unlock(&lockLatency)
 
-	digest, err := storage.ValidateManifest(is, repo, reference, mediaType, body, is.log)
+	desc, err := storage.ValidateManifest(is, repo, reference, mediaType, body, is.log)
 	if err != nil {
-		return digest, err
+		return desc.Digest, err
 	}
 
 	refIsDigest := true
@@ -488,11 +488,6 @@ func (is *ImageStoreLocal) PutImageManifest(repo, reference, mediaType string, /
 		return "", err
 	}
 
-	// create a new descriptor
-	desc := ispec.Descriptor{
-		MediaType: mediaType, Size: int64(len(body)), Digest: mDigest,
-	}
-
 	if !refIsDigest {
 		desc.Annotations = map[string]string{ispec.AnnotationRefName: reference}
 	}

pkg/storage/s3/s3.go

@@ -372,9 +372,9 @@ func (is *ObjectStorage) PutImageManifest(repo, reference, mediaType string, //n
 	is.Lock(&lockLatency)
 	defer is.Unlock(&lockLatency)
 
-	dig, err := storage.ValidateManifest(is, repo, reference, mediaType, body, is.log)
+	desc, err := storage.ValidateManifest(is, repo, reference, mediaType, body, is.log)
 	if err != nil {
-		return dig, err
+		return desc.Digest, err
 	}
 
 	refIsDigest := true
@@ -393,11 +393,6 @@ func (is *ObjectStorage) PutImageManifest(repo, reference, mediaType string, //n
 		return "", err
 	}
 
-	// create a new descriptor
-	desc := ispec.Descriptor{
-		MediaType: mediaType, Size: int64(len(body)), Digest: mDigest,
-	}
-
 	if !refIsDigest {
 		desc.Annotations = map[string]string{ispec.AnnotationRefName: reference}
 	}