devsecops-engine-tools 1.47.1__py3-none-any.whl → 1.47.3__py3-none-any.whl

devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py

@@ -5,6 +5,7 @@ import subprocess
 import logging
 import base64
 import json
+import platform
 from devsecops_engine_tools.engine_sca.engine_container.src.domain.model.gateways.tool_gateway import (
     ToolGateway,
 )
@@ -25,7 +26,25 @@ class PrismaCloudManagerScan(ToolGateway):
         prisma_console_url,
         prisma_api_version,
     ):
-        url = f"{prisma_console_url}/api/{prisma_api_version}/util/twistcli"
+        
+        machine = platform.machine()
+        system = platform.system()
+
+        base_url = f"{prisma_console_url}/api/{prisma_api_version}/util"
+
+        os_mapping = {
+            "Linux": "twistcli",
+            "Windows": "windows/twistcli.exe",
+            "Darwin": "osx/twistcli",
+        }
+
+        url = f"{base_url}/{os_mapping[system]}"
+
+        if system == "Linux" and machine == "aarch64":
+            url = f"{base_url}/arm64/twistcli"
+        elif system == "Darwin" and machine == "aarch64":
+            url = f"{base_url}/osx/arm64/twistcli"
+
         credentials = base64.b64encode(
             prisma_key.encode()
         ).decode()

devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py

@@ -33,7 +33,6 @@ class ImportScanUserCase:
         self.__rest_scan_configurations = rest_scan_configuration
         self.__rest_engagement = rest_engagement
 
-
     def get_file_type(self, path_file):
         __, extension = os.path.splitext(path_file)
         dict_rule_type_file = {
@@ -66,7 +65,7 @@ class ImportScanUserCase:
 
         response.url = f"{request.host_defect_dojo}/engagement/{str(response.engagement_id)}/finding/open"
         return response
-    
+
     def execute(self, request: ImportScanRequest) -> ImportScanRequest:
         product_id = None
 
@@ -74,9 +73,11 @@ class ImportScanUserCase:
             log = f"Name product {request.product_name} or product type {request.product_type_name} is empty"
             logger.error(log)
             raise ApiError(log)
-        
+
         logger.info(f"Match {request.scan_type}")
-        products = self.__rest_product.get_products({"name": request.product_name}) or self.__rest_product.get_products({"name": request.code_app})
+        products = self.__rest_product.get_products({"name": request.product_name})
+        if len(products.results) == 0:
+            products = self.__rest_product.get_products({"name": request.code_app})
         if len(products.results) > 0:
             product_id = products.results[0].id
             request.product_name = products.results[0].name

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.47.1'
+version = '1.47.3'

{devsecops_engine_tools-1.47.1.dist-info → devsecops_engine_tools-1.47.3.dist-info}/METADATA

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

{devsecops_engine_tools-1.47.1.dist-info → devsecops_engine_tools-1.47.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=9leceY-Awk1TwhWg1kXLWI3YA1L8cyiJmbTZJ1x1XsE,19
+devsecops_engine_tools/version.py,sha256=VsNR1olnzW93rFuJMr9PWVZS8Ze8JmFrCpnipZvXjcg,19
 devsecops_engine_tools/engine_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_core/src/applications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -209,7 +209,7 @@ devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_ada
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/docker/docker_images.py,sha256=0yWqo6AoHFKKGg8rbFOx-BWDra448HEOaWSP5G0B1dg,4991
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py,sha256=tf33YFYB47th4Zu0WtWpsrAm5I6_xCON4yOwFacTQLA,6758
+devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_cloud_manager_scan.py,sha256=Qjp5oswbH8y7yVoJ1g6CZjbUybS5XNf0LSOB1pUzSnE,7286
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/prisma_cloud/prisma_deserialize_output.py,sha256=oK0NKuPODm38qDgQjf6w40lfNG6NFJS43p5k44wDoMA,2562
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sca/engine_container/src/infrastructure/driven_adapters/trivy_tool/trivy_deserialize_output.py,sha256=LGqnO10Zt-0-TxUW6F1S46jVktlIwxWSYATKSVblCWI,2535
@@ -286,7 +286,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/component.p
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/engagement.py,sha256=SVX-weFRPT3DK7w6IBrLuWS4L6vboMuZtwXAQmIHfEE,406
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/finding.py,sha256=TjfpdJtaBwQvT8XNJKBf6tuOASOAw7ZiOxJbqsKadaA,1689
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/finding_exclusion.py,sha256=VqdwBiQGc9XFpatvbXGL837LtTxkWlfhWH46W1cTbCg,455
-devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py,sha256=ybXVAIL7tjHrip5maK9iWqC4DmugaxBLiVJ6ayXmiZw,7157
+devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py,sha256=MgQ5bPqmGh-rjv6eVUogawZqg97JW0kpF9mbMAomNSI,7204
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/product.py,sha256=6f6eABdC79zOopMe_Rif3XoGG-yFfq9x_EOkevTuGDY,368
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -347,8 +347,8 @@ devsecops_engine_tools/engine_utilities/utils/name_conversion.py,sha256=ADJrRGax
 devsecops_engine_tools/engine_utilities/utils/printers.py,sha256=amYAr9YQfYgR6jK9a2l26z3oovFPQ3FAKmhq6BKhEBA,623
 devsecops_engine_tools/engine_utilities/utils/session_manager.py,sha256=Z0fdhB3r-dxU0nGSD9zW_B4r2Qol1rUnUCkhFR0U-HQ,487
 devsecops_engine_tools/engine_utilities/utils/utils.py,sha256=HCjS900TBoNcHrC4LaiP-Kf9frVdtagF130qOUgnO2M,6757
-devsecops_engine_tools-1.47.1.dist-info/METADATA,sha256=p51qq6-NnJ3WCmMuaAc7K3ohlaogKKR96f2LRPq0SAc,11779
-devsecops_engine_tools-1.47.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-devsecops_engine_tools-1.47.1.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
-devsecops_engine_tools-1.47.1.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.47.1.dist-info/RECORD,,
+devsecops_engine_tools-1.47.3.dist-info/METADATA,sha256=tIk-YkuYM4vLRY0holdhaFKaD54RUIKSr8_ikmsiDcg,11779
+devsecops_engine_tools-1.47.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.47.3.dist-info/entry_points.txt,sha256=MHCTFFs9bdNKo6YcWCcBW2_8X6yTisgLOlmVx-V8Rxc,276
+devsecops_engine_tools-1.47.3.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.47.3.dist-info/RECORD,,