extending to check for snippet scans

Author: Glenn Snyder

examples/parse_detect_log_and_wait_for_scans.py

@@ -26,9 +26,8 @@
 
 parser = argparse.ArgumentParser("Parse the Synopsys Detect log, load status.json, and wait for all scan processing to complete")
 parser.add_argument("-d", "--detect_log", help="By default, this script will read the detect log from stdin, but you can alternatively supply a detect log filename")
-# parser.add_argument('-m', '--max_checks', type=int, default=10, help="Set the maximum number of checks before quitting")
-# parser.add_argument('-t', '--time_between_checks', type=int, default=5, help="Set the number of seconds to wait in-between checks")
-# parser.add_argument('-s', '--snippet_scan', action='store_true', help="Select this option if you want to wait for a snippet scan to complete along with it's corresponding component scan.")
+parser.add_argument("-m", "--max_checks", default=10, type=int, help="Set the maximum number of checks before timing out. Applies to each code/scan location")
+parser.add_argument("-c", "--check_delay", default=5, type=int, help="The number of seconds between each check")
 args = parser.parse_args()
 
 logging.basicConfig(format='%(asctime)s:%(levelname)s:%(message)s', stream=sys.stderr, level=logging.DEBUG)
@@ -40,7 +39,7 @@
 else:
     detect_log = sys.stdin
 
-snippet_scan = False
+snippet_scan_option_set = False
 status_file_path = None
 start_time = None
 
@@ -60,7 +59,7 @@
     snippet_matching_re = re.search(".*detect.blackduck.signature.scanner.snippet.matching = (.*)", line)
     if snippet_matching_re:
         if 'SNIPPET' in snippet_matching_re[1]:
-            snippet_scan = True
+            snippet_scan_option_set = True
             logging.debug("Found snippet scanning option")
 
     status_file_re = re.search(".*Creating status file: (.*)", line)
@@ -71,7 +70,7 @@
 assert start_time, "Hmm, not sure how that happened but we need a start time"
 
 logging.debug(f"detect start time: {start_time}")
-logging.debug(f"snippet_scan: {snippet_scan}")
+logging.debug(f"snippet_scan_option_set: {snippet_scan_option_set}")
 logging.debug(f"status.json path: {status_file_path}")
 
 hub = HubInstance()
@@ -80,13 +79,25 @@
     status_info = json.load(status_file)
 
     # Monitoring status serially cause it's simpler (i.e. than spawning multiple threads and waiting for them)
+    scan_results = []
     for code_location in status_info['codeLocations']:
         logging.debug(f"Waiting for scan to finish at scan/code location {code_location['codeLocationName']}")
+        is_signature_scan = code_location['codeLocationName'].endswith("scan")
+        snippet_scan = is_signature_scan and snippet_scan_option_set
+        logging.debug(f"is_signature_scan: {is_signature_scan}, snippet_scan: {snippet_scan}")
         scan_monitor = ScanMonitor(
             hub, 
             start_time=start_time, 
             scan_location_name=code_location['codeLocationName'],
-            snippet_scan=snippet_scan)
-        scan_monitor.wait_for_scan_completion()
+            snippet_scan=snippet_scan,
+            max_checks=args.max_checks,
+            check_delay=args.check_delay)
+        scan_result = scan_monitor.wait_for_scan_completion()
+        logging.debug(f"scan result for {code_location['codeLocationName']} was {scan_result}")
+
+    if sum(scan_results) > 0:
+        sys.exit(1) # failure
+    else:
+        sys.exit(0)