Fix delete of empty layer manifest (opencontainers#428)

Signed-off-by: Brandon Mitchell <git@bmitch.net>
sudo-bmitch · Aug 18, 2023 · 68b9389 · 68b9389
1 parent 1d6a0df
commit 68b9389
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/conformance/02_push_test.go b/conformance/02_push_test.go
@@ -393,7 +393,7 @@ var test02Push = func() {
 						Equal(http.StatusMethodNotAllowed),
 					))
 					if emptyLayerManifestRef != "" {
-						req = client.NewRequest(reggie.DELETE, emptyLayerManifestRef)
+						req = client.NewRequest(reggie.DELETE, "/v2/<name>/manifests/<reference>", reggie.WithReference(emptyLayerManifestDigest))
 						resp, err = client.Do(req)
 						Expect(err).To(BeNil())
 						Expect(resp.StatusCode()).To(SatisfyAny(
@@ -452,7 +452,7 @@ var test02Push = func() {
 						Equal(http.StatusMethodNotAllowed),
 					))
 					if emptyLayerManifestRef != "" {
-						req = client.NewRequest(reggie.DELETE, emptyLayerManifestRef)
+						req = client.NewRequest(reggie.DELETE, "/v2/<name>/manifests/<reference>", reggie.WithReference(emptyLayerManifestDigest))
 						resp, err = client.Do(req)
 						Expect(err).To(BeNil())
 						Expect(resp.StatusCode()).To(SatisfyAny(

diff --git a/conformance/setup.go b/conformance/setup.go
@@ -133,6 +133,7 @@ var (
 	layerBlobDigest                    string
 	layerBlobContentLength             string
 	emptyLayerManifestContent          []byte
+	emptyLayerManifestDigest           string
 	nonexistentManifest                string
 	emptyJSONBlob                      []byte
 	emptyJSONDescriptor                Descriptor
@@ -299,6 +300,7 @@ func init() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	emptyLayerManifestDigest = string(godigest.FromBytes(emptyLayerManifestContent))
 
 	nonexistentManifest = ".INVALID_MANIFEST_NAME"
 	invalidManifestContent = []byte("blablabla")