Update per opencontainers/artifacts#29

Signed-off-by: Aviral Takkar <[email protected]>

Author: aviral26

go.mod

@@ -2,7 +2,7 @@ module github.com/docker/distribution
 
 go 1.12
 
-replace github.com/opencontainers/artifacts => github.com/aviral26/artifacts v0.0.0-20210401062346-2b83ac8c6d72
+replace github.com/opencontainers/artifacts => github.com/aviral26/artifacts v0.0.3
 
 require (
 	github.com/Azure/azure-sdk-for-go v16.2.1+incompatible

go.sum

@@ -8,8 +8,8 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/O
 github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/aviral26/artifacts v0.0.0-20210401062346-2b83ac8c6d72 h1:wdeNiQZOLF3PTtEQ2xndkMV7kQC1qejSdZidszgWpaY=
-github.com/aviral26/artifacts v0.0.0-20210401062346-2b83ac8c6d72/go.mod h1:IBQOjhxIKxb9G4h9NiWAJLGBgKPlIy27tcpPDTAfUQw=
+github.com/aviral26/artifacts v0.0.3 h1:F+XBw93sXm9H7iajUEl0DhbbvCg2e/k6e4lVY2EYhC4=
+github.com/aviral26/artifacts v0.0.3/go.mod h1:IBQOjhxIKxb9G4h9NiWAJLGBgKPlIy27tcpPDTAfUQw=
 github.com/aws/aws-sdk-go v1.15.11 h1:m45+Ru/wA+73cOZXiEGLDH2d9uLN3iHqMc0/z4noDXE=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

manifest/artifact/artifact.go

@@ -14,7 +14,7 @@ import (
 // ArtifactVersion provides a pre-initialized version structure for this
 // packages Artifact version of the manifest.
 var ArtifactVersion = manifest.Versioned{
-	SchemaVersion: 2,
+	SchemaVersion: 3,
 	MediaType:     v2.MediaTypeArtifactManifest,
 }
 
@@ -62,30 +62,16 @@ func (a Artifact) References() []distribution.Descriptor {
 			Size:      a.inner.Blobs[i].Size,
 		}
 	}
-
-	if a.inner.Config != nil {
-		blobs = append(blobs, distribution.Descriptor{
-			MediaType: a.inner.Config.MediaType,
-			Digest:    a.inner.Config.Digest,
-			Size:      a.inner.Config.Size,
-		})
-	}
-
 	return blobs
 }
 
-// Manifests returns the distribution descriptors for the manifests that this artifact is linked to.
-func (a Artifact) Manifests() []distribution.Descriptor {
-	dependsOn := make([]distribution.Descriptor, len(a.inner.Manifests))
-	for i := range a.inner.Manifests {
-		dependsOn[i] = distribution.Descriptor{
-			MediaType: a.inner.Manifests[i].MediaType,
-			Digest:    a.inner.Manifests[i].Digest,
-			Size:      a.inner.Manifests[i].Size,
-		}
+// SubjectManifest returns the the subject manifest this artifact is linked to.
+func (a Artifact) SubjectManifest() distribution.Descriptor {
+	return distribution.Descriptor{
+		MediaType: a.inner.SubjectManifest.MediaType,
+		Digest:    a.inner.SubjectManifest.Digest,
+		Size:      a.inner.SubjectManifest.Size,
 	}
-
-	return dependsOn
 }
 
 // DeserializedArtifact wraps Artifact with a copy of the original JSON.

registry/api/v2/descriptors.go

@@ -707,7 +707,7 @@ var routeDescriptors = []RouteDescriptor{
 
 	{
 		Name:        RouteNameManifestLinkedArtifacts,
-		Path:        "/v2/_ext/oci-artifacts/v1/{name:" + reference.NameRegexp.String() + "}/manifests/{reference:" + reference.TagRegexp.String() + "|" + digest.DigestRegexp.String() + "}/references",
+		Path:        "/v2/_ext/oci-artifacts/v1-rc1/{name:" + reference.NameRegexp.String() + "}/manifests/{reference:" + reference.TagRegexp.String() + "|" + digest.DigestRegexp.String() + "}/referrers",
 		Entity:      "Linked artifacts",
 		Description: "Retrieve information about artifacts linked to this manifest.",
 		Methods: []MethodDescriptor{
@@ -728,7 +728,7 @@ var routeDescriptors = []RouteDescriptor{
 						},
 						QueryParameters: []ParameterDescriptor{
 							{
-								Name:        "artifact-type",
+								Name:        "referenceType",
 								Type:        "query",
 								Format:      "<artifactType>",
 								Description: `Artifact type of the requested linked artifacts.`,

registry/handlers/referrers.go

@@ -55,7 +55,7 @@ func (mrmh *referrersHandler) Artifacts(w http.ResponseWriter, r *http.Request)
 	dcontext.GetLogger(mrmh).Debug("Artifacts")
 
 	// This can be empty
-	artifactType := r.FormValue("artifact-type")
+	artifactType := r.FormValue("referenceType")
 
 	if mrmh.Tag != "" {
 		tags := mrmh.Repository.Tags(mrmh)

registry/storage/manifeststore.go

@@ -116,8 +116,6 @@ func (ms *manifestStore) Get(ctx context.Context, dgst digest.Digest, options ..
 			return ms.ocischemaHandler.Unmarshal(ctx, dgst, content)
 		case manifestlist.MediaTypeManifestList, v1.MediaTypeImageIndex:
 			return ms.manifestListHandler.Unmarshal(ctx, dgst, content)
-		case v2.MediaTypeArtifactManifest:
-			return ms.ociArtifactHandler.Unmarshal(ctx, dgst, content)
 		case "":
 			// OCI image or image index - no media type in the content
 
@@ -133,6 +131,11 @@ func (ms *manifestStore) Get(ctx context.Context, dgst digest.Digest, options ..
 		default:
 			return nil, distribution.ErrManifestVerification{fmt.Errorf("unrecognized manifest content type %s", versioned.MediaType)}
 		}
+	case 3:
+		switch versioned.MediaType {
+		case v2.MediaTypeArtifactManifest:
+			return ms.ociArtifactHandler.Unmarshal(ctx, dgst, content)
+		}
 	}
 
 	return nil, fmt.Errorf("unrecognized manifest schema version %d", versioned.SchemaVersion)

registry/storage/ociartifacthandler.go

@@ -92,16 +92,13 @@ func (ah *ociArtifactHandler) verifyManifest(ctx context.Context, da artifact.De
 			return err
 		}
 
-		// All manifests to link to must exist.
-		for _, manifestDesc := range da.Manifests() {
-			exists, err := manifestService.Exists(ctx, manifestDesc.Digest)
-			if err != nil {
-				errs = append(errs, err)
-			} else {
-				if !exists {
-					errs = append(errs, distribution.ErrManifestUnknownRevision{Revision: manifestDesc.Digest})
-				}
-			}
+		// Validate subject manifest.
+		subject := da.SubjectManifest()
+		exists, err := manifestService.Exists(ctx, subject.Digest)
+		if !exists || err == distribution.ErrBlobUnknown {
+			errs = append(errs, distribution.ErrManifestBlobUnknown{Digest: subject.Digest})
+		} else if err != nil {
+			errs = append(errs, err)
 		}
 	}
 
@@ -114,11 +111,12 @@ func (ah *ociArtifactHandler) verifyManifest(ctx context.Context, da artifact.De
 
 func (ah *ociArtifactHandler) linkManifests(ctx context.Context, da artifact.DeserializedArtifact, revision digest.Digest) error {
 	daArtifactType := da.ArtifactType()
-	// Link the artifact as referrer metadata to each dependsOn manifest.
-	for _, manifestDesc := range da.Manifests() {
-		if err := ah.referrersStoreFunc(manifestDesc.Digest, daArtifactType).linkBlob(ctx, distribution.Descriptor{Digest: revision}); err != nil {
-			return err
-		}
+
+	// Index referrer metadata for the subject.
+	subject := da.SubjectManifest()
+	if err := ah.referrersStoreFunc(subject.Digest, daArtifactType).linkBlob(ctx, distribution.Descriptor{Digest: revision}); err != nil {
+		return err
 	}
+
 	return nil
 }