Skip to content

Fix circular import #1320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Fix circular import #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c84389
Fix circular import
okorach Sep 26, 2024
d26f84d
fix bug
okorach Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sonar/branches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def export(self, export_settings: types.ConfigSettings) -> types.ObjectJsonRepr:
loc_distrib = {m.split("=")[0]: int(m.split("=")[1]) for m in lang_distrib.split(";")}
loc_distrib["total"] = self.loc()
data["ncloc"] = loc_distrib
if export_settings["MODE"] == "MIGRATION":
if export_settings.get("MODE", "") == "MIGRATION":
tpissues = self.count_third_party_issues()
issue_data = {"thirdParty": tpissues if len(tpissues) > 0 else 0}
if self.endpoint.version() >= (10, 0, 0):
Expand Down
6 changes: 3 additions & 3 deletions sonar/components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import sonar.sqobject as sq
import sonar.platform as pf

from sonar import settings, tasks, measures, utilities, rules, issues
from sonar import settings, tasks, measures, utilities, rules

import sonar.audit.problem as pb

Expand Down Expand Up @@ -139,15 +139,15 @@ def get_issues(self, filters: types.ApiParams = None) -> dict[str, object]:

def count_third_party_issues(self, filters: types.ApiParams = None) -> dict[str, int]:
"""Returns list of issues for a component, optionally on branches or/and PRs"""
from sonar.issues import component_filter
from sonar.issues import component_filter, count_by_rule

third_party_rules = rules.third_party(self.endpoint)
params = utilities.replace_keys(_ALT_COMPONENTS, component_filter(self.endpoint), self.search_params())
if filters is not None:
params.update(filters)
params["facets"] = "rules"
params["rules"] = [r.key for r in third_party_rules]
issues_count = {k: v for k, v in issues.count_by_rule(endpoint=self.endpoint, **params).items() if v > 0}
issues_count = {k: v for k, v in count_by_rule(endpoint=self.endpoint, **params).items() if v > 0}
return issues_count

def get_hotspots(self, filters: types.ApiParams = None) -> dict[str, object]:
Expand Down