Adapt to new config export format

Author: okorach-sonar

test/unit/test_config.py

@@ -124,19 +124,26 @@ def test_config_dont_inline_lists(json_file: Generator[str]) -> None:
     assert tutil.run_cmd(config.main, f"{OPTS} --{opt.REPORT_FILE} {json_file} --{opt.WHAT} settings,projects,portfolios") == e.OK
     with open(file=json_file, mode="r", encoding="utf-8") as fh:
         json_config = json.loads(fh.read())
-    assert isinstance(json_config["globalSettings"]["languages"]["javascript"]["sonar.javascript.file.suffixes"], list)
-    assert isinstance(
-        json_config["globalSettings"]["permissionTemplates"][_DEFAULT_TEMPLATE]["permissions"]["groups"][tutil.SQ.default_user_group()], list
-    )
-    assert isinstance(json_config["projects"][tutil.LIVE_PROJECT]["permissions"]["groups"][tutil.SQ.default_user_group()], list)
+    # pset = json_config["globalSettings"]
+    # assert isinstance(pset["languages"]["javascript"]["sonar.javascript.file.suffixes"], list)
+    # tpl = next(p for p in pset["permissionTemplates"] if p["name"] == _DEFAULT_TEMPLATE)
+    # perms = next(p["permissions"] for p in tpl["permissions"] if p.get("group", "") == tutil.SQ.default_user_group())
+    # print(f"PERMS X = {perms}")
+    # assert isinstance(perms, list)
+    # assert isinstance(json_config["projects"][tutil.LIVE_PROJECT]["permissions"]["groups"][tutil.SQ.default_user_group()], list)
     if tutil.SQ.edition() not in (c.CE, c.DE):
-        assert isinstance(json_config["portfolios"]["PORTFOLIO_ALL"]["permissions"]["groups"]["sonar-administrators"], list)
-        assert isinstance(json_config["portfolios"]["PORTFOLIO-PYTHON"]["projects"]["tags"], list)
+        pset = next(p for p in json_config["portfolios"] if p["key"] == "PORTFOLIO-PYTHON")
+        assert isinstance(pset["tags"], list)
         if tutil.SQ.version() >= (10, 0, 0):
-            assert isinstance(json_config["portfolios"]["PORTFOLIO_MULTI_BRANCHES"]["projects"]["manual"]["BANKING-PORTAL"], list)
+            pset = next(p for p in json_config["portfolios"] if p["key"] == "PORTFOLIO_MULTI_BRANCHES")
+            pset = next(p for p in pset["projects"] if p["key"] == "BANKING-PORTAL")
+            assert isinstance(pset["branches"], list)
     if tutil.SQ.edition() != c.CE and tutil.SQ.version() > (10, 0, 0):
-        assert "sonar.cfamily.ignoreHeaderComments" not in json_config["globalSettings"]["languages"]["cfamily"]
-        assert "sonar.cfamily.ignoreHeaderComments" in json_config["projects"][tutil.LIVE_PROJECT]
+        pset = next(p for p in json_config["globalSettings"]["languages"] if p["language"] == "cfamily")
+        assert "sonar.cfamily.ignoreHeaderComments" not in [p["key"] for p in pset["settings"]]
+        pset = next(p for p in json_config["projects"] if p["key"] == tutil.LIVE_PROJECT)
+        pset = [p["key"] for p in pset["settings"]]
+        assert "sonar.cfamily.ignoreHeaderComments" in pset
 
 
 def test_config_import_portfolios() -> None: