Create output format JSON-EVERYTHING

JSON-EVERYTHING contains everyhing what openscap-report can offer.
OpenSCAP · Aug 22, 2022 · 446c6ad · 446c6ad
1 parent 958f898
commit 446c6ad
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/openscap_report/cli.py b/openscap_report/cli.py
@@ -10,7 +10,9 @@
 
 from . import __version__
 from .debug_settings import DebugSetting
-from .report_generators import (HTMLReportGenerator, JSONReportGenerator,
+from .report_generators import (HTMLReportGenerator,
+                                JSONEverythingReportGenerator,
+                                JSONReportGenerator,
                                 OldStyleHTMLReportGenerator)
 from .scap_results_parser import SCAPResultsParser
 
@@ -93,7 +95,7 @@ def prepare_parser():
         "--format",
         action="store",
         default="HTML",
-        choices=["HTML", "OLD-STYLE-HTML", "JSON"],
+        choices=["HTML", "OLD-STYLE-HTML", "JSON", "JSON-EVERYTHING"],
         help="FORMAT: %(choices)s (default: %(default)s)."
     )
     parser.add_argument(
@@ -141,6 +143,7 @@ def get_report_generator(self, report_parser):
             "HTML": HTMLReportGenerator,
             "OLD-STYLE-HTML": OldStyleHTMLReportGenerator,
             "JSON": JSONReportGenerator,
+            "JSON-EVERYTHING": JSONEverythingReportGenerator,
         }
         return dict_of_report_generators[self.output_format](report_parser)
 

diff --git a/openscap_report/report_generators/__init__.py b/openscap_report/report_generators/__init__.py
@@ -3,6 +3,6 @@
 
 from .exceptions import FilterNotSupportDataStructureException
 from .html import HTMLReportGenerator
-from .json import JSONReportGenerator
+from .json import JSONEverythingReportGenerator, JSONReportGenerator
 from .old_style_html import OldStyleHTMLReportGenerator
 from .report_generator import ReportGenerator
diff --git a/openscap_report/report_generators/json.py b/openscap_report/report_generators/json.py
@@ -27,3 +27,14 @@ def generate_report(self, debug_setting):
             indent = "\t"
         json_report = json.dumps(json_data, indent=indent)
         return BytesIO(json_report.encode())
+
+
+class JSONEverythingReportGenerator(ReportGenerator):
+    def generate_report(self, debug_setting):
+        logging.warning("JSON Format is experimental output!")
+
+        indent = None
+        if debug_setting.no_minify:
+            indent = "\t"
+        json_data = json.dumps(self.report.as_dict(), indent=indent)
+        return BytesIO(json_data.encode())