Merge branch 'main'

bin/sarif-aggregate-scans

@@ -131,11 +131,10 @@ for path in paths:
     # Paths and components
     # 
     path = path.rstrip()
-    project, component = path.split('/')
     #
     # Validate input data directory and content
     #
-    output_dir = os.path.join(args.in_dir+project, component + ".scantables")
+    output_dir = os.path.join(args.in_dir+ path + ".scantables")
     if not os.path.exists(output_dir):
         continue
     if not _all_csv_files_exist(output_dir):

bin/sarif-create-aggregate-report

@@ -56,11 +56,10 @@ data = []
 
 for path in paths:
     path = path.rstrip()
-    project, component = path.split('/')
     #
     # Validate input data directory and content
     #
-    csv_infile = os.path.join(args.in_dir+project, component + ".csv")
+    csv_infile = os.path.join(args.in_dir+ path + ".csv")
     if not os.path.exists(csv_infile):
         continue
     else:

bin/sarif-extract-scans

@@ -95,7 +95,7 @@ except Exception:
     # will have gathered errors/warnings
     status_writer.csv_write_warnings()
     #pass the exception up to be put into log by runner
-    raise(Exception)
+    raise
 
 #
 # Form output tables
@@ -161,7 +161,7 @@ try:
 except Exception:
     #possible warnings accumulated
     status_writer.csv_write_warnings()
-    raise Exception
+    raise
 
 #
 # Setup rest of basetables
@@ -271,4 +271,4 @@ _write_dataframes_of(scantabs)
 
 write('codeflows', bt.codeflows)
 status_writer.warning_set["success"]+=1
-status_writer.csv_write_warnings()
+status_writer.csv_write_warnings()