Fixed emty layer count discrepancy

Author: snps-kumykov

examples/client/generate_sbom.py

@@ -110,7 +110,7 @@ def download_report(bd_client, location, filename, retries=args.retries):
 }
 sbom_reports_url = version['_meta']['href'] + "/sbom-reports"
 
-bd.session.headers["Content-Type"] = "application/vnd.blackducksoftware.report-4.json"
+bd.session.headers["Content-Type"] = "application/vnd.blackducksoftware.report-4+json"
 r = bd.session.post(sbom_reports_url, json=post_data)
 if (r.status_code == 403):
 	logging.debug("Authorization Error - Please ensure the token you are using has write permissions!")

examples/client/multi-image/generate-clone.sh

@@ -15,6 +15,6 @@ ls -l $SPECFILE
 
 COMMAND="python3 examples/client/multi-image/manage_project_structure.py"
 
-# $COMMAND -u $BD_URL -t token -nv -pg "Test Group" -p P3 -pv 2.4 -sp $SUBPROJECTS --clone-from 2.3 $@
-$COMMAND -u $BD_URL -t token -nv -pg "Test Group" -p P3 -pv 2.4 -ssf $SPECFILE --clone-from 2.3 $@
+$COMMAND -u $BD_URL -t token -nv -pg "Test Group" -p P3 -pv 2.4 -sp $SUBPROJECTS --clone-from 2.3 $@
+# $COMMAND -u $BD_URL -t token -nv -pg "Test Group" -p P3 -pv 2.4 -ssf $SPECFILE --clone-from 2.3 $@
 

examples/client/multi-image/scan_docker_image_lite.py

@@ -240,8 +240,29 @@ def __init__(
         if detect_options:
             self.extra_options = detect_options.split(" ")
         print ("<--{}-->".format(self.grouping))
-              
-    def prepare_container_image(self):
+
+    def prepare_container_image_old(self):
+        self.docker.initdir()
+        self.docker.pull_container_image(self.container_image_name)
+        self.docker.save_container_image(self.container_image_name)
+        self.docker.unravel_container()
+        # result = self.docker.get_container_image_history(self.container_image_name)
+        history = self.docker.read_config()['history']
+        layer_count = 0
+        history_grouping = ''
+        for item in history:
+            if not item.get('empty_layer', None):
+                layer_count += 1
+            match = re.search('echo (.+?)_group_end', item['created_by'])
+            if match:
+                found = match.group(1)
+                if len(history_grouping):
+                    history_grouping += ','
+                history_grouping += str(layer_count) + ":" + found
+        if len(history_grouping) and self.grouping == '1024:everything':
+            self.grouping = history_grouping
+
+    def prepare_container_image_old(self):
         self.docker.initdir()
         self.docker.pull_container_image(self.container_image_name)
         result = self.docker.get_container_image_history(self.container_image_name)