Store the layer data in the extra_data for display in the UI

Signed-off-by: tdruez <[email protected]>

Author: tdruez

scanpipe/pipes/docker.py

@@ -190,20 +190,29 @@ def create_codebase_resources(project, image: Image) -> None:
     for layer_index, layer in enumerate(image.layers, start=1):
         layer_tag = get_layer_tag(image.image_id, layer.layer_id, layer_index)
 
-        pipes.make_codebase_resource(
-            project=project,
-            location=str(layer.extracted_location),
-            tag=layer_tag,
-            extra_data={"layer": {"created_by": layer.created_by}},
-        )
-
+        layer_file_count = 0
         for resource in layer.get_resources(with_dir=True):
             pipes.make_codebase_resource(
                 project=project,
                 location=resource.location,
                 rootfs_path=resource.path,
                 tag=layer_tag,
             )
+            if resource.is_file:
+                layer_file_count += 1
+
+        layer_data = layer.to_dict()
+        layer_data["file_count"] = layer_file_count
+        layer_data.pop("extracted_location", None)
+        layer_data.pop("archive_location", None)
+
+        pipes.make_codebase_resource(
+            project=project,
+            location=str(layer.extracted_location),
+            tag=layer_tag,
+            # Store the layer data in the extra_data for display in the UI
+            extra_data={"layer": layer_data},
+        )
 
 
 def create_system_package(project, purl, package, layer, layer_tag):

scanpipe/tests/data/docker/debian_scan_codebase.json

@@ -511,7 +511,20 @@
       "is_key_file": false,
       "extra_data": {
         "layer": {
-          "created_by": "/bin/sh -c #(nop) ADD file:37744639836b248c88f6e126619829290b45c233309538310e8fffb82e98eaf8 in / "
+          "os": null,
+          "author": null,
+          "labels": [],
+          "sha256": "8a63761caf6d45e65b8e6cdc2e0c03c55625fd142ec3356b80a9ea4a34b11b66",
+          "comment": null,
+          "created": "2022-04-29T23:21:15.290486282Z",
+          "variant": null,
+          "layer_id": "8a63761caf6d45e65b8e6cdc2e0c03c55625fd142ec3356b80a9ea4a34b11b66",
+          "created_by": "/bin/sh -c #(nop) ADD file:37744639836b248c88f6e126619829290b45c233309538310e8fffb82e98eaf8 in / ",
+          "file_count": 6,
+          "os_version": null,
+          "architecture": null,
+          "docker_version": null,
+          "is_empty_layer": false
         }
       }
     },

scanpipe/tests/data/docker/gcr_io_distroless_base_scan_codebase.json

@@ -579,7 +579,20 @@
       "is_key_file": false,
       "extra_data": {
         "layer": {
-          "created_by": "bazel build ..."
+          "os": null,
+          "author": "Bazel",
+          "labels": [],
+          "sha256": "cb3279093e638ddfd56bff4d3d89c5a3ed6dd59dbcfbc2f3107045635996b822",
+          "comment": null,
+          "created": "1970-01-01T00:00:00Z",
+          "variant": null,
+          "layer_id": "cb3279093e638ddfd56bff4d3d89c5a3ed6dd59dbcfbc2f3107045635996b822",
+          "created_by": "bazel build ...",
+          "file_count": 458,
+          "os_version": null,
+          "architecture": null,
+          "docker_version": null,
+          "is_empty_layer": false
         }
       }
     },
@@ -15709,7 +15722,20 @@
       "is_key_file": false,
       "extra_data": {
         "layer": {
-          "created_by": "bazel build ..."
+          "os": null,
+          "author": "Bazel",
+          "labels": [],
+          "sha256": "d92879194ba1c23b840306b007bce6568f71f0e954d63625d48504d533749e30",
+          "comment": null,
+          "created": "1970-01-01T00:00:00Z",
+          "variant": null,
+          "layer_id": "d92879194ba1c23b840306b007bce6568f71f0e954d63625d48504d533749e30",
+          "created_by": "bazel build ...",
+          "file_count": 1848,
+          "os_version": null,
+          "architecture": null,
+          "docker_version": null,
+          "is_empty_layer": false
         }
       }
     },

scanpipe/tests/data/image-with-symlinks/minitag.tar-expected-scan.json

@@ -160,7 +160,20 @@
       "is_key_file": false,
       "extra_data": {
         "layer": {
-          "created_by": "/bin/sh -c #(nop) ADD file:783bda715f24a7fcabfe87ca07ae47e5cca3d35b99dd78e3155748e41477acb2 in / "
+          "os": null,
+          "author": null,
+          "labels": [],
+          "sha256": "887ac3b73f9a48d1324380c8d1ef033873a6cb882a5a9170fba51fa69fd5e5f0",
+          "comment": null,
+          "created": "2022-07-30T14:18:12.008793231Z",
+          "variant": null,
+          "layer_id": "887ac3b73f9a48d1324380c8d1ef033873a6cb882a5a9170fba51fa69fd5e5f0",
+          "created_by": "/bin/sh -c #(nop) ADD file:783bda715f24a7fcabfe87ca07ae47e5cca3d35b99dd78e3155748e41477acb2 in / ",
+          "file_count": 8,
+          "os_version": null,
+          "architecture": null,
+          "docker_version": null,
+          "is_empty_layer": false
         }
       }
     },