PyPI - devsecops-engine-tools - Versions diffs - 1.143.0__tar.gz → 1.144.0__tar.gz - Mend

Files changed (446) hide show

{devsecops_engine_tools-1.143.0 → devsecops_engine_tools-1.144.0}/devsecops_engine_tools/engine_core/src/infrastructure/driven_adapters/printer_pretty_table/printer_pretty_table.py RENAMED Viewed

@@ -11,8 +11,12 @@ from devsecops_engine_tools.engine_core.src.domain.model.report import (
 )
 from devsecops_engine_tools.engine_core.src.infrastructure.helpers.util import (
     format_date,
+    format_expired_date,
 )
 from prettytable import PrettyTable, DOUBLE_BORDER
+from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
+from devsecops_engine_tools.engine_utilities import settings
+logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 @dataclass
@@ -98,34 +102,37 @@ class PrinterPrettyTable(PrinterTableGateway):
         if len(sorted_table.rows) > 0:
             print(sorted_table)
-    def print_table_report_exlusions(self, exclusions):
-        if exclusions:
-            headers = [
-                "VM ID",
-                "Services",
-                "Tags",
-                "Created Date",
-                "Expired Date",
-                "Reason",
-            ]
+    def print_table_report_exclusions(self, exclusions):
+        headers = [
+            "VM ID",
+            "Services",
+            "Tags",
+            "Created Date",
+            "Expired Date",
+            "Reason",
+        ]
         table = PrettyTable(headers)
         for exclusion in exclusions:
-            row_data = [
-                self._check_spaces(exclusion["vm_id"]),
-                self._check_spaces(exclusion["service"]),
-                ", ".join(exclusion["tags"]),
-                format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
-                (
-                    format_date(exclusion["expired_date"], "%d%m%Y", "%d/%m/%Y")
-                    if exclusion["expired_date"]
-                    and exclusion["expired_date"] != "undefined"
-                    else "NA"
-                ),
-                exclusion["reason"],
-            ]
-            table.add_row(row_data)
+            try:
+                row_data = [
+                    self._check_spaces(exclusion["vm_id"]),
+                    self._check_spaces(exclusion["service"]),
+                    ", ".join(exclusion["tags"]),
+                    format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
+                    format_expired_date(exclusion["expired_date"]),
+                    exclusion["reason"],
+                ]
+                table.add_row(row_data)
+            except (KeyError, TypeError, ValueError) as e:
+                error_msg = (
+                    f"Error processing exclusion entry for VM ID "
+                    f"{exclusion.get('vm_id', 'Unknown')}: {type(e).__name__}: {str(e)}"
+                )
+                logger.error(error_msg)
+                raise RuntimeError(error_msg) from e
         for column in table.field_names:
             table.align[column] = "l"
@@ -136,15 +143,14 @@ class PrinterPrettyTable(PrinterTableGateway):
     def print_table_exclusions(self, exclusions, break_build_manager):
         model_header = "Priority" if break_build_manager.get("MODEL", "Severity") == "priority" else "Severity"
-        if exclusions:
-            headers = [
-                model_header,
-                "ID",
-                "Where",
-                "Create Date",
-                "Expired Date",
-                "Reason",
-            ]
+        headers = [
+            model_header,
+            "ID",
+            "Where",
+            "Create Date",
+            "Expired Date",
+            "Reason",
+        ]
         if exclusions[0].get("module") in ("engine_container", "engine_dependencies", "engine_function"):
             headers.insert(6, "Fixed in")
@@ -152,22 +158,25 @@ class PrinterPrettyTable(PrinterTableGateway):
         table = PrettyTable(headers)
         for exclusion in exclusions:
-            row_data = [
-                exclusion["severity"],
-                exclusion["id"],
-                exclusion["where"],
-                format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
-                (
-                    format_date(exclusion["expired_date"], "%d%m%Y", "%d/%m/%Y")
-                    if exclusion["expired_date"]
-                    and exclusion["expired_date"] != "undefined"
-                    else "NA"
-                ),
-                exclusion["reason"],
-            ]
-            if exclusion.get("module") in ("engine_container", "engine_dependencies", "engine_function"):
-                row_data.append(exclusion["fixed in"])
-            table.add_row(row_data)
+            try:
+                row_data = [
+                    exclusion["severity"],
+                    exclusion["id"],
+                    exclusion["where"],
+                    format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
+                    format_expired_date(exclusion["expired_date"]),
+                    exclusion["reason"],
+                ]
+                if exclusion.get("module") in ("engine_container", "engine_dependencies", "engine_function"):
+                    row_data.append(exclusion["fixed in"])
+                table.add_row(row_data)
+            except (KeyError, TypeError, ValueError) as e:
+                error_msg = (
+                    f"Error processing exclusion finding ID "
+                    f"{exclusion.get('id', 'Unknown')}: {type(e).__name__}: {str(e)}"
+                )
+                logger.error(error_msg)
+                raise RuntimeError(error_msg) from e
         for column in table.field_names:
             table.align[column] = "l"

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devsecops-engine-tools
-Version: 1.143.0
+Version: 1.144.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team
@@ -30,7 +30,7 @@ Requires-Dist: cpe==1.3.1
 Requires-Dist: packageurl-python==0.13.4
 Requires-Dist: ruamel.yaml==0.18.15
 Requires-Dist: Authlib==1.6.7
-Requires-Dist: PyJWT==2.10.1
+Requires-Dist: PyJWT==2.12.0
 Requires-Dist: sympy==1.14.0
 Requires-Dist: urllib3==2.6.3
 Requires-Dist: holidays==0.81

@@ -12,9 +12,13 @@ class PrinterTableGateway(metaclass=ABCMeta):
         "print_table_findings"
     @abstractmethod
-    def print_table_report(self, report_list: "list[Report]", finding_score_model):
+    def print_table_report(self, report_list: "list[Report]", model):
         "print_table_report"
     @abstractmethod
-    def print_table_exclusions(self, exclusions_list, break_build_manager):
+    def print_table_report_exclusions(self, exclusions):
+        "print_table_report_exclusions"
+    @abstractmethod
+    def print_table_exclusions(self, exclusions, break_build_manager):
         "print_table_exclusions"

@@ -11,10 +11,15 @@ from devsecops_engine_tools.engine_core.src.domain.model.report import (
 )
 from devsecops_engine_tools.engine_core.src.infrastructure.helpers.util import (
     format_date,
+    format_expired_date,
 )
 from rich.console import Console
 from rich.table import Table
 from rich import box
+from devsecops_engine_tools.engine_utilities.utils.logger_info import MyLogger
+from devsecops_engine_tools.engine_utilities import settings
+logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 @dataclass
@@ -46,33 +51,60 @@ class PrinterRichTable(PrinterTableGateway):
         console = Console()
         console.print(table)
-    def print_table_exclusions(self, exclusions_list, break_build_manager):
-        headers = []
-        if exclusions_list:
-            headers = ["ID", "Tags", "Service", "Create Date", "Expired Date", "Reason"]
+    def print_table_exclusions(self, exclusions, break_build_manager):
+        headers = ["ID", "Tags", "Service", "Create Date", "Expired Date", "Reason"]
         table = Table(
             show_header=True, header_style="bold magenta", box=box.DOUBLE_EDGE
         )
         for header in headers:
             table.add_column(header)
-        for exclusion in exclusions_list:
-            row_data = [
-                self._check_spaces(exclusion["vm_id"], exclusion["vm_id_url"]),
-                ", ".join(exclusion["tags"]),
-                exclusion["service"],
-                format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
-                (
-                    format_date(exclusion["expired_date"], "%d%m%Y", "%d/%m/%Y")
-                    if exclusion["expired_date"]
-                    and exclusion["expired_date"] != "undefined"
-                    else "NA"
-                ),
-                exclusion["reason"],
-            ]
-            table.add_row(*row_data)
+        for exclusion in exclusions:
+            try:
+                row_data = [
+                    self._check_spaces(exclusion["vm_id"], exclusion["vm_id_url"]),
+                    ", ".join(exclusion["tags"]),
+                    exclusion["service"],
+                    format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
+                    format_expired_date(exclusion["expired_date"]),
+                    exclusion["reason"],
+                ]
+                table.add_row(*row_data)
+            except (KeyError, TypeError, ValueError) as e:
+                self._raise_exclusion_error(exclusion, e)
+        console = Console()
+        console.print(table)
+    def print_table_report_exclusions(self, exclusions):
+        headers = ["VM ID", "Services", "Tags", "Created Date", "Expired Date", "Reason"]
+        table = Table(
+            show_header=True, header_style="bold magenta", box=box.DOUBLE_EDGE
+        )
+        for header in headers:
+            table.add_column(header)
+        for exclusion in exclusions:
+            try:
+                row_data = [
+                    self._check_spaces(exclusion["vm_id"], exclusion["vm_id_url"]),
+                    exclusion.get("service", ""),
+                    ", ".join(exclusion["tags"]),
+                    format_date(exclusion["create_date"], "%d%m%Y", "%d/%m/%Y"),
+                    format_expired_date(exclusion["expired_date"]),
+                    exclusion["reason"],
+                ]
+                table.add_row(*row_data)
+            except (KeyError, TypeError, ValueError) as e:
+                self._raise_exclusion_error(exclusion, e)
         console = Console()
         console.print(table)
+    def _raise_exclusion_error(self, exclusion, e):
+        error_msg = (
+            f"Error processing exclusion VM ID "
+            f"{exclusion.get('vm_id', 'Unknown')}: {type(e).__name__}: {str(e)}"
+        )
+        logger.error(error_msg)
+        raise RuntimeError(error_msg) from e
     def _check_spaces(self, value, url):
         values = value.split()
         urls = url.split()

@@ -5,6 +5,12 @@ def format_date(date, to_format, from_format):
     return datetime.strptime(date, to_format).strftime(from_format)
+def format_expired_date(expired_date, input_format="%d%m%Y", output_format="%d/%m/%Y"):
+    if expired_date and expired_date != "undefined":
+        return format_date(expired_date, input_format, output_format)
+    return "NA"
 def define_env(variable_env, branch):
     if variable_env is not None:
         return variable_env.lower()

@@ -609,7 +609,7 @@ class BreakBuild:
                     "warning", "Bellow are all findings that were excepted"
                 )
             )
-            self.printer_table_gateway.print_table_report_exlusions(applied_exclusions)
+            self.printer_table_gateway.print_table_report_exclusions(applied_exclusions)
             for reason, total in Counter(
                 map(lambda x: x["reason"], applied_exclusions)
             ).items():

	@@ -0,0 +1 @@
1	+ version = '1.144.0'

	@@ -1 +0,0 @@
1	- version = '1.143.0'

devsecops-engine-tools 1.143.0__tar.gz → 1.144.0__tar.gz

devsecops-engine-tools 1.143.0tar.gz → 1.144.0tar.gz