Merge branch 'v3' into jimmctl-reference-part-2

canonical · Dec 4, 2024 · a3210c4 · a3210c4
2 parents d8bf864 + 55d9bc9
commit a3210c4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/internal/common/pagination/pagination.go b/internal/common/pagination/pagination.go
@@ -20,7 +20,7 @@ type LimitOffsetPagination struct {
 // NewOffsetFilter creates a filter for limit/offset pagination.
 // If limit or offset are out of bounds, defaults will be used instead.
 func NewOffsetFilter(limit int, offset int) LimitOffsetPagination {
-	if limit < 0 {
+	if limit <= 0 {
 		limit = defaultOffsetFilterPageSize
 	}
 	if limit > maxOffsetFilterPageSize {

diff --git a/internal/common/pagination/pagination_test.go b/internal/common/pagination/pagination_test.go
@@ -26,6 +26,13 @@ func TestOffsetFilter(t *testing.T) {
 			wantLimit:  10,
 			wantOffset: 5,
 		},
+		{
+			desc:       "Valid value are not changed",
+			limit:      0,
+			offset:     0,
+			wantLimit:  pagination.DefaultPageSize,
+			wantOffset: 0,
+		},
 		{
 			desc:       "Negative values are corrected",
 			limit:      -1,

diff --git a/internal/jimmhttp/rebac_admin/resources_integration_test.go b/internal/jimmhttp/rebac_admin/resources_integration_test.go
@@ -111,6 +111,19 @@ func (s *resourcesSuite) TestListResources(c *gc.C) {
 		wantNextpage *int
 		ids          []testEntity
 	}{
+		{
+			desc:     "test default sizes",
+			wantPage: 0,
+			wantSize: 5,
+			ids:      ids,
+		},
+		{
+			desc:     "test default sizes",
+			page:     utils.IntToPointer(0),
+			wantPage: 0,
+			wantSize: 5,
+			ids:      ids,
+		},
 		{
 			desc:         "test with first page",
 			size:         utils.IntToPointer(2),

diff --git a/rocks/jimm.yaml b/rocks/jimm.yaml
@@ -44,4 +44,4 @@ parts:
             mkdir -p $CRAFT_PART_INSTALL/root/openfga/
             # Note that we can't use go run directly (https://github.com/canonical/rockcraft/issues/755)
             go install github.com/openfga/cli/cmd/fga@latest
-            /root/go/bin/fga model transform --file ./openfga/authorisation_model.fga --output-format json > $CRAFT_PART_INSTALL/root/openfga/authorisation_model.json
+            $GOBIN/fga model transform --file ./openfga/authorisation_model.fga --output-format json > $CRAFT_PART_INSTALL/root/openfga/authorisation_model.json