Add schema2 list support

image/docker/schema2/test/test_list.py

@@ -0,0 +1,70 @@
+import json
+import pytest
+
+from image.docker.schema1 import DockerSchema1Manifest
+from image.docker.schema2.manifest import DockerSchema2Manifest
+from image.docker.schema2.list import MalformedSchema2ManifestList, DockerSchema2ManifestList
+from image.docker.schema2.test.test_manifest import MANIFEST_BYTES as v22_bytes
+from image.docker.test.test_schema1 import MANIFEST_BYTES as v21_bytes
+
+@pytest.mark.parametrize('json_data', [
+  '',
+  '{}',
+  """
+  {
+    "unknown": "key"
+  }
+  """,
+])
+def test_malformed_manifest_lists(json_data):
+  with pytest.raises(MalformedSchema2ManifestList):
+    DockerSchema2ManifestList(json_data)
+
+
+MANIFESTLIST_BYTES = json.dumps({
+  "schemaVersion": 2,
+  "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
+  "manifests": [
+    {
+      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
+      "size": 983,
+      "digest": "sha256:e6",
+      "platform": {
+        "architecture": "ppc64le",
+        "os": "linux",
+      }
+    },
+    {
+      "mediaType": "application/vnd.docker.distribution.manifest.v1+json",
+      "size": 878,
+      "digest": "sha256:5b",
+      "platform": {
+        "architecture": "amd64",
+        "os": "linux",
+        "features": [
+          "sse4"
+        ]
+      }
+    }
+  ]
+})
+
+def test_valid_manifestlist():
+  def _get_manifest(digest):
+    if digest == 'sha256:e6':
+      return v22_bytes
+    else:
+      return v21_bytes
+
+  manifestlist = DockerSchema2ManifestList(MANIFESTLIST_BYTES)
+  assert len(manifestlist.manifests(_get_manifest)) == 2
+
+  for index, manifest in enumerate(manifestlist.manifests(_get_manifest)):
+    if index == 0:
+      assert isinstance(manifest.manifest_obj, DockerSchema2Manifest)
+      assert manifest.manifest_obj.schema_version == 2
+    else:
+      assert isinstance(manifest.manifest_obj, DockerSchema1Manifest)
+      assert manifest.manifest_obj.schema_version == 1
+
+  assert manifestlist.get_v1_compatible_manifest(_get_manifest).manifest_obj.schema_version == 1

image/docker/schema2/test/test_manifest.py

@@ -25,7 +25,7 @@ MANIFEST_BYTES = json.dumps({
   "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
   "config": {
     "mediaType": "application/vnd.docker.container.image.v1+json",
-    "size": 7023,
+    "size": 1885,
     "digest": "sha256:b5b2b2c507a0944348e0303114d8d93aaaa081732b86451d9bce1f432a537bc7"
   },
   "layers": [
@@ -55,7 +55,7 @@ MANIFEST_BYTES = json.dumps({
 
 def test_valid_manifest():
   manifest = DockerSchema2Manifest(MANIFEST_BYTES)
-  assert manifest.config.size == 7023
+  assert manifest.config.size == 1885
   assert str(manifest.config.digest) == 'sha256:b5b2b2c507a0944348e0303114d8d93aaaa081732b86451d9bce1f432a537bc7'
   
   assert len(manifest.layers) == 4