Change http_error in error_msg

okorach · okorach · commit ed68231feab2 · 2024-10-12T16:06:46.000+02:00
diff --git a/cli/findings_export.py b/cli/findings_export.py
@@ -295,7 +295,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
                     component.endpoint, component.key, branch=params.get("branch", None), pull_request=params.get("pullRequest", None)
                 )
             except (HTTPError, ConnectionError, RequestException) as e:
-                log.critical("%s while exporting findings of %s, skipped", util.http_error(e), str(component))
+                log.critical("%s while exporting findings of %s, skipped", util.error_msg(e), str(component))
                 findings_list = {}
             write_queue.put([findings_list, False])
         else:
@@ -324,7 +324,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
                 try:
                     findings_list = component.get_issues(filters=new_params)
                 except (HTTPError, ConnectionError, RequestException) as e:
-                    log.critical("%s while exporting issues of %s, skipped", util.http_error(e), str(component))
+                    log.critical("%s while exporting issues of %s, skipped", util.error_msg(e), str(component))
                     findings_list = {}
             else:
                 log.debug("Status = %s, Types = %s, Resol = %s, Sev = %s", str(i_statuses), str(i_types), str(i_resols), str(i_sevs))
@@ -334,7 +334,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
                 try:
                     findings_list.update(component.get_hotspots(filters=new_params))
                 except (HTTPError, ConnectionError, RequestException) as e:
-                    log.error("%s while exporting hotspots of object key %s, skipped", util.http_error(e), str(component))
+                    log.error("%s while exporting hotspots of object key %s, skipped", util.error_msg(e), str(component))
             else:
                 log.debug("Status = %s, Types = %s, Resol = %s, Sev = %s", str(h_statuses), str(h_types), str(h_resols), str(h_sevs))
                 log.info("Selected types, severities, resolutions or statuses disables issue search")
@@ -352,7 +352,7 @@ def store_findings(components_list: dict[str, object], params: ConfigSettings) -
             log.debug("Queue %s task %s put", str(my_queue), str(comp))
             my_queue.put((comp, params.copy()))
         except (HTTPError, ConnectionError, RequestException) as e:
-            log.critical("%s while exporting findings of %s, skipped", util.http_error(e), str(comp))
+            log.critical("%s while exporting findings of %s, skipped", util.error_msg(e), str(comp))
 
     threads = params.get(options.NBR_THREADS, 4)
     for i in range(min(threads, len(components_list))):
diff --git a/cli/loc.py b/cli/loc.py
@@ -52,7 +52,7 @@ def __get_csv_row(o: object, **kwargs) -> tuple[list[str], str]:
     try:
         loc = o.loc()
     except (HTTPError, ConnectionError, RequestException) as e:
-        log.warning("%s, LoC export of %s skipped", util.http_error(e), str(o))
+        log.warning("%s, LoC export of %s skipped", util.error_msg(e), str(o))
         loc = ""
     arr = [o.key, loc]
     obj_type = type(o).__name__.lower()
@@ -114,7 +114,7 @@ def __get_object_json_data(o: object, **kwargs) -> dict[str, str]:
     try:
         d["ncloc"] = o.loc()
     except (HTTPError, ConnectionError, RequestException) as e:
-        log.warning("%s, LoC export of %s skipped", util.http_error(e), str(o))
+        log.warning("%s, LoC export of %s skipped", util.error_msg(e), str(o))
     if kwargs[options.WITH_NAME]:
         d[f"{parent_type}Name"] = o.name
         if obj_type in ("branch", "applicationbranch"):
diff --git a/cli/measures_export.py b/cli/measures_export.py
@@ -283,7 +283,7 @@ def __get_measures(obj: object, wanted_metrics: types.KeyList, hist: bool) -> Un
         else:
             data.update(__get_object_measures(obj, wanted_metrics))
     except (HTTPError, ConnectionError, RequestException) as e:
-        log.error("%s, measures export skipped for %s", util.http_error(e), str(obj))
+        log.error("%s, measures export skipped for %s", util.error_msg(e), str(obj))
         return None
     return data
 
diff --git a/sonar/app_branches.py b/sonar/app_branches.py
@@ -112,7 +112,7 @@ def create(cls, app: App, name: str, project_branches: list[Branch]) -> Applicat
         except (HTTPError, ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists(f"app.App {app.key} branch '{name}", e.response.text)
-            log.critical("%s while creating branch '%s' of '%s'", utilities.http_error(e), name, str(app))
+            log.critical("%s while creating branch '%s' of '%s'", utilities.error_msg(e), name, str(app))
             raise
         return ApplicationBranch(app=app, name=name, project_branches=project_branches)
 
@@ -187,7 +187,7 @@ def update(self, name: str, project_branches: list[Branch]) -> bool:
         except (HTTPError, ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(str(self), e.response.text)
-            log.error("%s while updating '%s'", utilities.http_error(e), str(self))
+            log.error("%s while updating '%s'", utilities.error_msg(e), str(self))
             raise
 
         self.name = name
diff --git a/sonar/applications.py b/sonar/applications.py
@@ -93,7 +93,7 @@ def get_object(cls, endpoint: pf.Platform, key: str) -> Application:
         except (HTTPError, ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(key, f"Application key '{key}' not found")
-            log.error("%s while getting app key '%s'", util.http_error(e), key)
+            log.error("%s while getting app key '%s'", util.error_msg(e), key)
             raise
         return cls.load(endpoint, data)
 
@@ -136,7 +136,7 @@ def create(cls, endpoint: pf.Platform, key: str, name: str) -> Application:
         except (HTTPError, ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists(key, e.response.text)
-            log.critical("%s while creating app key '%s'", util.http_error(e), key)
+            log.critical("%s while creating app key '%s'", util.error_msg(e), key)
             raise
         return Application(endpoint, key, name)
 
@@ -154,7 +154,7 @@ def refresh(self) -> None:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 _OBJECTS.pop(self.uuid(), None)
                 raise exceptions.ObjectNotFound(self.key, f"{str(self)} not found")
-            log.error("%s while refreshing %s", util.http_error(e), str(self))
+            log.error("%s while refreshing %s", util.error_msg(e), str(self))
             raise
 
     def __str__(self) -> str:
@@ -393,7 +393,7 @@ def add_projects(self, project_list: list[str]) -> bool:
                     log.warning("Project '%s' not found, can't be added to %s", proj, self)
                     ok = False
                 else:
-                    log.error("%s while adding projects to %s", util.http_error(e), str(self))
+                    log.error("%s while adding projects to %s", util.error_msg(e), str(self))
                     raise
         return ok
 
diff --git a/sonar/branches.py b/sonar/branches.py
@@ -92,7 +92,7 @@ def get_object(cls, concerned_object: projects.Project, branch_name: str) -> Bra
         except (HTTPError, ConnectionError, RequestException) as e:
             if isinstance(HTTPError, e) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(concerned_object.key, f"Project '{concerned_object.key}' not found")
-            log.critical("%s while getting branch '%s' of %s", util.http_error(e), branch_name, str(concerned_object))
+            log.critical("%s while getting branch '%s' of %s", util.error_msg(e), branch_name, str(concerned_object))
             raise
         for br in data.get("branches", []):
             if br["name"] == branch_name:
@@ -132,7 +132,7 @@ def refresh(self) -> Branch:
         except (HTTPError, ConnectionError, RequestException) as e:
             if isinstance(HTTPError, e) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(self.key, f"{str(self)} not found in SonarQube")
-            log.error("%s while refreshing %s", util.http_error(e), str(self))
+            log.error("%s while refreshing %s", util.error_msg(e), str(self))
         for br in data.get("branches", []):
             if br["name"] == self.name:
                 self._load(br)
@@ -189,7 +189,7 @@ def delete(self) -> bool:
             if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.BAD_REQUEST:
                 log.warning("Can't delete %s, it's the main branch", str(self))
             else:
-                log.error("%s while deleting %s", util.http_error(e), str(self))
+                log.error("%s while deleting %s", util.error_msg(e), str(self))
             return False
 
     def new_code(self) -> str:
@@ -205,7 +205,7 @@ def new_code(self) -> str:
             except (HTTPError, ConnectionError, RequestException) as e:
                 if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
                     raise exceptions.ObjectNotFound(self.concerned_object.key, f"{str(self.concerned_object)} not found")
-                log.error("%s while getting new code period of %s", util.http_error(e), str(self))
+                log.error("%s while getting new code period of %s", util.error_msg(e), str(self))
                 raise e
             for b in data["newCodePeriods"]:
                 new_code = settings.new_code_to_string(b)
@@ -268,7 +268,7 @@ def rename(self, new_name):
         except (HTTPError, ConnectionError, RequestException) as e:
             if isinstance(HTTPError, e) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(self.concerned_object.key, f"str{self.concerned_object} not found")
-            log.error("%s while renaming %s", util.http_error(e), str(self))
+            log.error("%s while renaming %s", util.error_msg(e), str(self))
             raise
         _OBJECTS.pop(self.uuid(), None)
         self.name = new_name
@@ -365,7 +365,7 @@ def audit(self, audit_settings: types.ConfigSettings) -> list[Problem]:
             try:
                 return self.__audit_last_analysis(audit_settings) + self.__audit_zero_loc() + self.__audit_never_analyzed()
             except (HTTPError, RequestException, Exception) as e:
-                log.error("%s while auditing %s, audit skipped", util.http_error(e), str(self))
+                log.error("%s while auditing %s, audit skipped", util.error_msg(e), str(self))
         else:
             log.debug("Branch audit disabled, skipping audit of %s", str(self))
         return []
diff --git a/sonar/devops.py b/sonar/devops.py
@@ -113,7 +113,7 @@ def create(cls, endpoint: platform.Platform, key: str, plt_type: str, url_or_wor
             if e.response.status_code == HTTPStatus.BAD_REQUEST and endpoint.edition() in ("community", "developer"):
                 log.warning("Can't set DevOps platform '%s', don't you have more that 1 of that type?", key)
                 raise exceptions.UnsupportedOperation(f"Can't set DevOps platform '{key}', don't you have more that 1 of that type?")
-            log.error("%s while creating devops platform %s/%s/%s", util.http_error(e), key, plt_type, url_or_workspace)
+            log.error("%s while creating devops platform %s/%s/%s", util.error_msg(e), key, plt_type, url_or_workspace)
             raise
         o = DevopsPlatform(endpoint=endpoint, key=key, platform_type=plt_type)
         o.refresh()
diff --git a/sonar/hotspots.py b/sonar/hotspots.py
@@ -407,7 +407,7 @@ def search(endpoint: pf.Platform, filters: types.ApiParams = None) -> dict[str,
                     log.warning("No hotspots found with search params %s", str(inline_filters))
                     nbr_hotspots = 0
                     return {}
-                log.error("%s while searching hotspots", util.http_error(e))
+                log.error("%s while searching hotspots", util.error_msg(e))
                 break
             nbr_pages = util.nbr_pages(data)
             log.debug("Number of hotspots: %d - Page: %d/%d", nbr_hotspots, inline_filters["p"], nbr_pages)
diff --git a/sonar/issues.py b/sonar/issues.py
@@ -733,7 +733,7 @@ def __search_thread(queue: Queue) -> None:
                 issue_list[i["key"]] = get_object(endpoint=endpoint, key=i["key"], data=i)
             log.debug("Added %d issues in threaded search page %d", len(data["issues"]), page)
         except (HTTPError, ConnectionError, RequestException, Exception) as e:
-            log.error("%s while searching issues, search may be incomplete", util.http_error(e))
+            log.error("%s while searching issues, search may be incomplete", util.error_msg(e))
         queue.task_done()
 
 
@@ -859,7 +859,7 @@ def count_by_rule(endpoint: pf.Platform, **kwargs) -> dict[str, int]:
                     rulecount[d["val"]] = 0
                 rulecount[d["val"]] += d["count"]
         except (HTTPError, Exception, RequestException) as e:
-            log.error("%s while counting issues per rule, count may be incomplete", util.http_error(e))
+            log.error("%s while counting issues per rule, count may be incomplete", util.error_msg(e))
     return rulecount
 
 
diff --git a/sonar/measures.py b/sonar/measures.py
@@ -127,7 +127,7 @@ def get(concerned_object: object, metrics_list: KeyList, **kwargs) -> dict[str,
     except (HTTPError, ConnectionError, RequestException) as e:
         if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
             raise exceptions.ObjectNotFound(concerned_object.key, f"{str(concerned_object)} not found")
-        log.error("%s while getting measures %s of %s", util.http_error(e), str(metrics_list), str(concerned_object))
+        log.error("%s while getting measures %s of %s", util.error_msg(e), str(metrics_list), str(concerned_object))
         raise e
     m_dict = {m: None for m in metrics_list}
     for m in data["component"]["measures"]:
@@ -158,7 +158,7 @@ def get_history(concerned_object: object, metrics_list: KeyList, **kwargs) -> li
     except (HTTPError, ConnectionError, RequestException) as e:
         if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
             raise exceptions.ObjectNotFound(concerned_object.key, f"{str(concerned_object)} not found")
-        log.error("%s while getting measures %s history of %s", util.http_error(e), str(metrics_list), str(concerned_object))
+        log.error("%s while getting measures %s history of %s", util.error_msg(e), str(metrics_list), str(concerned_object))
         raise e
     res_list = []
     # last_metric, last_date = "", ""
diff --git a/sonar/organizations.py b/sonar/organizations.py
@@ -81,7 +81,7 @@ def get_object(cls, endpoint: pf.Platform, key: str) -> Organization:
         except (HTTPError, ConnectionError, RequestException) as e:
             if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(key, f"Organization '{key}' not found")
-            log.error("%s getting organization %s", util.http_error(e), key)
+            log.error("%s getting organization %s", util.error_msg(e), key)
             raise e
         if len(data["organizations"]) == 0:
             raise exceptions.ObjectNotFound(key, f"Organization '{key}' not found")
diff --git a/sonar/permissions/permission_templates.py b/sonar/permissions/permission_templates.py
@@ -142,7 +142,7 @@ def set_as_default(self, what_list: list[str]) -> None:
             try:
                 self.post("permissions/set_default_template", params={"templateId": self.key, "qualifier": qual})
             except (HTTPError, ConnectionError, RequestException) as e:
-                log.error("%s while setting %s as default", utilities.http_error(e), str(self))
+                log.error("%s while setting %s as default", utilities.error_msg(e), str(self))
                 raise
 
     def set_pattern(self, pattern: str) -> PermissionTemplate:
diff --git a/sonar/permissions/permissions.py b/sonar/permissions/permissions.py
@@ -241,7 +241,7 @@ def _get_api(self, api: str, perm_type: str, ret_field: str, **extra_params) ->
                         counter += 1
                 page, nbr_pages = page + 1, utilities.nbr_pages(data)
             except (HTTPError, ConnectionError, RequestException) as e:
-                log.error("%s while retrieving %s permissions", utilities.http_error(e), str(self))
+                log.error("%s while retrieving %s permissions", utilities.error_msg(e), str(self))
                 page += 1
         return perms
 
@@ -258,7 +258,7 @@ def _post_api(self, api: str, set_field: str, perms_dict: types.JsonPermissions,
                 try:
                     r = self.endpoint.post(api, params=params)
                 except (HTTPError, ConnectionError, RequestException) as e:
-                    log.error("%s while setting permissions %s", utilities.http_error(e), str(self))
+                    log.error("%s while setting permissions %s", utilities.error_msg(e), str(self))
                 result = result and r.ok
         return result
 
diff --git a/sonar/permissions/quality_permissions.py b/sonar/permissions/quality_permissions.py
@@ -77,7 +77,7 @@ def _get_api(self, api: str, perm_type: tuple[str, ...], ret_field: str, **extra
                 perms += [p[ret_field] for p in data[perm_type]]
                 page, nbr_pages = page + 1, utilities.nbr_pages(data)
             except (HTTPError, ConnectionError, RequestException) as e:
-                log.error("%s while retrieving %s permissions", utilities.http_error(e), str(self))
+                log.error("%s while retrieving %s permissions", utilities.error_msg(e), str(self))
                 page += 1
         return perms
 
diff --git a/sonar/platform.py b/sonar/platform.py
@@ -105,7 +105,7 @@ def verify_connection(self) -> None:
         try:
             self.get("server/version")
         except (HTTPError, ConnectionError, RequestException) as e:
-            log.critical("%s while verifying connection", util.http_error(e))
+            log.critical("%s while verifying connection", util.error_msg(e))
             raise exceptions.ConnectionError(util.sonar_error(e.response))
 
     def version(self) -> tuple[int, int, int]:
@@ -252,7 +252,7 @@ def __run_request(
                 log_and_exit(e)
             else:
                 lvl = log.DEBUG if r.status_code in mute else log.ERROR
-                log.log(lvl, "%s (%s request)", util.http_error(e), req_type)
+                log.log(lvl, "%s (%s request)", util.error_msg(e), req_type)
                 raise e
         except Timeout as e:
             util.exit_fatal(str(e), errcodes.HTTP_TIMEOUT)
@@ -292,7 +292,7 @@ def sys_info(self) -> dict[str, any]:
                         time.sleep(0.5)
                         counter += 1
                     else:
-                        log.error("%s while getting system info", util.http_error(e))
+                        log.error("%s while getting system info", util.error_msg(e))
                         raise e
             self.__sys_info = json.loads(resp.text)
             success = True
diff --git a/sonar/portfolio_reference.py b/sonar/portfolio_reference.py
@@ -76,7 +76,7 @@ def create(cls, reference: object, parent: object, params: types.ApiParams = Non
         except (HTTPError, ConnectionError, RequestException) as e:
             if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists
-            log.critical("%s while creating portfolio reference to %s in %s", utilities.http_error(e), str(reference), str(parent))
+            log.critical("%s while creating portfolio reference to %s in %s", utilities.error_msg(e), str(reference), str(parent))
             raise e
         return PortfolioReference(reference=reference, parent=parent)
 
diff --git a/sonar/portfolios.py b/sonar/portfolios.py
diff --git a/sonar/projects.py b/sonar/projects.py
diff --git a/sonar/qualitygates.py b/sonar/qualitygates.py
diff --git a/sonar/qualityprofiles.py b/sonar/qualityprofiles.py
diff --git a/sonar/rules.py b/sonar/rules.py
diff --git a/sonar/settings.py b/sonar/settings.py
diff --git a/sonar/sqobject.py b/sonar/sqobject.py
diff --git a/sonar/utilities.py b/sonar/utilities.py
