PyPI - devsecops-engine-tools - Versions diffs - 1.170.1__tar.gz → 1.171.0__tar.gz - Mend

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

@@ -79,7 +79,7 @@ class CdxGen(SbomManagerGateway):
         os_platform = platform.system()
         os_architecture = platform.machine()
         base_url = (
-            f"https://github.com/CycloneDX/cdxgen/releases/download/v{cdxgen_version}/"
+            f"https://github.com/cdxgen/cdxgen/releases/download/v{cdxgen_version}/"
         )
         if os_platform == "Linux":

@@ -169,12 +169,12 @@ class ImportScanUserCase:
             ]
         if not matching:
-            engagement = self.__rest_engagement.post_engagement(request, product_id, request.tool_scm_configuration)
-            logger.debug(f"Engagement created: {engagement.name} whit product id {engagement.product}")
+            updated_engagement = self.__rest_engagement.patch_engagement(request, engagement_list.results[0].id, request.tool_scm_configuration, product_id)
+            logger.debug(f"Engagement updated: {updated_engagement.name} with product id {updated_engagement.product}")
             return
         engagement = matching[0]
-        logger.debug(f"Engagement found: {engagement.name} whit product id: {engagement.product}")
+        logger.debug(f"Engagement found: {engagement.name} with product id: {engagement.product}")
         if request.hold_found_product_engagement and product_id != engagement.product:
             self._apply_hold_found_product_context(request, engagement.product)

@@ -77,7 +77,7 @@ class CmdbRestConsumer:
                     )
                 return self.process_response(
-                    response, response_format, cmdb_object, request.code_app
+                    response, response_format, cmdb_object, request
                 )
             return Utils().retries_requests(
@@ -109,21 +109,24 @@ class CmdbRestConsumer:
         self.__token = response
     def process_response(
-        self, response, response_format, cmdb_object, code_app
+        self, response, response_format, cmdb_object, request
     ) -> Cmdb:
         if response.status_code != 200:
             logger.warning(response)
             raise ApiError(f"Error querying cmdb: {response.reason}")
         if response.json() == [] or '[]' in response.text:
-            logger.warning(f"Code app: {code_app} not found in CMDB")
+            logger.warning(f"Code app: {request.code_app} not found in CMDB")
             return cmdb_object  # Producto es Orphan
         data = self.get_nested_data(response, response_format)
         data_map = self.mapping_cmdb(data)
         logger.debug(data_map)
         cmdb_object = Cmdb.from_dict(data_map)
-        cmdb_object.codigo_app = code_app
+        if cmdb_object.codigo_app is None:
+            cmdb_object.codigo_app = request.code_app
+        else:
+            request.code_app = cmdb_object.codigo_app
         return cmdb_object
     def initialize_cmdb_object(self, request: ImportScanRequest) -> Cmdb:

@@ -92,11 +92,13 @@ class EngagementRestConsumer:
             raise ApiError(e)
         return response
-    def patch_engagement(self, request: ImportScanRequest, engagement_id, tool_scm_configuration_id=None):
+    def patch_engagement(self, request: ImportScanRequest, engagement_id, tool_scm_configuration_id=None, product_id=None):
         url = f"{self.__host}/api/v2/engagements/{engagement_id}/"
         data = {
             "description": request.engagement_description,
         }
+        if product_id:
+            data["product"] = product_id
         if request.source_code_management_uri:
             data["source_code_management_uri"] = request.source_code_management_uri

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

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

devsecops-engine-tools 1.170.1__tar.gz → 1.171.0__tar.gz