From 97a21cceb196de20e4aa5b4203c4d8215d3d4955 Mon Sep 17 00:00:00 2001 From: Michael Long Date: Fri, 30 Aug 2024 15:21:47 -0400 Subject: [PATCH] Write Dockerfile CSV and Markdown on no vulns --- entrypoint/entrypoint/dockerfile.py | 6 ------ entrypoint/tests/test_dockerfile_checks.py | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/entrypoint/entrypoint/dockerfile.py b/entrypoint/entrypoint/dockerfile.py index 53ff4ae..17ea337 100644 --- a/entrypoint/entrypoint/dockerfile.py +++ b/entrypoint/entrypoint/dockerfile.py @@ -314,9 +314,6 @@ def dockerfile_vulns_to_csv(dockerfile_vulns): def write_dockerfile_report_csv(inspector_scan_path, dst_file): dockerfile_vulns = get_dockerfile_vulns(inspector_scan_path) - if len(dockerfile_vulns) == 0: - logging.info(f"skipping dockerfile vulnerability CSV report because no vulnerabilities were detected") - return False csv_output = dockerfile_vulns_to_csv(dockerfile_vulns) @@ -328,9 +325,6 @@ def write_dockerfile_report_csv(inspector_scan_path, dst_file): def write_dockerfile_report_md(inspector_scan_path, dst_file): dockerfile_vulns = get_dockerfile_vulns(inspector_scan_path) - if len(dockerfile_vulns) == 0: - logging.info(f"skipping dockerfile vulnerability MD report because no vulnerabilities were detected") - return False markdown_report = get_markdown_header() for vuln in dockerfile_vulns: diff --git a/entrypoint/tests/test_dockerfile_checks.py b/entrypoint/tests/test_dockerfile_checks.py index cc3fa37..1095968 100644 --- a/entrypoint/tests/test_dockerfile_checks.py +++ b/entrypoint/tests/test_dockerfile_checks.py @@ -152,7 +152,7 @@ def test_write_dockerfile_report_csv(self): write_counter += 1 os.remove(dst) - expected_writes = 2 + expected_writes = 4 self.assertEqual(expected_writes, write_counter) def test_write_dockerfile_report_md(self): @@ -170,7 +170,7 @@ def test_write_dockerfile_report_md(self): write_counter += 1 os.remove(dst) - expected_writes = 2 + expected_writes = 4 self.assertEqual(expected_writes, write_counter)