add/update tests

Author: mconflitti-pbc

src/posit/connect/oauth/associations.py

@@ -71,9 +71,9 @@ def delete(self) -> None:
         path = f"v1/content/{self.content_guid}/oauth/integrations/associations"
         self._ctx.client.put(path, json=data)
 
-    def update(self, integration_guid: list[str]) -> None:
+    def update(self, integration_guids: list[str]) -> None:
         """Set integration associations."""
-        data = [{"oauth_integration_guid": guid} for guid in integration_guid]
+        data = [{"oauth_integration_guid": guid} for guid in integration_guids]
 
         path = f"v1/content/{self.content_guid}/oauth/integrations/associations"
         self._ctx.client.put(path, json=data)

src/posit/connect/oauth/integrations.py

@@ -129,8 +129,8 @@ def find(self) -> List[Integration]:
     # @requires("2025.07.0")
     def find_by(
         self,
-        integration_type: Optional[types.OAuthIntegrationType] = None,
-        auth_type: Optional[types.OAuthIntegrationAuthType] = None,
+        integration_type: Optional[types.OAuthIntegrationType | str] = None,
+        auth_type: Optional[types.OAuthIntegrationAuthType | str] = None,
         name: Optional[str] = None,
         description: Optional[str] = None,
         guid: Optional[str] = None,
@@ -140,14 +140,16 @@ def find_by(
 
         Parameters
         ----------
-        integration_type : Optional[types.OAuthIntegrationType]
+        integration_type : Optional[types.OAuthIntegrationType | str]
             The type of the integration (e.g., "aws", "azure").
-        auth_type : Optional[types.OAuthIntegrationAuthType]
+        auth_type : Optional[types.OAuthIntegrationAuthType | str]
             The authentication type of the integration (e.g., "Viewer", "Service Account").
         name : Optional[str]
-            A regex pattern to match the integration name.
+            A regex pattern to match the integration name. For exact matches, use `^` and `$`. For example,
+            `^My Integration$` will match only "My Integration".
         description : Optional[str]
-            A regex pattern to match the integration description.
+            A regex pattern to match the integration description. For exact matches, use `^` and `$`. For example,
+            `^My Integration Description$` will match only "My Integration Description".
         guid : Optional[str]
             The unique identifier of the integration.
         config : Optional[dict]
@@ -160,34 +162,32 @@ def find_by(
             The first matching integration, or None if no match is found.
         """
         for integration in self.find():
-            match = True
-
             if integration_type is not None and integration.get("template") != integration_type:
-                match = False
+                continue
 
             if auth_type is not None and integration.get("auth_type") != auth_type:
-                match = False
+                continue
 
             if name is not None:
                 integration_name = integration.get("name", "")
                 if not re.search(name, integration_name):
-                    match = False
+                    continue
 
             if description is not None:
                 integration_description = integration.get("description", "")
                 if not re.search(description, integration_description):
-                    match = False
+                    continue
 
             if guid is not None and integration.get("guid") != guid:
-                match = False
+                continue
 
             if config is not None:
                 integration_config = integration.get("config", {})
                 if not all(integration_config.get(k) == v for k, v in config.items()):
-                    match = False
+                    continue
+
+            return integration
 
-            if match:
-                return integration
         return None
 
     def get(self, guid: str) -> Integration:

tests/posit/connect/__api__/v1/content/f2f37341-e21d-3d80-c698-a935ad614066/oauth/integrations/associations.json

@@ -6,5 +6,13 @@
     "oauth_integration_description": "integration description",
     "oauth_integration_template": "custom",
     "created_time": "2024-10-01T18:16:09Z"
+  },
+  {
+    "app_guid": "f2f37341-e21d-3d80-c698-a935ad614066",
+    "oauth_integration_guid": "00000000-a27b-4118-ad06-e24459b05126",
+    "oauth_integration_name": "another integration",
+    "oauth_integration_description": "another description",
+    "oauth_integration_template": "custom",
+    "created_time": "2024-10-02T18:16:09Z"
   }
 ]

tests/posit/connect/__api__/v1/oauth/integrations.json

@@ -32,5 +32,17 @@
             "token_endpoint_auth_method": "client_secret_post",
             "token_uri": "http://keycloak:8080/realms/rsconnect/protocol/openid-connect/token"
         }
+    },
+    {
+        "id": "5",
+        "guid": "d32b3f4e-3f4a-4c5a-9f1e-8b6e2f7c9a2b",
+        "created_time": "2025-07-15T20:35:11Z",
+        "updated_time": "2025-07-15T20:35:11Z",
+        "name": "Connect Visitor API Key",
+        "description": "Allows access to Connect APIs on behalf of a Connect user.",
+        "template": "connect",
+        "config": {
+            "scopes": "admin"
+        }
     }
 ]

tests/posit/connect/oauth/test_associations.py

@@ -89,9 +89,12 @@ def test(self):
         associations = c.content.get(guid).oauth.associations.find()
 
         # assert
-        assert len(associations) == 1
-        association = associations[0]
-        assert association["app_guid"] == guid
+        assert len(associations) == 2
+        assert associations[0]["app_guid"] == guid
+        assert associations[1]["app_guid"] == guid
+        assert (
+            associations[0]["oauth_integration_guid"] != associations[1]["oauth_integration_guid"]
+        )
 
         assert mock_get_content.call_count == 1
         assert mock_get_association.call_count == 1
@@ -108,19 +111,28 @@ def test(self):
             json=load_mock(f"v1/content/{guid}.json"),
         )
 
-        new_integration_guid = "00000000-a27b-4118-ad06-e24459b05126"
+        new_integration_guid1 = "00000000-a27b-4118-ad06-e24459b05126"
+        new_integration_guid2 = "00000001-a27b-4118-ad06-e24459b05126"
 
         mock_put = responses.put(
             f"https://connect.example/__api__/v1/content/{guid}/oauth/integrations/associations",
-            json=[{"oauth_integration_guid": new_integration_guid}],
+            json=[
+                {"oauth_integration_guid": new_integration_guid1},
+                {"oauth_integration_guid": new_integration_guid2},
+            ],
         )
 
         # setup
         c = Client("https://connect.example", "12345")
         c._ctx.version = None
 
         # invoke
-        c.content.get(guid).oauth.associations.update([new_integration_guid])
+        c.content.get(guid).oauth.associations.update(
+            [
+                new_integration_guid1,
+                new_integration_guid2,
+            ]
+        )
 
         # assert
         assert mock_put.call_count == 1

tests/posit/connect/oauth/test_integrations.py

@@ -2,6 +2,7 @@
 from responses import matchers
 
 from posit.connect.client import Client
+from posit.connect.oauth import types
 
 from ..api import load_mock, load_mock_dict
 
@@ -125,9 +126,10 @@ def test(self):
 
         # assert
         assert mock_get.call_count == 1
-        assert len(integrations) == 2
+        assert len(integrations) == 3
         assert integrations[0]["id"] == "3"
         assert integrations[1]["id"] == "4"
+        assert integrations[2]["id"] == "5"
 
 
 class TestIntegrationsGet:
@@ -148,3 +150,107 @@ def test(self):
 
         assert mock_get.call_count == 1
         assert integration["guid"] == guid
+
+
+class TestIntegrationsFindBy:
+    @responses.activate
+    def test(self):
+        # behavior
+        responses.get(
+            "https://connect.example/__api__/v1/oauth/integrations",
+            json=load_mock("v1/oauth/integrations.json"),
+        )
+
+        # setup
+        c = Client("https://connect.example", "12345")
+        c._ctx.version = None
+        integrations = c.oauth.integrations
+
+        # invoke and assert
+        # by guid
+        found = integrations.find_by(guid="22644575-a27b-4118-ad06-e24459b05126")
+        assert found is not None
+        assert found["guid"] == "22644575-a27b-4118-ad06-e24459b05126"
+
+        # by name (exact match)
+        found = integrations.find_by(name="^keycloak integration$")
+        assert found is not None
+        assert found["name"] == "keycloak integration"
+
+        # by name (partial match) - should find first match
+        found = integrations.find_by(name="keycloak")
+        assert found is not None
+        assert found["name"] == "keycloak integration"
+
+        # by description (exact match)
+        found = integrations.find_by(description="^integration description$")
+        assert found is not None
+        assert found["description"] == "integration description"
+
+        # by description (partial match)
+        found = integrations.find_by(description="another")
+        assert found is not None
+        assert found["description"] == "another integration description"
+
+        # by integration_type
+        found = integrations.find_by(integration_type=types.OAuthIntegrationType.CUSTOM)
+        assert found is not None
+        assert found["template"] == "custom"
+        assert found["name"] == "keycloak integration"  # first one
+
+        found = integrations.find_by(integration_type="custom")
+        assert found is not None
+        assert found["template"] == "custom"
+        assert found["name"] == "keycloak integration"  # first one
+
+        # by auth_type (no match)
+        found = integrations.find_by(auth_type=types.OAuthIntegrationAuthType.VIEWER)
+        assert found is None
+
+        found = integrations.find_by(auth_type="Viewer")
+        assert found is None
+
+        # by config
+        found = integrations.find_by(config={"client_id": "rsconnect-oidc"})
+        assert found is not None
+        assert found["config"]["client_id"] == "rsconnect-oidc"
+        assert found["name"] == "keycloak integration"  # first one
+
+        # by config to find second integration
+        found = integrations.find_by(config={"token_endpoint_auth_method": "client_secret_post"})
+        assert found is not None
+        assert found["config"]["token_endpoint_auth_method"] == "client_secret_post"
+        assert found["name"] == "keycloak-post"
+
+        # by multiple criteria
+        found = integrations.find_by(integration_type="custom", name="keycloak-post")
+        assert found is not None
+        assert found["template"] == "custom"
+        assert found["name"] == "keycloak-post"
+
+        # find connect integration
+        found = integrations.find_by(integration_type=types.OAuthIntegrationType.CONNECT)
+        assert found is not None
+        assert found["template"] == "connect"
+        assert found["name"] == "Connect Visitor API Key"
+
+        found = integrations.find_by(integration_type="connect")
+        assert found is not None
+        assert found["template"] == "connect"
+        assert found["name"] == "Connect Visitor API Key"
+
+        found = integrations.find_by(name="Connect Visitor API Key")
+        assert found is not None
+        assert found["name"] == "Connect Visitor API Key"
+
+        found = integrations.find_by(description="Allows access to Connect APIs")
+        assert found is not None
+        assert found["description"] == "Allows access to Connect APIs on behalf of a Connect user."
+
+        found = integrations.find_by(config={"scopes": "admin"})
+        assert found is not None
+        assert found["config"]["scopes"] == "admin"
+
+        # no match
+        found = integrations.find_by(name="Non-existent Integration")
+        assert found is None

tests/posit/connect/test_content.py

@@ -376,6 +376,30 @@ def test(self):
         assert get_one["name"] == "Performance-Data-1671216053560"
 
 
+class TestContentCurrent:
+    @responses.activate
+    def test_with_env_var(self, monkeypatch):
+        guid = "f2f37341-e21d-3d80-c698-a935ad614066"
+        monkeypatch.setenv("CONNECT_CONTENT_GUID", guid)
+
+        responses.get(
+            f"https://connect.example/__api__/v1/content/{guid}",
+            json=load_mock(f"v1/content/{guid}.json"),
+            match=[matchers.query_param_matcher({"include": "owner,tags,vanity_url"})],
+        )
+        c = Client("https://connect.example", "12345")
+        content_item = c.content.current
+        assert content_item["guid"] == guid
+
+    def test_without_env_var(self, monkeypatch):
+        monkeypatch.delenv("CONNECT_CONTENT_GUID", raising=False)
+        c = Client("https://connect.example", "12345")
+        with pytest.raises(
+            RuntimeError, match="CONNECT_CONTENT_GUID environment variable is not set."
+        ):
+            _ = c.content.current
+
+
 class TestContentsCount:
     @responses.activate
     def test(self):