Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion sonar/util/common_json_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

from typing import Any
from sonar import utilities
from sonar import logging as log


def convert_common_fields(json_data: dict[str, Any], with_permissions: bool = True) -> dict[str, Any]:
Expand Down
7 changes: 7 additions & 0 deletions sonar/util/qualityprofile_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

from typing import Any
from sonar import utilities as util
from sonar.util import constants as c
from sonar.util import types
from sonar.util import common_json_helper

Expand Down Expand Up @@ -61,6 +62,12 @@ def __convert_qp_json(qp_json: dict[str, Any]) -> list[dict[str, Any]]:
if "severities" in r:
r["impacts"] = r["severities"]
r.pop("severities")
if "impacts" in r:
r["impacts"] = {
k: r["impacts"][k]
for k in ("SECURITY", "RELIABILITY", "MAINTAINABILITY")
if k in r["impacts"] and r["impacts"][k] != c.DEFAULT
}
if "children" in v:
v["children"] = __convert_qp_json(v["children"])
qp_json[k] = util.order_keys(common_json_helper.convert_common_fields(v, with_permissions=False), *KEY_ORDER)
Expand Down
9 changes: 8 additions & 1 deletion sonar/util/rule_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,19 @@

from typing import Any
from sonar import utilities
from sonar.util import constants as c
from sonar.util import common_json_helper


def convert_rule_json(old_json: dict[str, Any]) -> dict[str, Any]:
"""Converts a rule JSON from old to new export format"""
return common_json_helper.convert_common_fields(old_json)
old_json = common_json_helper.convert_common_fields(old_json)
if "impacts" in old_json:
old_json["impacts"] = {
k: old_json["impacts"][k]
for k in ("SECURITY", "RELIABILITY", "MAINTAINABILITY")
if k in old_json["impacts"] and old_json["impacts"][k] != c.DEFAULT
}


def convert_rules_json(old_json: dict[str, Any]) -> dict[str, Any]:
Expand Down