From 15aa9573e2a9a1ae682070f62b58fb4930ef4cdc Mon Sep 17 00:00:00 2001
From: Kristen Newbury <knewbury01@github.com>
Date: Tue, 15 Nov 2022 13:35:52 -0500
Subject: [PATCH] Adjust extra properties status from error to warning

---
 sarif_cli/status_writer.py | 13 ++++++++++---
 sarif_cli/typegraph.py     |  5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sarif_cli/status_writer.py b/sarif_cli/status_writer.py
index d8740d8..00ce226 100644
--- a/sarif_cli/status_writer.py
+++ b/sarif_cli/status_writer.py
@@ -8,7 +8,8 @@ fieldnames = ['sarif_file', 'level', 'levelcode', 'message', "extra_info"]
 warning_set = {
   "success" : 0,
   "zero_results" : 0,
-  "input_sarif_missing" : 0
+  "input_sarif_missing" : 0,
+  "input_sarif_extra" : 0
 }
 
 #
@@ -43,6 +44,11 @@ def csv_write_warnings():
         #reset in case later different types of warnings can be accumulated
         input_sarif_missing["extra_info"] = "Missing: "
         warning_set["input_sarif_missing"] = 0
+      if warning_set["input_sarif_extra"] != 0:
+        csv_writer.writerow(input_sarif_extra)
+        #reset in case later different types of warnings can be accumulated
+        input_sarif_extra["extra_info"] = "Extra properties: "
+        warning_set["input_sarif_extra"] = 0
       if warning_set["success"] != 0:
         csv_writer.writerow(success)
 
@@ -86,9 +92,10 @@ file_load_error = {
 
 input_sarif_extra  = {
   "sarif_file": "",
-  "level": "ERROR",
+  "level": "WARNING",
   "levelcode": 4,
-  "message": "Input sarif contains extra unneccesary properties."
+  "message": "Input sarif contains extra unneccesary properties.",
+  "extra_info" : "Extra properties: "
 }
 
 unknown_sarif_parsing_shape = {
diff --git a/sarif_cli/typegraph.py b/sarif_cli/typegraph.py
index cd2b714..9b0dfc5 100644
--- a/sarif_cli/typegraph.py
+++ b/sarif_cli/typegraph.py
@@ -168,7 +168,10 @@ def _destructure_dict(typegraph: Typegraph, node, tree):
                         'known entries: {}'.format(tree))
         logging.warning('tree fields: {}'.format(sorted(tree_fields)))
         logging.warning('type fields: {}'.format(sorted(type_fields)))
-        status_writer.csv_write(status_writer.input_sarif_extra)
+        specific_extra = 'type fields: {}'.format(sorted(tree_fields))
+        if specific_extra not in status_writer.input_sarif_extra["extra_info"]:
+            status_writer.input_sarif_extra["extra_info"] += specific_extra
+        status_writer.warning_set["input_sarif_extra"]+=1
         _destructure_dict_1(typegraph, node, tree)
 
     elif set(tree_fields).issubset(set(type_fields)):