Fix content type corner case and add resource client methods

Author: AlanCoding

ansible_base/rbac/models/content_type.py

@@ -141,6 +141,10 @@ def get_by_natural_key(self, *args: str) -> "DABContentType":
             service = get_local_resource_prefix()
             app_label, model = args
             kwargs = {'service__in': [get_local_resource_prefix(), 'shared'], 'app_label': app_label, 'model': model}
+            # This ask here is actually ambiguous, so we try this extra lookup
+            shared_key = ('shared', app_label, model)
+            if ('shared', app_label, model) in self._cache[self.db]:
+                return self._cache[self.db][shared_key]
         else:
             service, app_label, model = args
             kwargs = {'service': service, 'app_label': app_label, 'model': model}

ansible_base/resource_registry/rest_client.py

@@ -159,3 +159,10 @@ def list_resource_types(self, filters: Optional[dict] = None):
 
     def get_resource_type_manifest(self, name, filters: Optional[dict] = None):
         return self._make_request("get", f"resource-types/{name}/manifest/", params=filters, stream=True)
+
+    # RBAC related methods
+    def list_role_types(self, filters: Optional[dict] = None):
+        return self._make_request("get", "role-types/", params=filters)
+
+    def list_role_permissions(self, filters: Optional[dict] = None):
+        return self._make_request("get", "role-permissions/", params=filters)

test_app/tests/resource_registry/test_resources_api_rest_client.py

@@ -156,6 +156,22 @@ def test_list_resource_types(resource_client):
     assert resp.json()["results"][0]["name"] == "shared.organization"
 
 
+@pytest.mark.django_db
+def test_list_role_types(resource_client):
+    resp = resource_client.list_role_types(filters={"api_slug": "shared.organization"})
+    assert resp.status_code == 200
+    assert resp.json()["count"] == 1
+    assert resp.json()["results"][0]["api_slug"] == "shared.organization"
+
+
+@pytest.mark.django_db
+def test_list_role_permissions(resource_client):
+    resp = resource_client.list_role_permissions(filters={"api_slug": "shared.view_organization"})
+    assert resp.status_code == 200
+    assert resp.json()["count"] == 1
+    assert resp.json()["results"][0]["api_slug"] == "shared.view_organization"
+
+
 @pytest.mark.django_db
 def test_get_resource_404(resource_client):
     resource_client.raise_if_bad_request = True