fix failing tests (CICD)

Author: bluesentinelsec

entrypoint/tests/test_orchestrator.py

@@ -119,13 +119,30 @@ def test_system_against_dockerfile_findings(self):
                 "args",
                 [
                     "out_scan",
-                    "artifact_path",
+                    "artifact_path", 
                     "artifact_type",
                     "out_scan_csv",
                     "out_scan_markdown",
                     "out_dockerfile_scan_csv",
                     "out_dockerfile_scan_md",
                     "show_only_fixable_vulns",
+                    # ScanConfig required fields
+                    "sbomgen_version",
+                    "timeout", 
+                    "platform",
+                    "scanners",
+                    "skip_scanners",
+                    "skip_files",
+                    # OutputConfig required fields
+                    "display_vuln_findings",
+                    "out_sbom",
+                    "thresholds",
+                    "critical",
+                    "high", 
+                    "medium",
+                    "low",
+                    "other",
+                    "threshold_fixable_only",
                 ],
             )
             args = ArgMock(
@@ -137,9 +154,31 @@ def test_system_against_dockerfile_findings(self):
                 out_dockerfile_scan_csv="/tmp/out_dockerfile_scan.csv",
                 out_dockerfile_scan_md="/tmp/out_dockerfile_scan.md",
                 show_only_fixable_vulns=False,
+                # ScanConfig defaults
+                sbomgen_version="latest",
+                timeout="600",
+                platform=None,
+                scanners="''",
+                skip_scanners="''", 
+                skip_files="''",
+                # OutputConfig defaults
+                display_vuln_findings="disabled",
+                out_sbom="/tmp/sbom.json",
+                thresholds=False,
+                critical=0,
+                high=0,
+                medium=0,
+                low=0,
+                other=0,
+                threshold_fixable_only=False,
             )
 
-            succeeded, scan_result, fixed_vuln_counts = orchestrator.get_scan_result(args)
+            # Create config objects for new function signature
+            from entrypoint.data_model import ScanConfig, OutputConfig
+            config = ScanConfig.from_args(args)
+            output_config = OutputConfig.from_args(args)
+            
+            succeeded, scan_result, fixed_vuln_counts = orchestrator.get_scan_result(args, config, output_config)
             self.assertTrue(succeeded)
 
             orchestrator.write_pkg_vuln_report_csv(args.out_scan_csv, scan_result)
@@ -262,15 +301,25 @@ def test_threshold_exceeded_on_fixable_vulns(self):
         # Given a scan containing fixable and unfixable vulns,
         # threshold should be exceeded
         vulns_with_fixes = fixed_vulns.FixedVulns(criticals=10, highs=0, mediums=0, lows=0, others=0)
-        orchestrator.set_env_var_if_vuln_threshold_exceeded(threshold_args, vulns_with_fixes)
+        from entrypoint.data_model import OutputConfig
+        threshold_output_config = OutputConfig(
+            critical_threshold=threshold_args.critical,
+            high_threshold=threshold_args.high,
+            medium_threshold=threshold_args.medium,
+            low_threshold=threshold_args.low,
+            other_threshold=threshold_args.other,
+            thresholds=threshold_args.thresholds,
+            threshold_fixable_only=threshold_args.threshold_fixable_only
+        )
+        orchestrator.set_env_var_if_vuln_threshold_exceeded(threshold_output_config, vulns_with_fixes)
         want = "1"
         got = os.environ.get("vulnerability_threshold_exceeded")
         self.assertEqual(want, got)
 
         # Given a scan containing NO fixable vulns,
         # threshold exceeded should NOT be set
         no_vulns_with_fix = fixed_vulns.FixedVulns(criticals=0, highs=0, mediums=0, lows=0, others=0)
-        orchestrator.set_env_var_if_vuln_threshold_exceeded(threshold_args, no_vulns_with_fix)
+        orchestrator.set_env_var_if_vuln_threshold_exceeded(threshold_output_config, no_vulns_with_fix)
         want = "0"
         got = os.environ.get("vulnerability_threshold_exceeded")
         self.assertEqual(want, got)
@@ -287,7 +336,16 @@ def test_threshold_exceeded_on_fixable_vulns(self):
             threshold_fixable_only=True
         )
         vulns_with_fixes = fixed_vulns.FixedVulns(criticals=10, highs=10, mediums=10, lows=10, others=10)
-        orchestrator.set_env_var_if_vuln_threshold_exceeded(disable_threshold_args, vulns_with_fixes)
+        disable_threshold_output_config = OutputConfig(
+            critical_threshold=disable_threshold_args.critical,
+            high_threshold=disable_threshold_args.high,
+            medium_threshold=disable_threshold_args.medium,
+            low_threshold=disable_threshold_args.low,
+            other_threshold=disable_threshold_args.other,
+            thresholds=disable_threshold_args.thresholds,
+            threshold_fixable_only=disable_threshold_args.threshold_fixable_only
+        )
+        orchestrator.set_env_var_if_vuln_threshold_exceeded(disable_threshold_output_config, vulns_with_fixes)
         want = "0"
         got = os.environ.get("vulnerability_threshold_exceeded")
         self.assertEqual(want, got)