Skip to content

Commit 06b33a7

Browse files
committed
Use the conversion helper
1 parent 35fe445 commit 06b33a7

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

sonar/platform.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -499,22 +499,7 @@ def export(self, export_settings: types.ConfigSettings, full: bool = False) -> t
499499
if not self.is_sonarcloud():
500500
json_data[settings.DEVOPS_INTEGRATION] = devops.export(self, export_settings=export_settings)
501501

502-
# Convert dicts to lists
503-
special_categories = (settings.LANGUAGES_SETTINGS, settings.DEVOPS_INTEGRATION, "permissions", "permissionTemplates")
504-
for categ in [cat for cat in settings.CATEGORIES if cat not in special_categories]:
505-
json_data[categ] = util.sort_list_by_key(util.dict_to_list(json_data[categ], "key"), "key")
506-
for k, v in sorted(json_data[settings.LANGUAGES_SETTINGS].items()):
507-
json_data[settings.LANGUAGES_SETTINGS][k] = util.sort_list_by_key(util.dict_to_list(v, "key"), "key")
508-
json_data[settings.LANGUAGES_SETTINGS] = util.dict_to_list(json_data[settings.LANGUAGES_SETTINGS], "language", "settings")
509-
json_data[settings.LANGUAGES_SETTINGS] = util.sort_list_by_key(json_data[settings.LANGUAGES_SETTINGS], "language")
510-
json_data[settings.DEVOPS_INTEGRATION] = util.dict_to_list(json_data[settings.DEVOPS_INTEGRATION], "key")
511-
json_data["permissions"] = util.perms_to_list(json_data["permissions"])
512-
for v in json_data["permissionTemplates"].values():
513-
if "permissions" in v:
514-
v["permissions"] = util.perms_to_list(v["permissions"])
515-
json_data["permissionTemplates"] = util.dict_to_list(json_data["permissionTemplates"], "key")
516-
517-
return util.order_dict(json_data, [*settings.CATEGORIES, "permissions", "permissionTemplates"])
502+
return pfhelp.convert_global_settings_json(json_data)
518503

519504
def set_webhooks(self, webhooks_data: types.ObjectJsonRepr) -> bool:
520505
"""Sets global webhooks with a list of webhooks represented as JSON

0 commit comments

Comments
 (0)