PyPI - devsecops-engine-tools - Versions diffs - 1.145.0__tar.gz → 1.147.0__tar.gz - Mend

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

@@ -40,8 +40,10 @@ class TrivyScanSBOM(ToolGateway):
         if not os.path.exists(sbom):
             raise FileNotFoundError("SBOM file not found, enable SBOM generation to scan with Trivy.")
-        if remote_config["TRIVY"].get("PRINT_SBOM", False):
-            with open(sbom, "r") as file: print(json.dumps(json.load(file), indent=4))
+        if pipeline_name in remote_config["TRIVY"].get("PRINT_SBOM", []):
+            with open(sbom, "r") as file:
+                print("SBOM content:")
+                print(json.dumps(json.load(file), indent=4))
         dependencies_scanned = self._scan_dependencies_sbom(command_prefix, sbom)

@@ -13,7 +13,9 @@ class ImportScanRequest:
     file: str = ""
     product_type_name: str = ""
     product_name: str = ""
+    hold_found_product_engagement: bool = False
     engagement_name: str = ""
+    engagement_description: str = ""
     engagement_end_date: str = ""
     source_code_management_uri: str = ""
     engagement: int = 0
@@ -77,7 +79,9 @@ class ImportScanRequest:
             file=obj.get("file"),
             product_type_name=obj.get("product_type_name"),
             product_name=obj.get("product_name"),
+            hold_found_product_engagement=obj.get("hold_found_product_engagement"),
             engagement_name=obj.get("engagement_name"),
+            engagement_description=obj.get("engagement_description"),
             engagement_end_date=obj.get("engagement_end_date"),
             source_code_management_uri=obj.get("source_code_management_uri"),
             engagement=obj.get("engagement"),
@@ -120,7 +124,9 @@ class ImportScanRequest:
             "file": self.file,
             "product_type_name": self.product_type_name,
             "product_name": self.product_name,
+            "hold_found_product_engagement": self.hold_found_product_engagement,
             "engagement_name": self.engagement_name,
+            "engagement_description": self.engagement_description,
             "auto_create_context": self.auto_create_context,
             "deduplication_on_engagement": self.deduplication_on_engagement,
             "lead": self.lead,

@@ -177,7 +177,9 @@ class ImportScanSerializer(Schema):
     file = fields.Str(required=False)
     product_type_name = fields.Str(required=False)
     product_name = fields.Str(required=False)
+    hold_found_product_engagement = fields.Bool(required=False)
     engagement_name = fields.Str(required=True)
+    engagement_description = fields.Str(required=False)
     engagement_end_date = fields.Str(required=False)
     source_code_management_uri = fields.Str(required=False, load_default=None)
     engagement = fields.Int(required=False)

@@ -68,7 +68,7 @@ class ImportScanUserCase:
     def execute(self, request: ImportScanRequest) -> ImportScanRequest:
         product_id = None
         if (request.product_name or request.product_type_name) == "":
             log = f"Name product {request.product_name} or product type {request.product_type_name} is empty"
             logger.error(log)
@@ -129,9 +129,24 @@ class ImportScanUserCase:
             engagement = self.__rest_engagement.post_engagement(request, product_id, request.tool_scm_configuration)
             logger.debug(f"Engagement created: {engagement.name}")
         else:
-            engagement = [engagement for engagement in engagement.results if engagement.product == product_id and engagement.name == request.engagement_name]
+            if request.hold_found_product_engagement:
+                engagement = [engagement for engagement in engagement.results if engagement.name == request.engagement_name]
+            else:
+                engagement = [engagement for engagement in engagement.results if engagement.product == product_id and engagement.name == request.engagement_name]
             if engagement:
                 logger.debug(f"Engagement found: {engagement[0].name} whit product id: {engagement[0].product}")
+                if request.hold_found_product_engagement and product_id != engagement[0].product:
+                    product_engagement = self.__rest_product.get_products({"id": engagement[0].product, "prefetch": "prod_type"})
+                    if len(product_engagement.results) > 0:
+                        product_eng = product_engagement.results[0]
+                        request.product_name = product_eng.name
+                        request.product_type_name = product_engagement.prefetch.prod_type[str(product_eng.prod_type)].name
+                        logger.debug(f"Hold Product engagement found: {request.product_name} with product type: {request.product_type_name}")
+                if request.engagement_description and engagement[0].description != request.engagement_description:
+                    engagement = self.__rest_engagement.patch_engagement(request, engagement[0].id)
+                    logger.debug(f"Engagement updated: {engagement.name}")
             else:
                 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}")

@@ -16,6 +16,7 @@ from datetime import datetime
 from devsecops_engine_tools.engine_utilities.settings import SETTING_LOGGER
 logger = MyLogger.__call__(**SETTING_LOGGER).get_logger()
+CONTENT_TYPE_JSON = "application/json"
 class EngagementRestConsumer:
@@ -32,7 +33,7 @@ class EngagementRestConsumer:
         url = f"{self.__host}/api/v2/engagements/"
         headers = {
             "Authorization": f"Token {self.__token}",
-            "Content-Type": "application/json",
+            "Content-Type": CONTENT_TYPE_JSON,
         }
         try:
             response = self.__session.get(
@@ -61,6 +62,7 @@ class EngagementRestConsumer:
         url = f"{self.__host}/api/v2/engagements/"
         data = {
                 "name": request.engagement_name,
+                "description": request.engagement_description,
                 "target_start": str(datetime.now().date()),
                 "target_end": str(datetime.now().date()),
                 "product": product_id,
@@ -76,7 +78,7 @@ class EngagementRestConsumer:
         headers = {
             "Authorization": f"Token {self.__token}",
-            "Content-Type": "application/json",
+            "Content-Type": CONTENT_TYPE_JSON,
         }
         try:
             response = self.__session.post(
@@ -89,3 +91,22 @@ class EngagementRestConsumer:
         except Exception as e:
             raise ApiError(e)
         return response
+    def patch_engagement(self, request: ImportScanRequest, engagement_id):
+        url = f"{self.__host}/api/v2/engagements/{engagement_id}/"
+        data = {
+            "description": request.engagement_description,
+        }
+        headers = {
+            "Authorization": f"Token {self.__token}",
+            "Content-Type": CONTENT_TYPE_JSON,
+        }
+        try:
+            response = self.__session.patch(url=url, headers=headers, data=json.dumps(data), verify=VERIFY_CERTIFICATE)
+            if response.status_code != 200:
+                logger.error(response.json())
+                raise ApiError(response.json())
+            response = Engagement().from_dict(response.json())
+        except Exception as e:
+            raise ApiError(e)
+        return response

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

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

devsecops-engine-tools 1.145.0__tar.gz → 1.147.0__tar.gz

devsecops-engine-tools 1.145.0tar.gz → 1.147.0tar.gz