devsecops-engine-tools 1.8.14__tar.gz → 1.8.15__tar.gz

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/PKG-INFO

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

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_core/src/domain/usecases/handle_scan.py

@@ -104,13 +104,8 @@ class HandleScan:
                 )
             return findings_list, input_core
         elif "engine_container" in dict_args["tool"]:
-            secret_sca = ""
-            if secret_tool is not None:
-                secret_sca = secret_tool["token_prisma_cloud"]
-            else:
-                secret_sca = dict_args["token_engine_container"]
             findings_list, input_core = runner_engine_container(
-                dict_args, config_tool["ENGINE_CONTAINER"]["TOOL"], secret_sca, self.devops_platform_gateway
+                dict_args, config_tool["ENGINE_CONTAINER"]["TOOL"], secret_tool, self.devops_platform_gateway
             )
             if (
                 dict_args["use_vulnerability_management"] == "true"
@@ -137,12 +132,8 @@ class HandleScan:
                 )
             return findings_list, input_core
         elif "engine_dependencies" in dict_args["tool"]:
-            if secret_tool is not None:
-                secret_sca = secret_tool["token_xray"]
-            else:
-                secret_sca = dict_args["token_engine_dependencies"]
             findings_list, input_core = runner_engine_dependencies(
-                dict_args, config_tool, secret_sca, self.devops_platform_gateway
+                dict_args, config_tool, secret_tool, self.devops_platform_gateway
             )
 
             if (

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_container/src/applications/runner_container_scan.py

@@ -18,7 +18,7 @@ from devsecops_engine_tools.engine_sca.engine_container.src.infrastructure.drive
 )
 
 
-def runner_engine_container(dict_args, tool, token, tool_remote):
+def runner_engine_container(dict_args, tool, secret_tool, tool_remote):
     try:
         if tool.lower() == "trivy":
             tool_run = TrivyScan()
@@ -33,7 +33,7 @@ def runner_engine_container(dict_args, tool, token, tool_remote):
             tool_images,
             tool_deseralizator,
             dict_args,
-            token,
+            secret_tool,
             tool,
         )
 

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_container/src/domain/model/gateways/tool_gateway.py

@@ -3,5 +3,5 @@ from abc import ABCMeta, abstractmethod
 
 class ToolGateway(metaclass=ABCMeta):
     @abstractmethod
-    def run_tool_container_sca(self, dict_args, token, scan_image, release) -> str:
+    def run_tool_container_sca(self, dict_args, secret_tool, token_engine_container, scan_image, release) -> str:
         "run tool container sca"

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_container/src/domain/usecases/container_sca_scan.py

@@ -19,7 +19,8 @@ class ContainerScaScan:
         tool_images: ImagesGateway,
         tool_deseralizator: DeseralizatorGateway,
         build_id,
-        token,
+        secret_tool,
+        token_engine_container,
         image_to_scan,
     ):
         self.tool_run = tool_run
@@ -27,7 +28,8 @@ class ContainerScaScan:
         self.tool_images = tool_images
         self.tool_deseralizator = tool_deseralizator
         self.build_id = build_id
-        self.token = token
+        self.secret_tool = secret_tool
+        self.token_engine_container = token_engine_container
         self.image_to_scan = image_to_scan
 
     def get_image(self, image_to_scan):
@@ -73,7 +75,7 @@ class ContainerScaScan:
                 print(f"The image {image_name} has already been scanned previously.")
                 return image_scanned
             image_scanned = self.tool_run.run_tool_container_sca(
-                self.remote_config, self.token, image_name, result_file
+                self.remote_config, self.secret_tool, self.token_engine_container, image_name, result_file
             )
             self.set_image_scanned(image_name)
         else:

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py

@@ -75,8 +75,9 @@ class PrismaCloudManagerScan(ToolGateway):
             logger.error(f"Error during image scan of {image_name}: {e.stderr}")
 
     def run_tool_container_sca(
-        self, remoteconfig, prisma_secret_key, image_name, result_file
+        self, remoteconfig, secret_tool, token_engine_container, image_name, result_file
     ):
+        prisma_secret_key = secret_tool["token_prisma_cloud"] if secret_tool else token_engine_container
         file_path = os.path.join(
             os.getcwd(), remoteconfig["PRISMA_CLOUD"]["TWISTCLI_PATH"]
         )

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool/trivy_manager_scan.py

@@ -78,7 +78,7 @@ class TrivyScan(ToolGateway):
         except Exception as e:
             logger.error(f"Error during image scan of {image_name}: {e}")
 
-    def run_tool_container_sca(self, remoteconfig, token, image_name, result_file):
+    def run_tool_container_sca(self, remoteconfig, secret_tool, token_engine_container, image_name, result_file):
         trivy_version = remoteconfig["TRIVY"]["TRIVY_VERSION"]
         os_platform = platform.system()
         arch_platform = platform.architecture()[0]

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/entry_points/entry_point_tool.py

@@ -19,7 +19,7 @@ def init_engine_sca_rm(
     tool_images,
     tool_deseralizator,
     dict_args,
-    token,
+    secret_tool,
     tool,
 ):
     remote_config = tool_remote.get_remote_config(
@@ -47,7 +47,8 @@ def init_engine_sca_rm(
             tool_images,
             tool_deseralizator,
             build_id,
-            token,
+            secret_tool,
+            dict_args["token_engine_container"],
             image_to_scan,
         )
         image_scanned = container_sca_scan.process()

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_dependencies/src/applications/runner_dependencies_scan.py

@@ -9,7 +9,7 @@ from devsecops_engine_tools.engine_sca.engine_dependencies.src.infrastructure.en
 )
 
 
-def runner_engine_dependencies(dict_args, config_tool, token, devops_platform_gateway):
+def runner_engine_dependencies(dict_args, config_tool, secret_tool, devops_platform_gateway):
     try:
         if config_tool["ENGINE_DEPENDENCIES"]["TOOL"] == "XRAY":
             tool_run = XrayScan()
@@ -20,7 +20,7 @@ def runner_engine_dependencies(dict_args, config_tool, token, devops_platform_ga
             devops_platform_gateway,
             tool_deserializator,
             dict_args,
-            token,
+            secret_tool,
             config_tool["ENGINE_DEPENDENCIES"]["TOOL"],
         )
 

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/model/gateways/tool_gateway.py

@@ -4,6 +4,6 @@ from abc import ABCMeta, abstractmethod
 class ToolGateway(metaclass=ABCMeta):
     @abstractmethod
     def run_tool_dependencies_sca(
-        self, remote_config, dict_args, to_scan, token
+        self, remote_config, dict_args, to_scan, secret_tool, token_engine_dependencies
     ) -> str:
         "run tool dependencies sca"

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_dependencies/src/domain/usecases/dependencies_sca_scan.py

@@ -16,7 +16,7 @@ class DependenciesScan:
         exclusions,
         pipeline_name,
         to_scan,
-        token,
+        secret_tool,
     ):
         self.tool_run = tool_run
         self.tool_deserializator = tool_deserializator
@@ -25,7 +25,7 @@ class DependenciesScan:
         self.pipeline_name = pipeline_name
         self.dict_args = dict_args
         self.to_scan = to_scan
-        self.token = token
+        self.secret_tool = secret_tool
 
     def process(self):
         """
@@ -39,7 +39,8 @@ class DependenciesScan:
             self.exclusions,
             self.pipeline_name,
             self.to_scan,
-            self.token,
+            self.secret_tool,
+            self.dict_args["token_engine_dependencies"],
         )
 
     def deserializator(self, dependencies_scanned):

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/driven_adapters/xray_tool/xray_manager_scan.py

@@ -236,8 +236,10 @@ class XrayScan(ToolGateway):
         exclusion,
         pipeline_name,
         to_scan,
-        token,
+        secret_tool,
+        token_engine_dependencies
     ):
+        token = secret_tool["token_xray"] if secret_tool else token_engine_dependencies
         if dict_args["xray_mode"] == "scan":
             pattern = self.excluded_files(remote_config, pipeline_name, exclusion)
             to_scan = self.find_artifacts(

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_sca/engine_dependencies/src/infrastructure/entry_points/entry_point_tool.py

@@ -18,7 +18,7 @@ logger = MyLogger.__call__(**settings.SETTING_LOGGER).get_logger()
 
 
 def init_engine_dependencies(
-    tool_run, tool_remote, tool_deserializator, dict_args, token, tool
+    tool_run, tool_remote, tool_deserializator, dict_args, secret_tool, tool
 ):
     remote_config = tool_remote.get_remote_config(
         dict_args["remote_config_repo"],
@@ -51,7 +51,7 @@ def init_engine_dependencies(
                 exclusions,
                 pipeline_name,
                 to_scan,
-                token,
+                secret_tool,
             )
             dependencies_scanned = dependencies_sca_scan.process()
             deserialized = (

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/cmdb.py

@@ -31,7 +31,7 @@ class CmdbRestConsumer:
         try:
             response = self.__session.post(self.__host, headers=headers, data=data, verify=VERIFY_CERTIFICATE)
             if response.status_code != 200:
-                logger.error(response)
+                logger.warning(response)
                 raise ApiError(f"Error querying cmdb: {response.reason}")
 
             if response.json() == []:
@@ -45,7 +45,7 @@ class CmdbRestConsumer:
             logger.info(data_map)
             cmdb_object = Cmdb.from_dict(data_map)
         except Exception as e:
-            logger.error(e)
+            logger.warning(e)
             return cmdb_object
         return cmdb_object
 

devsecops_engine_tools-1.8.15/devsecops_engine_tools/version.py

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

{devsecops_engine_tools-1.8.14 → devsecops_engine_tools-1.8.15}/devsecops_engine_tools.egg-info/PKG-INFO

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

devsecops_engine_tools-1.8.14/devsecops_engine_tools/version.py

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