Cluster - Client library API migration changes

dataproc_jupyter_plugin/tests/test_dataproc.py

@@ -13,29 +13,54 @@
 # limitations under the License.
 
 import json
+from unittest import mock
 
 from dataproc_jupyter_plugin.tests import mocks
 
+from google.cloud.dataproc_v1.services.cluster_controller import (
+    ClusterControllerClient,
+    pagers
+)
+from google.auth import credentials as ga_credentials
+from google.cloud.dataproc_v1.types import clusters
+import pytest
 
-async def test_list_clusters(monkeypatch, jp_fetch):
-    mocks.patch_mocks(monkeypatch)
 
-    mock_project_id = "credentials-project"
-    mock_page_token = "mock-page-token"
-    mock_region_id = "mock-region"
-    mock_page_size = "mock_page_size"
-    response = await jp_fetch(
-        "dataproc-plugin",
-        "clusterList",
-        params={"pageSize": mock_page_size, "pageToken": mock_page_token},
-    )
-    assert response.code == 200
-    payload = json.loads(response.body)
-    assert (
-        payload["api_endpoint"]
-        == f"https://dataproc.googleapis.com//v1/projects/credentials-project/regions/{mock_region_id}/clusters?pageSize={mock_page_size}&pageToken={mock_page_token}"
+@pytest.mark.parametrize(
+    "request_type",
+    [
+        clusters.ListClustersRequest,
+        dict,
+    ],
+)
+
+def test_list_clusters(request_type, transport: str = "grpc"):
+    client = ClusterControllerClient(
+        credentials=ga_credentials.AnonymousCredentials(),
+        transport=transport,
     )
-    assert payload["headers"]["Authorization"] == f"Bearer mock-token"
+
+    # Everything is optional in proto3 as far as the runtime is concerned,
+    # and we are mocking out the actual API, so just send an empty request.
+    request = request_type()
+
+    # Mock the actual call within the gRPC stub, and fake the request.
+    with mock.patch.object(type(client.transport.list_clusters), "__call__") as call:
+        # Designate an appropriate return value for the call.
+        call.return_value = clusters.ListClustersResponse(
+            next_page_token="next_page_token_value",
+        )
+        response = client.list_clusters(request)
+
+        # Establish that the underlying gRPC stub method was called.
+        assert len(call.mock_calls) == 1
+        _, args, _ = call.mock_calls[0]
+        request = clusters.ListClustersRequest()
+        assert args[0] == request
+
+    # Establish that the response is the type that we expect.
+    assert isinstance(response, pagers.ListClustersPager)
+    assert response.next_page_token == "next_page_token_value"
 
 
 async def test_list_runtime(monkeypatch, jp_fetch):

pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "pendulum>=3.0.0",
     "pydantic>=1.10.0",
     "bigframes>=0.22.0",
-    "aiohttp>=3.9.5",
+    "aiohttp~=3.9.5",
     "google-cloud-dataproc>=5.10.2",
     "google-cloud-storage>=2.18.2"
 ]