fix: solve ImportError,TypeError, and f-string error

Signed-off-by: Zvi Grinberg <[email protected]>

Author: zvigrinberg

src/execution.py

@@ -8,6 +8,7 @@
 
 import json
 import logging
+from typing import Union
 import uuid
 from pathlib import Path
 import copy
@@ -493,7 +494,7 @@ def run(self) -> None:
             logger.error(f"Unexpected error during execution: {e}", exc_info=True)
             raise
 
-    def prepare_tests(self, scan_config_override: str|None) -> tuple:
+    def prepare_tests(self, scan_config_override: Union[str, None]) -> tuple:
         # Read scan configuration
         scan_config = self.read_scan_config(scan_config_override)
 

src/integration_tests_execution.py

@@ -8,21 +8,19 @@
 
 import json
 import logging
+from typing import Union
+
+from execution import Execution
+from concurrent_executor import ConcurrentExecutor, ExecutionInput
 
-try:
-    from .execution import Execution
-    from .concurrent_executor import ConcurrentExecutor, ExecutionInput
-except ImportError:
-    from execution import Execution
-    from concurrent_executor import ConcurrentExecutor, ExecutionInput
 
 # Integration tests input file with all tests.
 INTEGRATION_TESTS_INPUT_FILE = "scan_it.json"
 
 logger = logging.getLogger(__name__)
 
 
-def create_error_object(error_message: str, scan_id: str , test: dict) -> dict[str, str | int | dict]:
+def create_error_object(error_message: str, scan_id: str , test: dict) -> dict[str, Union[str, int, dict]]:
     return {
         'error': error_message,
         'scan_id': scan_id,

src/it_results_interpreter.py

@@ -117,7 +117,7 @@ def prepare_common_result_fields(self, result: dict, result_index: int):
             TEST_NO: result_index,
             LANGUAGE: result.get(ECOSYSTEM),
             VULN_ID: result.get(VULN_ID),
-            GIT_REPO: f"{result.get("image_name")}@{result.get("image_tag")}",
+            GIT_REPO: f"{result.get('image_name')}@{result.get('image_tag')}",
             JUSTIFICATION_STATUS: result.get(JUSTIFICATION_STATUS),
             JUSTIFICATION_LABEL: result.get(JUSTIFICATION_LABEL),
             EXECUTION_DURATION: result.get(EXECUTION_DURATION)

src/main_integration_tests.py

@@ -9,18 +9,15 @@
 import argparse
 import logging
 import sys
-
+from integration_tests_execution import IntegrationTestExecution
+from it_results_interpreter import IntegrationTestsResultsInterpreter
 try:
-    from .integration_tests_execution import IntegrationTestExecution
-    from .it_results_interpreter import IntegrationTestsResultsInterpreter
     from .config import Configuration, GoogleSheetsConfig, GoogleSheetsManager
     from .execution import Execution
     from .data_extractor import DataExtractor, ITDataExtractor
     from .analysis import Analysis, GoogleSheetsDataLoader
     from .cleanup import Cleanup
 except ImportError:
-    from integration_tests_execution import IntegrationTestExecution
-    from it_results_interpreter import IntegrationTestsResultsInterpreter
     from config import Configuration, GoogleSheetsConfig
     from execution import Execution
     from data_extractor import DataExtractor, ITDataExtractor