Enhancements for Docker schema implementations in preparing for supporting schema 2 in the OCI model

This adds additional required properties and methods to the Docker schema interface to allow us to treat both schema1 and schema2 manifests and lists logically equivalent from the OCI mode perspective

image/docker/schema2/test/test_manifest.py

@@ -4,7 +4,8 @@ import pytest
 from app import docker_v2_signing_key
 from image.docker.schema1 import (DockerSchema1ManifestBuilder,
                                   DOCKER_SCHEMA1_SIGNED_MANIFEST_CONTENT_TYPE)
-from image.docker.schema2.manifest import MalformedSchema2Manifest, DockerSchema2Manifest
+from image.docker.schema2.manifest import (MalformedSchema2Manifest, DockerSchema2Manifest,
+                                           DockerSchema2ManifestBuilder)
 from image.docker.schema2.test.test_config import CONFIG_BYTES
 
 @pytest.mark.parametrize('json_data', [
@@ -71,8 +72,41 @@ def test_valid_manifest():
   assert manifest.leaf_layer.compressed_size == 73109
 
   blob_digests = list(manifest.blob_digests)
-  assert len(blob_digests) == len(manifest.layers)
-  assert blob_digests == [str(layer.digest) for layer in manifest.layers]
+  assert len(blob_digests) == len(manifest.layers) + 1
+
+  expected = [str(layer.digest) for layer in manifest.layers] + [manifest.config.digest]
+  assert blob_digests == expected
+
+
+def test_schema2_builder():
+  manifest = DockerSchema2Manifest(MANIFEST_BYTES)
+
+  builder = DockerSchema2ManifestBuilder()
+  builder.set_config_digest(manifest.config.digest, manifest.config.size)
+
+  for layer in manifest.layers:
+    builder.add_layer(layer.digest, layer.compressed_size, urls=layer.urls)
+
+  built = builder.build()
+  assert built.layers == manifest.layers
+  assert built.config == manifest.config
+
+
+def test_get_manifest_labels():
+  labels = dict(foo='bar', baz='meh')
+
+  def _lookup_config(digest):
+    config_str = json.dumps({
+      "config": {
+        "Labels": labels,
+      },
+      "rootfs": {"type": "layers", "diff_ids": []},
+      "history": [],
+    })
+    return config_str + ' ' * (1885 - len(config_str))
+
+  manifest = DockerSchema2Manifest(MANIFEST_BYTES)
+  assert manifest.get_manifest_labels(_lookup_config) == labels
 
 
 def test_build_schema1():
@@ -85,7 +119,8 @@ def test_build_schema1():
   assert schema1.media_type == DOCKER_SCHEMA1_SIGNED_MANIFEST_CONTENT_TYPE
   assert len(schema1.layers) == len(manifest.layers)
   assert set(schema1.image_ids) == set([l.v1_id for l in manifest.layers_with_v1_ids])
-  assert set(schema1.parent_image_ids) == set([l.v1_parent_id for l in manifest.layers_with_v1_ids if l.v1_parent_id])
+  assert set(schema1.parent_image_ids) == set([l.v1_parent_id for l in
+                                               manifest.layers_with_v1_ids if l.v1_parent_id])
 
   manifest_layers = list(manifest.layers_with_v1_ids)
   for index, layer in enumerate(schema1.layers):
@@ -95,3 +130,45 @@ def test_build_schema1():
 
   for index, digest in enumerate(schema1.blob_digests):
     assert digest == str(list(manifest.blob_digests)[index])
+
+
+def test_generate_legacy_layers():
+  builder = DockerSchema2ManifestBuilder()
+  builder.add_layer('sha256:abc123', 123)
+  builder.add_layer('sha256:def456', 789)
+  builder.set_config_digest('sha256:def456', 2000)
+  manifest = builder.build()
+
+  def _lookup_config(digest):
+    config_str = json.dumps({
+      "config": {
+      },
+      "rootfs": {"type": "layers", "diff_ids": []},
+      "history": [
+        {
+          "created": "2018-04-03T18:37:09.284840891Z",
+          "created_by": "foo"
+        },
+        {
+          "created": "2018-04-12T18:37:09.284840891Z",
+          "created_by": "bar"
+        },
+      ],
+    })
+    return config_str + ' ' * (2000 - len(config_str))
+
+  legacy_layers = list(manifest.generate_legacy_layers({}, _lookup_config))
+  assert len(legacy_layers) == 2
+  assert legacy_layers[0].content_checksum == 'sha256:abc123'
+  assert legacy_layers[1].content_checksum == 'sha256:def456'
+
+  assert legacy_layers[0].created == "2018-04-03T18:37:09.284840891Z"
+  assert legacy_layers[1].created == "2018-04-12T18:37:09.284840891Z"
+
+  assert legacy_layers[0].command == '"foo"'
+  assert legacy_layers[1].command == '"bar"'
+
+  assert legacy_layers[1].parent_image_id == legacy_layers[0].image_id
+  assert legacy_layers[0].parent_image_id is None
+
+  assert legacy_layers[0].image_id != legacy_layers[1]