keystone: add support for per page limit

kayrus · web-flow · commit a113e460a302 · 2025-12-12T14:14:11.000Z
diff --git a/openstack/identity/v3/domains/requests.go b/openstack/identity/v3/domains/requests.go
@@ -20,6 +20,9 @@ type ListOpts struct {
 
 	// Name filters the response by domain name.
 	Name string `q:"name"`
+
+	// Limit limits the number of projects returned per page.
+	Limit int `q:"limit"`
 }
 
 // ToDomainListQuery formats a ListOpts into a query string.
diff --git a/openstack/identity/v3/projects/requests.go b/openstack/identity/v3/projects/requests.go
@@ -45,6 +45,9 @@ type ListOpts struct {
 	// NotTagsAny filters on specific project tags. At least one of the tags must be absent for the project.
 	NotTagsAny string `q:"not-tags-any"`
 
+	// Limit limits the number of projects returned per page.
+	Limit int `q:"limit"`
+
 	// Filters filters the response by custom filters such as
 	// 'name__contains=foo'
 	Filters map[string]string `q:"-"`
diff --git a/openstack/identity/v3/projects/testing/fixtures_test.go b/openstack/identity/v3/projects/testing/fixtures_test.go
@@ -59,7 +59,19 @@ const ListOutput = `
       "parent_id": null,
       "tags": ["Red", "Team"],
       "test": "old"
-    },
+    }
+  ],
+  "links": {
+    "next": "%sprojects?limit=1&marker=1234",
+    "self": "%sprojects?limit=1",
+    "previous": null
+  }
+}
+`
+
+const ListOutputSecondPage = `
+{
+  "projects": [
     {
       "is_domain": false,
       "description": "The team that is blue",
@@ -73,8 +85,21 @@ const ListOutput = `
       }
     }
   ],
+  "links": {
+    "next": "%sprojects?limit=1&marker=9876",
+    "self": "%sprojects?limit=1&marker=1234",
+    "previous": null
+  }
+}
+`
+
+const ListOutputThirdPage = `
+{
+  "projects": [
+  ],
   "links": {
     "next": null,
+    "self": "%sprojects?limit=1&marker=9876",
     "previous": null
   }
 }
@@ -299,7 +324,15 @@ func HandleListProjectsSuccessfully(t *testing.T, fakeServer th.FakeServer) {
 
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprint(w, ListOutput)
+
+		switch r.URL.Query().Get("marker") {
+		case "":
+			fmt.Fprintf(w, ListOutput, fakeServer.Endpoint(), fakeServer.Endpoint())
+		case "1234":
+			fmt.Fprintf(w, ListOutputSecondPage, fakeServer.Endpoint(), fakeServer.Endpoint())
+		case "9876":
+			fmt.Fprintf(w, ListOutputThirdPage, fakeServer.Endpoint())
+		}
 	})
 }
 
diff --git a/openstack/identity/v3/projects/testing/requests_test.go b/openstack/identity/v3/projects/testing/requests_test.go
@@ -35,19 +35,26 @@ func TestListProjects(t *testing.T) {
 	defer fakeServer.Teardown()
 	HandleListProjectsSuccessfully(t, fakeServer)
 
+	actualProjects := make([]projects.Project, 0, 2)
 	count := 0
-	err := projects.List(client.ServiceClient(fakeServer), nil).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
+	opts := projects.ListOpts{
+		Limit: 1,
+	}
+	err := projects.List(client.ServiceClient(fakeServer), opts).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
 		count++
 
 		actual, err := projects.ExtractProjects(page)
 		th.AssertNoErr(t, err)
 
-		th.CheckDeepEquals(t, ExpectedProjectSlice, actual)
+		actualProjects = append(actualProjects, actual...)
 
 		return true, nil
 	})
 	th.AssertNoErr(t, err)
-	th.CheckEquals(t, count, 1)
+	th.CheckEquals(t, count, 2)
+
+	th.CheckEquals(t, len(actualProjects), 2)
+	th.CheckDeepEquals(t, ExpectedProjectSlice, actualProjects)
 }
 
 func TestListGroupsFiltersCheck(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ type ListOpts struct {`
`20`	`20`
`21`	`21`	`// Name filters the response by domain name.`
`22`	`22`	Name string `q:"name"`
	`23`	`+`
	`24`	`+ // Limit limits the number of projects returned per page.`
	`25`	+ Limit int `q:"limit"`
`23`	`26`	`}`
`24`	`27`
`25`	`28`	`// ToDomainListQuery formats a ListOpts into a query string.`