hohn/sarif-cli
1
0
Fork 0
mirror of https://github.com/hohn/sarif-cli.git synced 2025-12-16 09:13:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main'

Browse Source
This commit is contained in:
Kristen Newbury
2023-03-02 13:19:21 -05:00
parent 1e1305bb25 6be328f785
commit eb50bdf834
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/sarif-aggregate-scans
View File

@@ -131,11 +131,10 @@ for path in paths:
# Paths and components # Paths and components
# #
path = path.rstrip() path = path.rstrip()
project, component = path.split('/')
# #
# Validate input data directory and content # 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): if not os.path.exists(output_dir):
continue continue
if not _all_csv_files_exist(output_dir): if not _all_csv_files_exist(output_dir):

3
bin/sarif-create-aggregate-report
View File

@@ -56,11 +56,10 @@ data = []
for path in paths: for path in paths:
path = path.rstrip() path = path.rstrip()
project, component = path.split('/')
# #
# Validate input data directory and content # 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): if not os.path.exists(csv_infile):
continue continue
else: else:

6
bin/sarif-extract-scans
View File

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