devsecops-engine-tools 1.8.15__py3-none-any.whl → 1.8.16__py3-none-any.whl

devsecops_engine_tools/engine_sast/engine_iac/src/domain/usecases/iac_scan.py

@@ -38,7 +38,7 @@ class IacScan:
         )
 
         findings_list, path_file_results = [], None
-        if skip_tool == "false":
+        if skip_tool is False:
             findings_list, path_file_results = self.tool_gateway.run_tool(
                 config_tool_iac,
                 folders_to_scan,
@@ -82,7 +82,7 @@ class IacScan:
 
     def complete_config_tool(self, data_file_tool, exclusions, tool, dict_args):
         config_tool = ConfigTool(json_data=data_file_tool)
-        skip_tool = "false"
+        skip_tool = False
 
         config_tool.exclusions = exclusions
         config_tool.scope_pipeline = self.devops_platform_gateway.get_variable(
@@ -95,13 +95,9 @@ class IacScan:
             config_tool.exclusions_scope = config_tool.exclusions.get(
                 config_tool.scope_pipeline
             ).get(tool)
-            skip_tool = (
-                "true"
-                if config_tool.exclusions.get(config_tool.scope_pipeline).get(
-                    "SKIP_TOOL"
-                )
-                else "false"
-            )
+            skip_tool = bool(config_tool.exclusions.get(config_tool.scope_pipeline).get("SKIP_TOOL"))
+        
+        skip_tool = bool(re.match(config_tool.ignore_search_pattern, config_tool.scope_pipeline, re.IGNORECASE))
 
         if dict_args["folder_path"]:
             if (
@@ -117,9 +113,7 @@ class IacScan:
 
             folders_to_scan = [dict_args["folder_path"]]
         else:
-            folders_to_scan = self.search_folders(
-                config_tool.search_pattern, config_tool.ignore_search_pattern
-            )
+            folders_to_scan = self.search_folders(config_tool.search_pattern)
 
         if len(folders_to_scan) == 0:
             logger.warning(
@@ -129,12 +123,10 @@ class IacScan:
 
         return config_tool, folders_to_scan, skip_tool
 
-    def search_folders(self, search_pattern, ignore_pattern):
+    def search_folders(self, search_pattern):
         current_directory = os.getcwd()
         patron = (
-            "(?i)(?!.*(?:"
-            + "|".join(ignore_pattern)
-            + ")).*?("
+            "(?i).*?("
             + "|".join(search_pattern)
             + ").*$"
         )

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

@@ -90,7 +90,7 @@ class ImportScanUserCase:
 
         logger.debug(f"search Engagement name: {request.engagement_name}")
         engagement = self.__rest_engagement.get_engagements(request.engagement_name)
-        if engagement.results == []:
+        if engagement.results == [] or any(engagement.name != request.engagement_name for engagement in engagement.results):
             engagement = self.__rest_engagement.post_engagement(request.engagement_name, product_id)
             logger.debug(f"Egagement created: {engagement.name}")
         else:

devsecops_engine_tools/version.py

@@ -1 +1 @@
-version = '1.8.15'
+version = '1.8.16'

{devsecops_engine_tools-1.8.15.dist-info → devsecops_engine_tools-1.8.16.dist-info}/METADATA

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

{devsecops_engine_tools-1.8.15.dist-info → devsecops_engine_tools-1.8.16.dist-info}/RECORD

@@ -1,5 +1,5 @@
 devsecops_engine_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/version.py,sha256=zv6hUsTPjiiPSu2Q1_KZavv7pBnsoDnadVZhZYRWEmc,18
+devsecops_engine_tools/version.py,sha256=WF_8bWFOFaPxyluRTmh6SE2CB5-ps3IczshDL6I5HTc,18
 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
@@ -95,7 +95,7 @@ devsecops_engine_tools/engine_sast/engine_iac/src/domain/model/config_tool.py,sh
 devsecops_engine_tools/engine_sast/engine_iac/src/domain/model/gateways/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_iac/src/domain/model/gateways/tool_gateway.py,sha256=ClElxyHbwfDCW0fgcehaNfQLq00zozhO71EnyCjzt-U,182
 devsecops_engine_tools/engine_sast/engine_iac/src/domain/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devsecops_engine_tools/engine_sast/engine_iac/src/domain/usecases/iac_scan.py,sha256=VieJzkkJDtnSdrnEymKV3XFZC9cp7xF91PnzpjmeFuQ,5754
+devsecops_engine_tools/engine_sast/engine_iac/src/domain/usecases/iac_scan.py,sha256=uK33A9-af2CZYgW7rjhWBE8d2PNML_3C_I2do7xcYfQ,5606
 devsecops_engine_tools/engine_sast/engine_iac/src/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_iac/src/infrastructure/driven_adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devsecops_engine_tools/engine_sast/engine_iac/src/infrastructure/driven_adapters/checkov/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -225,7 +225,7 @@ devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/__init__.py
 devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/cmdb.py,sha256=BUOdvP39bEMQ6Unr2hB28eljVGU2Uv8dDEkzRyEJgyQ,2650
 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/import_scan.py,sha256=6Ik3_IUPgsvVQ3uXMV6nkxdT89-lVNQVdvVWzmZSxgE,6794
+devsecops_engine_tools/engine_utilities/defect_dojo/domain/user_case/import_scan.py,sha256=kIH3XSKUMkz6hcrc2IXR_GkPQL2IdwY0Vd0IAXw8oNI,6882
 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
 devsecops_engine_tools/engine_utilities/defect_dojo/infraestructure/driver_adapters/cmdb.py,sha256=Mx1_ed_-91s6u7roO27g6n5mv1IwniXP9AQdmj7HE-g,2630
@@ -256,8 +256,8 @@ devsecops_engine_tools/engine_utilities/utils/logger_info.py,sha256=4Mz8Bwlm9Mku
 devsecops_engine_tools/engine_utilities/utils/name_conversion.py,sha256=ADJrRGaxYSDe0ZRh6VHRf53H4sXPcb-vNP_i81PUn3I,307
 devsecops_engine_tools/engine_utilities/utils/printers.py,sha256=amYAr9YQfYgR6jK9a2l26z3oovFPQ3FAKmhq6BKhEBA,623
 devsecops_engine_tools/engine_utilities/utils/session_manager.py,sha256=yNtlT-8Legz1sHbGPH8LNYjL-LgDUE0zXG2rYjiab7U,290
-devsecops_engine_tools-1.8.15.dist-info/METADATA,sha256=lLgXhx1m99YAl-D_zKXHEIjKjEZf0a_QwMHKkegwSns,10444
-devsecops_engine_tools-1.8.15.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-devsecops_engine_tools-1.8.15.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
-devsecops_engine_tools-1.8.15.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
-devsecops_engine_tools-1.8.15.dist-info/RECORD,,
+devsecops_engine_tools-1.8.16.dist-info/METADATA,sha256=P3KJcZZO63XMRpjetb6n_bIVPUYMvoogacGeOGXLPMA,10444
+devsecops_engine_tools-1.8.16.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+devsecops_engine_tools-1.8.16.dist-info/entry_points.txt,sha256=9IjXF_7Zpgowq_SY6OSmsA9vZze18a8_AeHwkQVrgKk,131
+devsecops_engine_tools-1.8.16.dist-info/top_level.txt,sha256=ge6y0X_xBAU1aG3EMWFtl9djbVyg5BxuSp2r2Lg6EQU,23
+devsecops_engine_tools-1.8.16.dist-info/RECORD,,