Fix oci dest test

Signed-off-by: Ayato Tokubi <[email protected]>

Author: bitoku

image/oci/layout/fixtures/single_image_layout/blobs/sha256/0c8b263642b51b5c1dc40fe402ae2e97119c6007b6e52146419985ec1f0092dc

@@ -0,0 +1 @@
+insert binary content here #9671

image/oci/layout/fixtures/single_image_layout/blobs/sha256/a527179158cd5cebc11c152b8637b47ce96c838ba2aa0de66d14f45cedc11423

@@ -0,0 +1,30 @@
+{
+  "created": "2019-08-20T20:19:55.211423266Z",
+  "architecture": "amd64",
+  "os": "linux",
+  "config": {
+    "Env": [
+      "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+    ],
+    "Cmd": [
+      "/bin/sh"
+    ]
+  },
+  "rootfs": {
+    "type": "layers",
+    "diff_ids": [
+      "sha256:03901b4a2ea88eeaad62dbe59b072b28b6efa00491962b8741081c5df50c65e0"
+    ]
+  },
+  "history": [
+    {
+      "created": "2019-08-20T20:19:55.062606894Z",
+      "created_by": "/bin/sh -c #(nop) ADD file:fe64057fbb83dccb960efabbf1cd8777920ef279a7fa8dbca0a8801c651bdf7c in / "
+    },
+    {
+      "created": "2019-08-20T20:19:55.211423266Z",
+      "created_by": "/bin/sh -c #(nop)  CMD [\"/bin/sh\"]",
+      "empty_layer": true
+    }
+  ]
+}

image/oci/layout/fixtures/single_image_layout/blobs/sha256/eaa95f3cfaac07c8a5153eb77c933269586ad0226c83405776be08547e4d2a18

@@ -0,0 +1,16 @@
+{
+  "schemaVersion": 2,
+  "mediaType": "application/vnd.oci.image.manifest.v1+json",
+  "config": {
+    "mediaType": "application/vnd.oci.image.config.v1+json",
+    "digest": "sha256:a527179158cd5cebc11c152b8637b47ce96c838ba2aa0de66d14f45cedc11423",
+    "size": 585
+  },
+  "layers": [
+    {
+      "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
+      "digest": "sha256:0c8b263642b51b5c1dc40fe402ae2e97119c6007b6e52146419985ec1f0092dc",
+      "size": 33
+    }
+  ]
+}

image/oci/layout/fixtures/single_image_layout/index.json

@@ -0,0 +1,13 @@
+{
+  "schemaVersion": 2,
+  "manifests": [
+    {
+      "mediaType": "application/vnd.oci.image.manifest.v1+json",
+      "digest": "sha256:eaa95f3cfaac07c8a5153eb77c933269586ad0226c83405776be08547e4d2a18",
+      "size": 476,
+      "annotations": {
+        "org.opencontainers.image.ref.name": "latest"
+      }
+    }
+  ]
+}

image/oci/layout/fixtures/single_image_layout/oci-layout

@@ -0,0 +1 @@
+{"imageLayoutVersion": "1.0.0"}

image/oci/layout/oci_dest_test.go

@@ -220,11 +220,46 @@ func TestPutblobFromLocalFile(t *testing.T) {
 
 // TestPutSignaturesWithFormat tests that sigstore signatures are properly stored in OCI layout
 func TestPutSignaturesWithFormat(t *testing.T) {
-	ref, tmpDir := refToTempOCI(t, false)
-	ociRef, ok := ref.(ociReference)
+	tmpDir := loadFixture(t, "single_image_layout")
+	ref, err := NewReference(tmpDir, "latest")
+	require.NoError(t, err)
+	dest, err := ref.NewImageDestination(context.Background(), nil)
+	require.NoError(t, err)
+	defer dest.Close()
+	ociDest, ok := dest.(*ociImageDestination)
 	require.True(t, ok)
-	putTestManifest(t, ociRef, tmpDir)
 
+	desc, _, err := ociDest.ref.getManifestDescriptor()
+	require.NoError(t, err)
+	require.NotNil(t, desc)
+
+	sigstoreSign := signature.SigstoreFromComponents(
+		"application/vnd.dev.cosign.simplesigning.v1+json",
+		[]byte("test-payload"),
+		map[string]string{"dev.cosignproject.cosign/signature": "test-signature"},
+	)
+
+	err = ociDest.PutSignaturesWithFormat(context.Background(), []signature.Signature{sigstoreSign}, &desc.Digest)
+	require.NoError(t, err)
+
+	err = ociDest.Commit(context.Background(), nil)
+	require.NoError(t, err)
+
+	src, err := ref.NewImageSource(context.Background(), nil)
+	require.NoError(t, err)
+	ociSrc, ok := src.(*ociImageSource)
+	require.True(t, ok)
+	sign, err := ociSrc.GetSignaturesWithFormat(context.Background(), &desc.Digest)
+	require.NoError(t, err)
+	require.Len(t, sign, 1)
+	require.Equal(t, sigstoreSign, sign[0])
+}
+
+// TestPutSignaturesWithFormatTwice tests PutSignaturesWithFormat twice and checks
+func TestPutSignaturesWithFormatTwice(t *testing.T) {
+	tmpDir := loadFixture(t, "single_image_layout")
+	ref, err := NewReference(tmpDir, "latest")
+	require.NoError(t, err)
 	dest, err := ref.NewImageDestination(context.Background(), nil)
 	require.NoError(t, err)
 	defer dest.Close()
@@ -240,20 +275,31 @@ func TestPutSignaturesWithFormat(t *testing.T) {
 		[]byte("test-payload"),
 		map[string]string{"dev.cosignproject.cosign/signature": "test-signature"},
 	)
+	sigstoreSign2 := signature.SigstoreFromComponents(
+		"application/vnd.dev.cosign.simplesigning.v1+json",
+		[]byte("test-payload2"),
+		map[string]string{"dev.cosignproject.cosign/signature": "test-signature"},
+	)
 
 	err = ociDest.PutSignaturesWithFormat(context.Background(), []signature.Signature{sigstoreSign}, &desc.Digest)
 	require.NoError(t, err)
 
 	err = ociDest.Commit(context.Background(), nil)
 	require.NoError(t, err)
 
+	err = ociDest.PutSignaturesWithFormat(context.Background(), []signature.Signature{sigstoreSign, sigstoreSign2}, &desc.Digest)
+	require.NoError(t, err)
+
+	err = ociDest.Commit(context.Background(), nil)
+	require.NoError(t, err)
+
 	src, err := ref.NewImageSource(context.Background(), nil)
 	require.NoError(t, err)
 	ociSrc, ok := src.(*ociImageSource)
 	require.True(t, ok)
 	sign, err := ociSrc.GetSignaturesWithFormat(context.Background(), &desc.Digest)
 	require.NoError(t, err)
-	require.Len(t, sign, 1)
+	require.Len(t, sign, 2)
 	require.Equal(t, sigstoreSign, sign[0])
 }