Skip to content

Commit f160d7b

Browse files
committed
Fixes #1380
1 parent e455cb2 commit f160d7b

File tree

1 file changed

+52
-3
lines changed

1 file changed

+52
-3
lines changed

sonar/projects.py

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,46 @@
8080
"webhooks",
8181
)
8282

83+
_UNNEEDED_CONTEXT_DATA = (
84+
"sonar.announcement.message",
85+
"sonar.auth.github.allowUsersToSignUp",
86+
"sonar.auth.github.apiUrl",
87+
"sonar.auth.github.appId",
88+
"sonar.auth.github.enabled",
89+
"sonar.auth.github.groupsSync",
90+
"sonar.auth.github.organizations",
91+
"sonar.auth.github.webUrl",
92+
"sonar.builtInQualityProfiles.disableNotificationOnUpdate",
93+
"sonar.core.id",
94+
"sonar.core.serverBaseURL",
95+
"sonar.core.startTime",
96+
"sonar.dbcleaner.branchesToKeepWhenInactive",
97+
"sonar.forceAuthentication",
98+
"sonar.host.url",
99+
"sonar.java.jdkHome",
100+
"sonar.links.ci",
101+
"sonar.links.homepage",
102+
"sonar.links.issue",
103+
"sonar.links.scm",
104+
"sonar.links.scm_dev",
105+
"sonar.plugins.risk.consent",
106+
)
107+
108+
_UNNEEDED_TASK_DATA = (
109+
"analysisId",
110+
"componentId",
111+
"hasScannerContext",
112+
"id",
113+
"warningCount",
114+
"componentQualifier",
115+
"nodeName",
116+
"componentName",
117+
"componentKey",
118+
"submittedAt",
119+
"executedAt",
120+
"type",
121+
)
122+
83123

84124
class Project(components.Component):
85125
"""
@@ -953,6 +993,9 @@ def export(self, export_settings: types.ConfigSettings, settings_list: dict[str,
953993
:return: All project configuration settings
954994
:rtype: dict
955995
"""
996+
997+
remove_useless = lambda d, useless: {k: v for k, v in d if k not in useless}
998+
956999
log.info("Exporting %s", str(self))
9571000
try:
9581001
json_data = self._json.copy()
@@ -983,10 +1026,16 @@ def export(self, export_settings: types.ConfigSettings, settings_list: dict[str,
9831026
last_task = self.last_task()
9841027
json_data["backgroundTasks"] = {}
9851028
if last_task:
1029+
ctxt = last_task.scanner_context()
1030+
if ctxt:
1031+
ctxt = {k: v for k, v in ctxt.items() if k not in _UNNEEDED_CONTEXT_DATA}
1032+
t_hist = []
1033+
for t in self.task_history():
1034+
t_hist.append({k: v for k, v in t._json.items() if k not in _UNNEEDED_TASK_DATA})
9861035
json_data["backgroundTasks"] = {
987-
"lastTaskScannerContext": last_task.scanner_context(),
988-
"lastTaskWarnings": last_task.warnings(),
989-
"taskHistory": [t._json for t in self.task_history()],
1036+
"lastTaskScannerContext": ctxt,
1037+
# "lastTaskWarnings": last_task.warnings(),
1038+
"taskHistory": t_hist,
9901039
}
9911040

9921041
settings_dict = settings.get_bulk(endpoint=self.endpoint, component=self, settings_list=settings_list, include_not_set=False)

0 commit comments

Comments
 (0)