Revert "Fix-2039 (#2044)"

This reverts commit 5068727.

Author: okorach-sonar

conf/release.Dockerfile

@@ -33,6 +33,6 @@ RUN pip install --upgrade pip \
 USER ${USERNAME}
 WORKDIR /home/${USERNAME}
 
-HEALTHCHECK --interval=180s --timeout=5s CMD [ "sonar-tools" ]
+HEALTHCHECK --interval=180s --timeout=5s CMD [ "sonar-tools-help" ]
 
-CMD [ "sonar-tools" ]
+CMD [ "sonar-tools-help" ]

doc/what-is-new.md

@@ -1,9 +1,5 @@
 # Next version
 
-# Version 3.16.1
-
-- Patch for [Issue #2039](https://github.com/okorach/sonar-tools/issues/2039) that may affect merely all the Sonar Tools
-
 # Version 3.16
 
 * `sonar-config`:

sonar/errcodes.py

@@ -69,6 +69,3 @@
 OBJECT_NOT_FOUND = 16
 
 SONAR_INTERNAL_ERROR = 17
-
-
-TOO_MANY_RESULTS = 18

sonar/exceptions.py

@@ -75,11 +75,3 @@ class ConnectionError(SonarException):
 
     def __init__(self, message: str) -> None:
         super().__init__(message, errcodes.CONNECTION_ERROR)
-
-
-class TooManyResults(SonarException):
-    """When a call to APIs returns too many results."""
-
-    def __init__(self, nbr_results: int, message: str) -> None:
-        super().__init__(message, errcodes.TOO_MANY_RESULTS)
-        self.nbr_results = nbr_results

sonar/projects.py

@@ -40,8 +40,6 @@
 import sonar.platform as pf
 
 from sonar.util import types, cache
-from sonar.util import project_utils as putils
-
 from sonar import exceptions, errcodes
 from sonar import sqobject, components, qualitygates, qualityprofiles, tasks, settings, webhooks, devops
 import sonar.permissions.permissions as perms
@@ -1359,22 +1357,14 @@ def count(endpoint: pf.Platform, params: types.ApiParams = None) -> int:
 def search(endpoint: pf.Platform, params: types.ApiParams = None, threads: int = 8) -> dict[str, Project]:
     """Searches projects in SonarQube
 
-    :param Platform endpoint: Reference to the SonarQube platform
-    :param ApiParams params: list of filter parameters to narrow down the search
-    :param int threads: Number of threads to use for the search
+    :param endpoint: Reference to the SonarQube platform
+    :param params: list of parameters to narrow down the search
+    :returns: list of projects
     """
     new_params = {} if params is None else params.copy()
-    if not endpoint.is_sonarcloud() and not new_params.get("filter", None):
+    if not endpoint.is_sonarcloud():
         new_params["filter"] = _PROJECT_QUALIFIER
-    try:
-        log.info("Searching projects with parameters: %s", str(new_params))
-        return sqobject.search_objects(endpoint=endpoint, object_class=Project, params=new_params, threads=threads)
-    except exceptions.TooManyResults as e:
-        log.warning(e.message)
-        filter_1, filter_2 = putils.split_loc_filter(new_params["filter"])
-        return search(endpoint, params={**new_params, "filter": filter_1}, threads=threads) | search(
-            endpoint, params={**new_params, "filter": filter_2}, threads=threads
-        )
+    return sqobject.search_objects(endpoint=endpoint, object_class=Project, params=new_params, threads=threads)
 
 
 def get_list(endpoint: pf.Platform, key_list: types.KeyList = None, threads: int = 8, use_cache: bool = True) -> dict[str, Project]:
@@ -1385,8 +1375,8 @@ def get_list(endpoint: pf.Platform, key_list: types.KeyList = None, threads: int
     :return: the list of all projects
     :rtype: dict{key: Project}
     """
-    if key_list is None or len(key_list) == 0 or not use_cache:
-        with _CLASS_LOCK:
+    with _CLASS_LOCK:
+        if key_list is None or len(key_list) == 0 or not use_cache:
             log.info("Listing projects")
             p_list = dict(sorted(search(endpoint=endpoint, threads=threads).items()))
             return p_list

sonar/sqobject.py

@@ -242,10 +242,6 @@ def search_objects(endpoint: object, object_class: Any, params: types.ApiParams,
     data = __get(endpoint, api, {**new_params, p_field: 1})
     nb_pages = utilities.nbr_pages(data, api_version)
     nb_objects = max(len(data[returned_field]), utilities.nbr_total_elements(data, api_version))
-
-    if nb_objects > c.ELASTIC_MAX_RESULTS:
-        raise exceptions.TooManyResults(nb_objects, f"Too many {cname}s ({nb_objects}) returned by search")
-
     log.info(
         "Searching %d %ss, %d pages of %d elements, %d pages in parallel...",
         nb_objects,

sonar/util/constants.py

@@ -74,5 +74,3 @@
 
 SQS_USERS = "sonar-users"  # SonarQube Server users default group name
 SQC_USERS = "Members"  # SonarQube Cloud users default group name
-
-ELASTIC_MAX_RESULTS = 10000  # ElasticSearch max results limit

sonar/util/project_utils.py

@@ -25,4 +25,4 @@
 """
 
 PACKAGE_VERSION = "3.17"
-MIGRATION_TOOL_VERSION = "0.6-snapshot"
+MIGRATION_TOOL_VERSION = "0.7"