PyPI - devsecops-engine-tools - Versions diffs - 1.165.1__tar.gz → 1.167.0__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devsecops-engine-tools
-Version: 1.165.1
+Version: 1.167.0
 Summary: Tool for DevSecOps strategy
 Home-page: https://github.com/bancolombia/devsecops-engine-tools
 Author: Bancolombia DevSecOps Team

@@ -256,7 +256,7 @@ def get_inputs_from_cli(args):
         type=str,
         required=False,
         default="false",
-        help="Enable or disable context creation. Applies to engine_iac, engine_container and engine_dependencies. Default is false."
+        help="Print the generated context to the execution logs."
     )
     parser.add_argument(
         "--docker_address",

@@ -10,6 +10,7 @@ class ContextExtractionGateway(metaclass=ABCMeta):
         module_name: str,
         path_file_results: Optional[str],
         remote_config: Dict[str, Any],
+        print_to_logs: bool = False,
         **kwargs
     ) -> None:
         pass

@@ -390,16 +390,14 @@ class HandleScan:
         if tool_gateway:
             self.context_extraction_gateway.register_tool_gateway(module_name, tool_gateway)
-        # Extract context if enabled
-        if dict_args.get("context") == "true":
-            try:
-                logger.info(f"Context extraction enabled for {module_name}")
-                self.context_extraction_gateway.extract_context(
-                    module_name=module_name,
-                    path_file_results=path_file_results,
-                    remote_config=module_config,
-                    config_tool=config_tool
-                )
-            except Exception as e:
-                logger.error(f"Context extraction failed for {module_name}: {str(e)}")
-                # Continue execution even if context extraction fails
+        try:
+            self.context_extraction_gateway.extract_context(
+                module_name=module_name,
+                path_file_results=path_file_results,
+                remote_config=module_config,
+                config_tool=config_tool,
+                print_to_logs=dict_args.get("context") == "true"
+            )
+        except Exception as e:
+            logger.error(f"Context extraction failed for {module_name}: {str(e)}")
+            # Continue execution even if context extraction fails

@@ -1,6 +1,7 @@
 from typing import Optional, Dict, Any, List
 from dataclasses import asdict
 import json
+import os
 from devsecops_engine_tools.engine_core.src.domain.model.gateway.context_extraction_gateway import (
     ContextExtractionGateway,
 )
@@ -46,8 +47,13 @@ class ContextExtractionManager(ContextExtractionGateway):
         path_file_results: Optional[str],
         remote_config: Dict[str, Any],
         config_tool: Dict[str, Any],
+        print_to_logs: bool = False,
         **kwargs
     ) -> None:
+        if not remote_config.get("GENERATE_CONTEXT", False):
+            logger.info(f"Context generation disabled for {module_name}, skipping")
+            return
         if not path_file_results:
             logger.warning(f"No results file provided for {module_name}, skipping context extraction")
             return
@@ -87,8 +93,8 @@ class ContextExtractionManager(ContextExtractionGateway):
             # Calculate priority for each context finding
             self._calculate_priorities_for_context(context_list, config_tool, module_name)
-            # Print context with priorities
-            self._print_context(module_name, context_list)
+            # Save context to file, and print it to logs if requested
+            self._save_context(module_name, context_list, print_to_logs)
             logger.info(f"Context extraction completed for {module_name} with {len(context_list)} findings")
         except FileNotFoundError as e:
@@ -148,18 +154,24 @@ class ContextExtractionManager(ContextExtractionGateway):
             if finding.priority:
                 context_item.priority = finding.priority.scale
-    def _print_context(self, module_name: str, context_list: List) -> None:
+    def _save_context(self, module_name: str, context_list: List, print_to_logs: bool) -> None:
         context_key = self._context_key_mapping.get(module_name, f"{module_name}_context")
-        print("===== BEGIN CONTEXT OUTPUT =====")
-        print(
-            json.dumps(
-                {
-                    context_key: [
-                        asdict(context) for context in context_list
-                    ]
-                },
-                indent=2,
-            )
-        )
-        print("===== END CONTEXT OUTPUT =====")
+        context_data = {
+            context_key: [
+                asdict(context) for context in context_list
+            ]
+        }
+        context_json = json.dumps(context_data, indent=2)
+        if print_to_logs:
+            print("===== BEGIN CONTEXT OUTPUT =====")
+            print(context_json)
+            print("===== END CONTEXT OUTPUT =====")
+        output_file = os.path.join(os.getcwd(), f"{context_key}.json")
+        try:
+            with open(output_file, "w") as f:
+                f.write(context_json)
+            logger.info(f"Context output for {module_name} saved to {output_file}")
+        except OSError as e:
+            logger.error(f"Failed to save context output for {module_name} to {output_file}: {str(e)}")

@@ -1,11 +1,12 @@
 import requests
 import os
+import re
 import shutil
 import subprocess
 import time
 import base64
 import json
-from typing import List
+from typing import List, Optional, Tuple
 from devsecops_engine_tools.engine_sca.engine_container.src.domain.model.gateways.tool_gateway import (
     ToolGateway,
 )
@@ -202,22 +203,48 @@ class PrismaCloudManagerScan(ToolGateway):
             return access_prisma, token_prisma
         except ValueError:
             raise ValueError("The string is not properly formatted. Make sure it contains a ':'.")
-    def run_tool_container_sca(
-        self, remoteconfig, secret_tool, token_engine_container, image_name, result_file, base_image, exclusions, generate_sbom, docker_address, is_compressed_file=False
-    ):
-        prisma_key = (
-            f"{secret_tool['access_prisma']}:{secret_tool['token_prisma']}" if secret_tool else token_engine_container
-        )
+    def _parse_version(self, version_text: str) -> Optional[Tuple[int, ...]]:
+        match = re.search(r"(\d+(?:\.\d+)+)", version_text or "")
+        if not match:
+            return None
+        return tuple(int(part) for part in match.group(1).split("."))
+    def _get_twistcli_version(self, binary_path: str) -> Optional[Tuple[int, ...]]:
+        try:
+            result = subprocess.run(
+                [binary_path, "--version"],
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+            return self._parse_version(result.stdout or result.stderr)
+        except Exception as e:
+            logger.warning("Could not determine twistcli version at %s: %s", binary_path, e)
+            return None
+    def _resolve_twistcli_path(self, remoteconfig, prisma_key):
+        """Reuse the twistcli found in PATH unless it's older than PRISMA_CLOUD.MIN_TWISTCLI_VERSION."""
         twistcli_in_path = shutil.which(remoteconfig["PRISMA_CLOUD"]["TWISTCLI_PATH"])
+        min_version = remoteconfig["PRISMA_CLOUD"].get("MIN_TWISTCLI_VERSION")
+        if twistcli_in_path and min_version:
+            installed_version = self._get_twistcli_version(twistcli_in_path)
+            if not installed_version or installed_version < self._parse_version(min_version):
+                logger.warning(
+                    "twistcli found in PATH at %s (version %s) is older than required %s, downloading instead",
+                    twistcli_in_path,
+                    installed_version,
+                    min_version,
+                )
+                twistcli_in_path = None
         if twistcli_in_path:
             logger.info("twistcli found in PATH at %s, skipping download", twistcli_in_path)
-        file_path = twistcli_in_path or os.path.join(
-            os.getcwd(), remoteconfig["PRISMA_CLOUD"]["TWISTCLI_PATH"]
-        )
-        sbom_components = None
+            return twistcli_in_path
+        file_path = os.path.join(os.getcwd(), remoteconfig["PRISMA_CLOUD"]["TWISTCLI_PATH"])
         if not os.path.exists(file_path):
             self.download_twistcli(
                 file_path,
@@ -225,6 +252,18 @@ class PrismaCloudManagerScan(ToolGateway):
                 remoteconfig["PRISMA_CLOUD"]["PRISMA_CONSOLE_URL"],
                 remoteconfig["PRISMA_CLOUD"]["PRISMA_API_VERSION"],
             )
+        return file_path
+    def run_tool_container_sca(
+        self, remoteconfig, secret_tool, token_engine_container, image_name, result_file, base_image, exclusions, generate_sbom, docker_address, is_compressed_file=False
+    ):
+        prisma_key = (
+            f"{secret_tool['access_prisma']}:{secret_tool['token_prisma']}" if secret_tool else token_engine_container
+        )
+        file_path = self._resolve_twistcli_path(remoteconfig, prisma_key)
+        sbom_components = None
         image_scanned = self.scan_image(
             file_path,
             image_name,

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

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

devsecops-engine-tools 1.165.1__tar.gz → 1.167.0__tar.gz

devsecops-engine-tools 1.165.1tar.gz → 1.167.0tar.gz