From 15dc2c72293a6642ed202289f9213d670b39c2b1 Mon Sep 17 00:00:00 2001
From: Your Name <penenadpi@gmail.com>
Date: Tue, 9 Aug 2022 12:24:40 +0200
Subject: [PATCH] Reorganized output directories

---
 outputs/generated_html/README          | 1 +
 outputs/json_dumps/README              | 1 +
 outputs/logs/README                    | 1 +
 src/iac_scan_runner/results_summary.py | 2 +-
 src/iac_scan_runner/scan_runner.py     | 2 +-
 src/iac_scan_runner/utils.py           | 2 +-
 6 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 outputs/generated_html/README
 create mode 100644 outputs/json_dumps/README
 create mode 100644 outputs/logs/README

diff --git a/outputs/generated_html/README b/outputs/generated_html/README
new file mode 100644
index 0000000..781acfd
--- /dev/null
+++ b/outputs/generated_html/README
@@ -0,0 +1 @@
+Generated HTML pages are stored here
diff --git a/outputs/json_dumps/README b/outputs/json_dumps/README
new file mode 100644
index 0000000..25f79dd
--- /dev/null
+++ b/outputs/json_dumps/README
@@ -0,0 +1 @@
+JSON scan summaries are stored here
diff --git a/outputs/logs/README b/outputs/logs/README
new file mode 100644
index 0000000..b47e3eb
--- /dev/null
+++ b/outputs/logs/README
@@ -0,0 +1 @@
+Individual scan tool logs are dumped here
diff --git a/src/iac_scan_runner/results_summary.py b/src/iac_scan_runner/results_summary.py
index 6e41a18..ec91afc 100644
--- a/src/iac_scan_runner/results_summary.py
+++ b/src/iac_scan_runner/results_summary.py
@@ -79,7 +79,7 @@ class ResultsSummary:
         print(self.outcomes)
 
     def dump_outcomes(self, file_name: str):
-        file_path = "json_dumps/" + file_name + ".json"
+        file_path = "../outputs/json_dumps/" + file_name + ".json"
 
         with open(file_path, "w") as fp:
             json.dump(self.outcomes, fp)
diff --git a/src/iac_scan_runner/scan_runner.py b/src/iac_scan_runner/scan_runner.py
index aa48057..72659af 100644
--- a/src/iac_scan_runner/scan_runner.py
+++ b/src/iac_scan_runner/scan_runner.py
@@ -155,7 +155,7 @@ class ScanRunner:
 
         dt = datetime.now()
         ts = datetime.timestamp(dt)
-        dir_name = "scan_run_" + str(ts)
+        dir_name = "../outputs/logs/scan_run_" + str(ts)
 
         os.mkdir(dir_name)
 
diff --git a/src/iac_scan_runner/utils.py b/src/iac_scan_runner/utils.py
index d54deca..3b993c0 100644
--- a/src/iac_scan_runner/utils.py
+++ b/src/iac_scan_runner/utils.py
@@ -95,7 +95,7 @@ def write_html_to_file(file_name: str, output_value: str):
     :param output_dir: Directory where log will be stored
     :param output_value: Content written to given file
     """
-    file_name = "generated_html/" + file_name + ".html"
+    file_name = "../outputs/generated_html/" + file_name + ".html"
     with open(file_name, "w") as text_file:
         text_file.write(output_value)
         
-- 
GitLab