PyPI - devsecops-engine-tools - Versions diffs - 1.51.0__tar.gz → 1.52.0__tar.gz - Mend

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

@@ -13,6 +13,7 @@ class VulnerabilityManagement:
     repository_provider: str
     source_code_management_uri: str
     base_compact_remote_config_url: str
+    sonar_instance: any
     access_token: str
     version: str
     build_id: str

@@ -165,6 +165,7 @@ class HandleScan:
                             self.devops_platform_gateway.get_base_compact_remote_config_url(
                                 dict_args["remote_config_repo"]
                             ),
+                            None,
                             self.devops_platform_gateway.get_variable("access_token"),
                             self.devops_platform_gateway.get_variable(
                                 "build_execution_id"

@@ -461,6 +461,7 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
         use_cmdb: bool,
     ):
         tool_scm_conf_mapping = vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["TOOL_SCM_MAPPING"]
+        tool_sonar_conf_mapping = vulnerability_management.config_tool["VULNERABILITY_MANAGER"]["DEFECT_DOJO"]["TOOL_SONAR_MAPPING"]
         common_fields = {
             "scan_type": self.scan_type_mapping[vulnerability_management.scan_type],
             "file": vulnerability_management.input_core.path_file_results,
@@ -499,6 +500,15 @@ class DefectDojoPlatform(VulnerabilityManagementGateway):
             "reimport_scan": vulnerability_management.config_tool[
                 "VULNERABILITY_MANAGER"
             ]["DEFECT_DOJO"]["REIMPORT_SCAN"],
+            "tool_sonarqube_configuration": (
+                tool_sonar_conf_mapping[
+                    vulnerability_management.sonar_instance.upper()
+                ]
+                if vulnerability_management.sonar_instance is not None
+                and vulnerability_management.sonar_instance.upper()
+                in tool_sonar_conf_mapping
+                else tool_sonar_conf_mapping["DEFAULT"]
+            ),
         }
         if use_cmdb:

@@ -168,8 +168,17 @@ class BreakBuild:
             f"Mitigated: {mitigated_count}   AllFindings: {all_findings_count}   BaseImage: {base_image_count}   NewFindings: {self.policy_excluded}   Transferred: {transferred_list_count}   WhiteList: {white_list_count}\n\n"
         )
         total = all_findings_count - self.policy_excluded - white_list_count - base_image_count - transferred_list_count
-        remediation_rate_value = self._get_percentage(mitigated_count / total)
+        if total == 0:
+            print(
+                self.devops_platform_gateway.message(
+                    "succeeded",
+                    "No findings to mitigate",
+                )
+            )
+            return
+        remediation_rate_value = self._get_percentage(mitigated_count / total)
         risk_threshold = self._get_remediation_rate_threshold(total)
         self.remediation_rate = remediation_rate_value

devsecops-engine-tools 1.51.0tar.gz → 1.52.0tar.gz

@@ -202,7 +202,7 @@ class ImportScanSerializer(Schema):
     test_title = fields.Str(required=False)
     product_description = fields.Str(required=False)
     create_finding_groups_for_all_findings = fields.Str(required=False)
-    tool_sonarqube_configuration = fields.Int(required=False, load_default=1)
+    tool_sonarqube_configuration = fields.Int(required=False)
     tool_scm_configuration = fields.Int(required=False)
     code_app = fields.Str(required=False)
     # defect-dojo credential

@@ -59,6 +59,11 @@ def get_inputs_from_cli(args):
         required=False,
         help="Url to access sonar API",
     )
+    parser.add_argument(
+        "--sonar_instance",
+        required=False,
+        help="Name of the sonar instance to recognize tool config",
+    )
     parser.add_argument(
         "--token_cmdb",
         required=False,
@@ -82,6 +87,7 @@ def get_inputs_from_cli(args):
         "use_secrets_manager": args.use_secrets_manager,
         "send_metrics": args.send_metrics,
         "sonar_url": args.sonar_url,
+        "sonar_instance": args.sonar_instance,
         "token_cmdb": args.token_cmdb,
         "token_vulnerability_management": args.token_vulnerability_management,
         "token_sonar": args.token_sonar,

@@ -66,7 +66,13 @@ class ReportSonar:
         if args["use_secrets_manager"] == "true":
             secret = self.secrets_manager_gateway.get_secret(config_tool)
-            secret_tool = secret
+            secret_tool = secret.copy()
+            secret["token_sonar"] = (
+                secret[f"token_{args['sonar_instance'].lower()}"]
+                if args["sonar_instance"] is not None
+                and f"token_{args['sonar_instance'].lower()}" in secret
+                else secret["token_sonar"]
+            )
         else:
             secret = args
             secret_tool = None
@@ -94,6 +100,7 @@ class ReportSonar:
             config_tool = config_tool,
             source_code_management_uri = source_code_management_uri,
             base_compact_remote_config_url = compact_remote_config_url,
+            sonar_instance = args["sonar_instance"],
             repository_provider = self.devops_platform_gateway.get_variable("repository_provider"),
             access_token = self.devops_platform_gateway.get_variable("access_token"),
             version = self.devops_platform_gateway.get_variable("build_execution_id"),

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

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