Merge pull request #111 from hashicorp/bugfix/pagination

Bugfix/pagination

Author: isivaselvan

src/pytfe/resources/_base.py

@@ -16,7 +16,7 @@ def _list(
         page = 1
         while True:
             p = dict(params or {})
-            p.setdefault("page[number]", page)
+            p["page[number]"] = page
             p.setdefault("page[size]", 100)
             r = self.t.request("GET", path, params=p)
 

tests/units/test_agent_pools.py

@@ -139,7 +139,6 @@ def test_list_agent_pools_with_options(self, agent_pools_service, mock_transport
         mock_transport.request.return_value.json.return_value = mock_response
 
         options = AgentPoolListOptions(
-            page_number=2,
             page_size=10,
             allowed_workspace_policy=AgentPoolAllowedWorkspacePolicy.ALL_WORKSPACES,
         )
@@ -150,7 +149,7 @@ def test_list_agent_pools_with_options(self, agent_pools_service, mock_transport
         mock_transport.request.assert_called_once()
         call_args = mock_transport.request.call_args
         params = call_args[1]["params"]
-        assert params["page[number]"] == 2
+        assert params["page[number]"] == 1
         assert params["page[size]"] == 10
         assert params["filter[allowed_workspace_policy]"] == "all-workspaces"
 

tests/units/test_configuration_version.py

@@ -164,7 +164,7 @@ def test_list_with_options(
 
         workspace_id = "ws-YnyXLq9fy38afEeb"
         options = ConfigurationVersionListOptions(
-            include=[ConfigVerIncludeOpt.INGRESS_ATTRIBUTES], page_size=5, page_number=1
+            include=[ConfigVerIncludeOpt.INGRESS_ATTRIBUTES], page_size=5
         )
 
         list(configuration_versions_service.list(workspace_id, options))
@@ -173,7 +173,7 @@ def test_list_with_options(
         expected_params = {
             "include": "ingress_attributes",
             "page[size]": "5",
-            "page[number]": "1",
+            "page[number]": 1,
         }
         mock_transport.request.assert_called_with(
             "GET",

tests/units/test_workspace_resources.py

@@ -143,7 +143,7 @@ def test_list_workspace_resources_with_options(
         mock_transport.request.return_value = mock_response
 
         # Create options
-        options = WorkspaceResourceListOptions(page_number=2, page_size=50)
+        options = WorkspaceResourceListOptions(page_number=1, page_size=50)
 
         # Call the service
         result = list(service.list("ws-abc123", options))
@@ -152,7 +152,7 @@ def test_list_workspace_resources_with_options(
         mock_transport.request.assert_called_once_with(
             "GET",
             "/api/v2/workspaces/ws-abc123/resources",
-            params={"page[number]": 2, "page[size]": 50},
+            params={"page[number]": 1, "page[size]": 50},
         )
 
         # Verify response

tests/units/test_workspaces.py

@@ -751,14 +751,14 @@ def test_list_remote_state_consumers_with_pagination(
         """Test remote state consumers listing with pagination options."""
         mock_transport.request.return_value.json.return_value = {"data": []}
 
-        options = WorkspaceListRemoteStateConsumersOptions(page_number=2, page_size=5)
+        options = WorkspaceListRemoteStateConsumersOptions(page_size=5)
 
         list(workspaces_service.list_remote_state_consumers("ws-123", options))
 
         # Verify pagination parameters were passed
         call_args = mock_transport.request.call_args
         params = call_args[1]["params"]
-        assert params["page[number]"] == 2
+        assert params["page[number]"] == 1
         assert params["page[size]"] == 5
 
     def test_add_remote_state_consumers_basic(self, workspaces_service, mock_transport):
@@ -921,15 +921,15 @@ def test_list_tags_with_query_and_pagination(
         """Test tag listing with query and pagination options."""
         mock_transport.request.return_value.json.return_value = {"data": []}
 
-        options = WorkspaceTagListOptions(query="env", page_number=2, page_size=5)
+        options = WorkspaceTagListOptions(query="env", page_size=5)
 
         list(workspaces_service.list_tags("ws-123", options))
 
         # Verify query and pagination parameters were passed
         call_args = mock_transport.request.call_args
         params = call_args[1]["params"]
         assert params["name"] == "env"
-        assert params["page[number]"] == 2
+        assert params["page[number]"] == 1
         assert params["page[size]"] == 5
 
     def test_add_tags_basic(self, workspaces_service, mock_transport):