Fixes #1334

Author: okorach

sonar/branches.py

@@ -220,7 +220,8 @@ def export(self, export_settings: types.ConfigSettings) -> types.ObjectJsonRepr:
         :return: The branch new code period definition
         :rtype: str
         """
-        from sonar import issues
+        from sonar.issues import count as issue_count
+        from sonar.hotspots import count as hotspot_count
 
         log.debug("Exporting %s", str(self))
         data = {settings.NEW_CODE_PERIOD: self.new_code()}
@@ -243,16 +244,26 @@ def export(self, export_settings: types.ConfigSettings) -> types.ObjectJsonRepr:
         if export_settings.get("MODE", "") == "MIGRATION":
             tpissues = self.count_third_party_issues()
             issue_data = {"thirdParty": tpissues if len(tpissues) > 0 else 0}
+            proj_key = self.concerned_object.key
             if self.endpoint.version() >= (10, 0, 0):
-                issue_data["falsePositives"] = issues.count(
-                    self.endpoint, components=self.concerned_object.key, branch=self.name, issueStatuses="FALSE_POSITIVE"
-                )
-                issue_data["accepted"] = issues.count(self.endpoint, components=self.concerned_object.key, branch=self.name, issueStatuses="ACCEPTED")
+                params = {"components": proj_key, "branch": self.name}
+                data["issues"] = {
+                    "falsePositives": issue_count(self.endpoint, issueStatuses="FALSE_POSITIVE", **params),
+                    "accepted": issue_count(self.endpoint, issueStatuses="ACCEPTED", **params),
+                }
+                params = {"project": proj_key, "branch": self.name}
             else:
-                issue_data["falsePositives"] = issues.count(
-                    self.endpoint, componentKeys=self.concerned_object.key, branch=self.name, resolutions="FALSE-POSITIVE"
-                )
-                issue_data["wontFix"] = issues.count(self.endpoint, componentKeys=self.concerned_object.key, branch=self.name, resolutions="WONTFIX")
+                params = {"componentKeys": proj_key, "branch": self.name}
+                data["issues"] = {
+                    "falsePositives": issue_count(self.endpoint, resolutions="FALSE-POSITIVE", **params),
+                    "wontFix": issue_count(self.endpoint, resolutions="WONTFIX", **params),
+                }
+                params = {"projectKey": proj_key, "branch": self.name}
+            data["hotspots"] = {
+                "acknowledged": hotspot_count(self.endpoint, resolution="ACKNOWLEDGED", **params),
+                "safe": hotspot_count(self.endpoint, resolution="SAFE", **params),
+                "fixed": hotspot_count(self.endpoint, resolution="FIXED", **params),
+            }
             data["issues"] = issue_data
             log.debug("%s has these notable issues %s", str(self), str(data["issues"]))
         data = util.remove_nones(data)

sonar/hotspots.py

@@ -491,3 +491,12 @@ def post_search_filter(hotspots_dict: dict[str, Hotspot], filters: types.ApiPara
             filtered_findings.pop(key, None)
 
     return filtered_findings
+
+
+def count(endpoint: pf.Platform, **kwargs) -> int:
+    """Returns number of hotspots of a search"""
+    params = {} if not kwargs else kwargs.copy()
+    params["ps"] = 1
+    nbr_hotspots = len(search(endpoint=endpoint, filters=params))
+    log.debug("Hotspot counts with filters %s is %d hotspots", str(kwargs), nbr_hotspots)
+    return nbr_hotspots

sonar/projects.py

@@ -953,7 +953,8 @@ def export(self, export_settings: types.ConfigSettings, settings_list: dict[str,
         :return: All project configuration settings
         :rtype: dict
         """
-        from sonar import issues
+        from sonar.issues import count as issue_count
+        from sonar.hotspots import count as hotspot_count
 
         log.info("Exporting %s", str(self))
         try:
@@ -999,12 +1000,19 @@ def export(self, export_settings: types.ConfigSettings, settings_list: dict[str,
                 tpissues = self.count_third_party_issues()
                 issue_data = {"thirdParty": tpissues if len(tpissues) > 0 else 0}
                 if self.endpoint.version() >= (10, 0, 0):
-                    issue_data["falsePositives"] = issues.count(self.endpoint, components=self.key, issueStatuses="FALSE_POSITIVE")
-                    issue_data["accepted"] = issues.count(self.endpoint, components=self.key, issueStatuses="ACCEPTED")
+                    issue_data["falsePositives"] = issue_count(self.endpoint, components=self.key, issueStatuses="FALSE_POSITIVE")
+                    issue_data["accepted"] = issue_count(self.endpoint, components=self.key, issueStatuses="ACCEPTED")
+                    params = {"project": self.key}
                 else:
-                    issue_data["falsePositives"] = issues.count(self.endpoint, componentKeys=self.key, resolutions="FALSE-POSITIVE")
-                    issue_data["wontFix"] = issues.count(self.endpoint, componentKeys=self.key, resolutions="WONTFIX")
+                    issue_data["falsePositives"] = issue_count(self.endpoint, componentKeys=self.key, resolutions="FALSE-POSITIVE")
+                    issue_data["wontFix"] = issue_count(self.endpoint, componentKeys=self.key, resolutions="WONTFIX")
+                    params = {"projectKey": self.key}
                 json_data["issues"] = issue_data
+                json_data["hotspots"] = {
+                    "acknowledged": hotspot_count(self.endpoint, resolution="ACKNOWLEDGED", **params),
+                    "safe": hotspot_count(self.endpoint, resolution="SAFE", **params),
+                    "fixed": hotspot_count(self.endpoint, resolution="FIXED", **params),
+                }
                 log.debug("%s has these notable issues %s", str(self), str(json_data["issues"]))
 
             settings_dict = settings.get_bulk(endpoint=self.endpoint, component=self, settings_list=settings_list, include_not_set=False)