gc: fix test cases since umoci GC is more strict

umoci GC enforces a valid index.json and current tests were a little
lax.

pkg/compliance/v1_0_0/check.go

@@ -481,7 +481,20 @@ func CheckWorkflows(t *testing.T, config *compliance.Config) {
 			So(resp.StatusCode(), ShouldEqual, 404)
 
 			// create a manifest
-			m := ispec.Manifest{Layers: []ispec.Descriptor{{Digest: digest}}}
+			m := ispec.Manifest{
+				Config: ispec.Descriptor{
+					Digest: digest,
+					Size:   int64(len(content)),
+				},
+				Layers: []ispec.Descriptor{
+					{
+						MediaType: "application/vnd.oci.image.layer.v1.tar",
+						Digest:    digest,
+						Size:      int64(len(content)),
+					},
+				},
+			}
+			m.SchemaVersion = 2
 			content, err = json.Marshal(m)
 			So(err, ShouldBeNil)
 			digest = godigest.FromBytes(content)
@@ -498,7 +511,20 @@ func CheckWorkflows(t *testing.T, config *compliance.Config) {
 			digest = godigest.FromBytes(content)
 			So(digest, ShouldNotBeNil)
 			// create a manifest with same blob but a different tag
-			m = ispec.Manifest{Layers: []ispec.Descriptor{{Digest: digest}}}
+			m = ispec.Manifest{
+				Config: ispec.Descriptor{
+					Digest: digest,
+					Size:   int64(len(content)),
+				},
+				Layers: []ispec.Descriptor{
+					{
+						MediaType: "application/vnd.oci.image.layer.v1.tar",
+						Digest:    digest,
+						Size:      int64(len(content)),
+					},
+				},
+			}
+			m.SchemaVersion = 2
 			content, err = json.Marshal(m)
 			So(err, ShouldBeNil)
 			digest = godigest.FromBytes(content)
@@ -599,7 +625,20 @@ func CheckWorkflows(t *testing.T, config *compliance.Config) {
 				So(resp.Header().Get(api.DistContentDigestKey), ShouldNotBeEmpty)
 
 				// create a manifest
-				m := ispec.Manifest{Layers: []ispec.Descriptor{{Digest: digest}}}
+				m := ispec.Manifest{
+					Config: ispec.Descriptor{
+						Digest: digest,
+						Size:   int64(len(content)),
+					},
+					Layers: []ispec.Descriptor{
+						{
+							MediaType: "application/vnd.oci.image.layer.v1.tar",
+							Digest:    digest,
+							Size:      int64(len(content)),
+						},
+					},
+				}
+				m.SchemaVersion = 2
 				content, err = json.Marshal(m)
 				So(err, ShouldBeNil)
 				digest = godigest.FromBytes(content)

pkg/storage/storage.go

@@ -15,9 +15,9 @@ import (
 	"github.com/anuvu/zot/errors"
 	zlog "github.com/anuvu/zot/pkg/log"
 	guuid "github.com/gofrs/uuid"
+	"github.com/openSUSE/umoci"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/openSUSE/umoci"
 	"github.com/rs/zerolog"
 )
 
@@ -335,6 +335,11 @@ func (is *ImageStore) PutImageManifest(repo string, reference string, mediaType
 		return "", errors.ErrBadManifest
 	}
 
+	if m.SchemaVersion != 2 {
+		is.log.Error().Int("SchemaVersion", m.SchemaVersion).Msg("invalid manifest")
+		return "", errors.ErrBadManifest
+	}
+
 	for _, l := range m.Layers {
 		digest := l.Digest
 		blobPath := is.BlobPath(repo, digest)

pkg/storage/storage_test.go

@@ -105,6 +105,7 @@ func TestAPIs(t *testing.T) {
 				So(err, ShouldBeNil)
 
 				m := ispec.Manifest{}
+				m.SchemaVersion = 2
 				mb, _ := json.Marshal(m)
 
 				Convey("Bad image manifest", func() {
@@ -116,7 +117,20 @@ func TestAPIs(t *testing.T) {
 				})
 
 				Convey("Good image manifest", func() {
-					m := ispec.Manifest{Layers: []ispec.Descriptor{{Digest: d}}}
+					m := ispec.Manifest{
+						Config: ispec.Descriptor{
+							Digest: d,
+							Size:   int64(l),
+						},
+						Layers: []ispec.Descriptor{
+							{
+								MediaType: "application/vnd.oci.image.layer.v1.tar",
+								Digest:    d,
+								Size:      int64(l),
+							},
+						},
+					}
+					m.SchemaVersion = 2
 					mb, _ = json.Marshal(m)
 					d := godigest.FromBytes(mb)
 					_, err = il.PutImageManifest("test", d.String(), ispec.MediaTypeImageManifest, mb)