Skip to content

Commit 64eddac

Browse files
committed
Remove calls to convert_for_yaml
1 parent 4a283a7 commit 64eddac

File tree

1 file changed

+11
-21
lines changed

1 file changed

+11
-21
lines changed

cli/config.py

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@
6464
}
6565

6666
_EXPORT_CALLS = {
67-
c.CONFIG_KEY_PLATFORM: [c.CONFIG_KEY_PLATFORM, platform.basics, platform.convert_for_yaml],
68-
options.WHAT_SETTINGS: [c.CONFIG_KEY_SETTINGS, platform.export, platform.convert_for_yaml],
69-
options.WHAT_RULES: [c.CONFIG_KEY_RULES, rules.export, rules.convert_for_yaml],
70-
options.WHAT_PROFILES: [c.CONFIG_KEY_PROFILES, qualityprofiles.export, qualityprofiles.convert_for_yaml],
71-
options.WHAT_GATES: [c.CONFIG_KEY_GATES, qualitygates.export, qualitygates.convert_for_yaml],
72-
options.WHAT_PROJECTS: [c.CONFIG_KEY_PROJECTS, projects.export, projects.convert_for_yaml],
73-
options.WHAT_APPS: [c.CONFIG_KEY_APPS, applications.export, applications.convert_for_yaml],
74-
options.WHAT_PORTFOLIOS: [c.CONFIG_KEY_PORTFOLIOS, portfolios.export, portfolios.convert_for_yaml],
75-
options.WHAT_USERS: [c.CONFIG_KEY_USERS, users.export, users.convert_for_yaml],
76-
options.WHAT_GROUPS: [c.CONFIG_KEY_GROUPS, groups.export, groups.convert_for_yaml],
67+
c.CONFIG_KEY_PLATFORM: [c.CONFIG_KEY_PLATFORM, platform.basics],
68+
options.WHAT_SETTINGS: [c.CONFIG_KEY_SETTINGS, platform.export],
69+
options.WHAT_RULES: [c.CONFIG_KEY_RULES, rules.export],
70+
options.WHAT_PROFILES: [c.CONFIG_KEY_PROFILES, qualityprofiles.export],
71+
options.WHAT_GATES: [c.CONFIG_KEY_GATES, qualitygates.export],
72+
options.WHAT_PROJECTS: [c.CONFIG_KEY_PROJECTS, projects.export],
73+
options.WHAT_APPS: [c.CONFIG_KEY_APPS, applications.export],
74+
options.WHAT_PORTFOLIOS: [c.CONFIG_KEY_PORTFOLIOS, portfolios.export],
75+
options.WHAT_USERS: [c.CONFIG_KEY_USERS, users.export],
76+
options.WHAT_GROUPS: [c.CONFIG_KEY_GROUPS, groups.export],
7777
}
7878

7979
WHAT_EVERYTHING = list(_EXPORT_CALLS.keys())[1:]
@@ -150,22 +150,12 @@ def __normalize_file(file: str, format: str) -> bool:
150150
json_data = __normalize_json(json_data, remove_empty=False, remove_none=True)
151151
with utilities.open_file(file, mode="w") as fd:
152152
if format == "yaml":
153-
print(yaml.dump(__convert_for_yaml(json_data), sort_keys=False), file=fd)
153+
print(yaml.dump(json_data, sort_keys=False), file=fd)
154154
else:
155155
print(utilities.json_dump(json_data), file=fd)
156156
return True
157157

158158

159-
def __convert_for_yaml(json_export: dict[str, any]) -> dict[str, any]:
160-
"""Converts the default JSON produced by export to a modified version more suitable for YAML"""
161-
for what in WHAT_EVERYTHING:
162-
for k in json_export:
163-
if what.lower() == k.lower() or (what == "settings" and k == "globalSettings"):
164-
yamlify_func = _EXPORT_CALLS[what][2]
165-
json_export[k] = yamlify_func(json_export[k])
166-
return json_export
167-
168-
169159
def write_objects(queue: Queue[types.ObjectJsonRepr], fd: TextIO, object_type: str, export_settings: types.ConfigSettings) -> None:
170160
"""
171161
Thread to write projects in the JSON file

0 commit comments

Comments
 (0)