Merge pull request #1280 from okorach:fix-1275

Fixes

Author: okorach

sonar-project.properties

@@ -13,6 +13,6 @@ sonar.python.pylint.reportPaths=build/pylint-report.out
 # sonar.python.bandit.reportPaths=build/bandit-report.json
 
 sonar.exclusions=api-doc/**/*, build/**/*, test/**/*
-sonar.coverage.exclusions=test/**/*, shellcheck2sonar.py, cli/cust_measures.py, sonar/custom_measures.py, cli/support.py
+sonar.coverage.exclusions=test/**/*, shellcheck2sonar.py, cli/cust_measures.py, sonar/custom_measures.py, cli/support.py, cli/sonar-projects-*.py
 
 sonar.tests=test

sonar/devops.py

@@ -110,7 +110,7 @@ def create(cls, endpoint: platform.Platform, key: str, plt_type: str, url_or_wor
                 params.update({"clientSecret": _TO_BE_SET, "clientId": _TO_BE_SET, "workspace": url_or_workspace})
                 endpoint.post(_CREATE_API_BBCLOUD, params=params)
         except HTTPError as e:
-            if e.response.status_code == HTTPStatus.BAD_REQUEST and endpoint.edition() == "developer":
+            if e.response.status_code == HTTPStatus.BAD_REQUEST and endpoint.edition() in ("community", "developer"):
                 log.warning("Can't set DevOps platform '%s', don't you have more that 1 of that type?", key)
                 raise exceptions.UnsupportedOperation(f"Can't set DevOps platform '{key}', don't you have more that 1 of that type?")
             raise
@@ -267,7 +267,11 @@ def import_config(endpoint: platform.Platform, config_data: types.ObjectJsonRepr
             o = DevopsPlatform.read(endpoint, name)
         except exceptions.ObjectNotFound:
             info = data["workspace"] if data["type"] == "bitbucketcloud" else data["url"]
-            o = DevopsPlatform.create(key=name, endpoint=endpoint, plt_type=data["type"], url_or_workspace=info)
+            try:
+                o = DevopsPlatform.create(key=name, endpoint=endpoint, plt_type=data["type"], url_or_workspace=info)
+            except exceptions.UnsupportedOperation as e:
+                log.error(str(e))
+                continue
         o.update(**data)
 
 

sonar/portfolios.py

@@ -45,7 +45,6 @@
 
 from sonar.portfolio_reference import PortfolioReference
 
-_OBJECTS = {}
 _CLASS_LOCK = Lock()
 
 _CREATE_API = "views/create"
@@ -90,6 +89,8 @@ class Portfolio(aggregations.Aggregation):
     SEARCH_KEY_FIELD = "key"
     SEARCH_RETURN_FIELD = "components"
 
+    _OBJECTS = {}
+
     def __init__(self, endpoint: pf.Platform, name: str, key: str = None) -> None:
         """Constructor, don't use - use class methods instead"""
         if not key:
@@ -107,7 +108,7 @@ def __init__(self, endpoint: pf.Platform, name: str, key: str = None) -> None:
         self.is_sub_portfolio = None
         self.parent = None  #: Ref to parent portfolio object, if any
         self._root_portfolio = None  #: Ref to root portfolio, if any
-        _OBJECTS[self.uuid()] = self
+        Portfolio._OBJECTS[self.uuid()] = self
         log.debug("Created portfolio object name '%s'", name)
 
     @classmethod
@@ -116,8 +117,8 @@ def get_object(cls, endpoint: pf.Platform, key: str) -> Portfolio:
         check_supported(endpoint)
         log.debug("Getting portfolio object key '%s'", key)
         uid = sq.uuid(key, endpoint.url)
-        if uid in _OBJECTS:
-            return _OBJECTS[uid]
+        if uid in Portfolio._OBJECTS:
+            return Portfolio._OBJECTS[uid]
         data = search_by_key(endpoint, key)
         if data is None:
             raise exceptions.ObjectNotFound(key, f"Portfolio key '{key}' not found")
@@ -311,7 +312,7 @@ def get_components(self) -> types.ApiPayload:
 
     def delete(self) -> bool:
         """Deletes a portfolio, returns whether the operation succeeded"""
-        return sq.delete_object(self, "views/delete", {"key": self.key}, _OBJECTS)
+        return sq.delete_object(self, "views/delete", {"key": self.key}, Portfolio._OBJECTS)
 
     def _audit_empty(self, audit_settings: types.ConfigSettings) -> list[problem.Problem]:
         """Audits if a portfolio is empty (no projects)"""
@@ -623,6 +624,7 @@ def get_list(endpoint: pf.Platform, key_list: types.KeyList = None, use_cache: b
         if key_list is None or len(key_list) == 0 or not use_cache:
             log.info("Listing portfolios")
             object_list = search(endpoint=endpoint)
+            log.info("List = %s", ", ".join(list(object_list.keys())))
             return object_list
         object_list = {}
         for key in util.csv_to_list(key_list):

sonar/sqobject.py

@@ -56,6 +56,15 @@ def get_search_api(cls, endpoint: object) -> Optional[str]:
                 api = cls.SEARCH_API
         return api
 
+    @classmethod
+    def empty_cache(cls) -> None:
+        """Empties the cache of objects of the given class"""
+        log.info("Emptying cache of %s", str(cls))
+        try:
+            cls._OBJECTS = {}
+        except AttributeError:
+            pass
+
     def uuid(self) -> str:
         """Returns object unique ID in its class"""
         return uuid(self.key, self.endpoint.url)

test/test_config.py

@@ -148,6 +148,7 @@ def test_config_import_portfolios() -> None:
     # delete all portfolios in test
     logging.set_debug_level("DEBUG")
     logging.info("Deleting all portfolios")
+    portfolios.Portfolio.empty_cache()
     for p in portfolios.get_list(util.TEST_SQ).values():
         if p.is_toplevel():
             p.delete()