fix(privatenetworks): PrivateNetworksDomainsList must take a pagination.Request in argument

Author: EtienneM

CHANGELOG.md

@@ -9,6 +9,7 @@
 * feat(run): add a `bash` alias for us out there often forgetting the `run` in front
 * feat(sshkeys): add support for ed25519 keys
 * feat(apps/create): detect Git main branch name
+* fix(privatenetworks): `PrivateNetworksDomainsList` must take a `pagination.Request` in argument
 
 ## 1.43.3
 

cmd/deployments.go

@@ -54,10 +54,7 @@ var (
 `,
 		Action: func(ctx context.Context, c *cli.Command) error {
 			currentApp := detect.CurrentApp(ctx, c)
-			err := deployments.List(ctx, currentApp, pagination.Request{
-				Page:    c.Int("page"),
-				PerPage: c.Int("per-page"),
-			})
+			err := deployments.List(ctx, currentApp, pagination.NewRequest(c.Int("page"), c.Int("per-page")))
 			if err != nil {
 				errorQuit(ctx, err)
 			}

cmd/maintenance.go

@@ -38,10 +38,7 @@ var databaseMaintenanceList = cli.Command{
 			addonName = addonUUIDFromFlags(ctx, c, currentResource, true)
 		}
 
-		err := maintenance.List(ctx, currentResource, addonName, pagination.Request{
-			Page:    c.Int("page"),
-			PerPage: c.Int("per-page"),
-		})
+		err := maintenance.List(ctx, currentResource, addonName, pagination.NewRequest(c.Int("page"), c.Int("per-page")))
 		if err != nil {
 			errorQuit(ctx, err)
 		}

cmd/privatenetworks.go

@@ -2,16 +2,15 @@ package cmd
 
 import (
 	"context"
-	"strconv"
 
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v3"
 
 	"github.com/Scalingo/cli/cmd/autocomplete"
 	"github.com/Scalingo/cli/detect"
 	"github.com/Scalingo/cli/privatenetworks"
-	"github.com/Scalingo/go-utils/errors/v3"
 	"github.com/Scalingo/go-utils/logger"
+	"github.com/Scalingo/go-utils/pagination"
 )
 
 const (
@@ -29,14 +28,14 @@ var (
 				Value: outputFormatTable,
 				Usage: "[" + outputFormatJSON + "|" + outputFormatTable + "]",
 			},
-			&cli.StringFlag{
+			&cli.IntFlag{
 				Name:  "page",
-				Value: "1",
+				Value: 1,
 				Usage: "[page]",
 			},
-			&cli.StringFlag{
+			&cli.IntFlag{
 				Name:  "per-page",
-				Value: "20",
+				Value: 20,
 				Usage: "[per-page]",
 			},
 		},
@@ -55,35 +54,18 @@ var (
 				return nil
 			}
 
-			pageStr := c.String("page")
-			perPageStr := c.String("per-page")
+			page := c.Int("page")
+			perPage := c.Int("per-page")
 			formatStr := c.String("format")
 			ctx, _ = logger.WithFieldsToCtx(ctx, logrus.Fields{
-				"page":     pageStr,
-				"per_page": perPageStr,
+				"page":     page,
+				"per_page": perPage,
 				"format":   formatStr,
 			})
 
-			var err error
-			var page int
-			if pageStr != "" {
-				page, err = strconv.Atoi(pageStr)
-				if err != nil || page < 1 {
-					return errors.New(ctx, "invalid page number")
-				}
-			}
-
-			var perPage int
-			if perPageStr != "" {
-				perPage, err = strconv.Atoi(perPageStr)
-				if err != nil || perPage < 1 || perPage > 50 {
-					return errors.New(ctx, "invalid per_page number")
-				}
-			}
-
 			currentApp := detect.CurrentApp(ctx, c)
 
-			err = privatenetworks.List(ctx, currentApp, formatStr, uint(page), uint(perPage))
+			err := privatenetworks.List(ctx, currentApp, formatStr, pagination.NewRequest(page, perPage))
 			if err != nil {
 				errorQuit(ctx, err)
 			}

cmd/timeline.go

@@ -36,10 +36,7 @@ var (
 			}
 
 			utils.CheckForConsent(ctx, currentResource)
-			err := apps.Events(ctx, currentResource, pagination.Request{
-				Page:    c.Int("page"),
-				PerPage: c.Int("per-page"),
-			})
+			err := apps.Events(ctx, currentResource, pagination.NewRequest(c.Int("page"), c.Int("per-page")))
 			if err != nil {
 				errorQuit(ctx, err)
 			}

cmd/user-timeline.go

@@ -27,10 +27,7 @@ var (
 		Action: func(ctx context.Context, c *cli.Command) error {
 			var err error
 			if c.Args().Len() == 0 {
-				err = user.Events(ctx, pagination.Request{
-					Page:    c.Int("page"),
-					PerPage: c.Int("per-page"),
-				})
+				err = user.Events(ctx, pagination.NewRequest(c.Int("page"), c.Int("per-page")))
 			} else {
 				_ = cli.ShowCommandHelp(ctx, c, "user-timeline")
 			}

go.mod

@@ -4,7 +4,7 @@ go 1.25.0
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/Scalingo/go-scalingo/v10 v10.0.0
+	github.com/Scalingo/go-scalingo/v10 v10.0.1-0.20260311102844-5accba791cec
 	github.com/Scalingo/go-utils/errors/v3 v3.2.0
 	github.com/Scalingo/go-utils/logger v1.12.0
 	github.com/Scalingo/go-utils/pagination v1.2.0

go.sum

@@ -9,8 +9,8 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/ProtonMail/go-crypto v1.4.0 h1:Zq/pbM3F5DFgJiMouxEdSVY44MVoQNEKp5d5QxIQceQ=
 github.com/ProtonMail/go-crypto v1.4.0/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo=
-github.com/Scalingo/go-scalingo/v10 v10.0.0 h1:xUbb+MTkzdgWisXhw3MHa0nVSVuossNZJBjw8ak1AFc=
-github.com/Scalingo/go-scalingo/v10 v10.0.0/go.mod h1:d5J8wm6cO1bEycKuLXuWfGY99OhmYR3ATu7QRYvAEAk=
+github.com/Scalingo/go-scalingo/v10 v10.0.1-0.20260311102844-5accba791cec h1:h4l4cms9OlSHVGbeuqWDw0cVAfS1LDiDn5E+3z6Zty4=
+github.com/Scalingo/go-scalingo/v10 v10.0.1-0.20260311102844-5accba791cec/go.mod h1:d5J8wm6cO1bEycKuLXuWfGY99OhmYR3ATu7QRYvAEAk=
 github.com/Scalingo/go-utils/errors/v3 v3.2.0 h1:Ks+v2oRwv3VZfe+xVB+kpfmZouXHVCPHHtwL5W60prc=
 github.com/Scalingo/go-utils/errors/v3 v3.2.0/go.mod h1:jVVNoOdYFjuNkR/BeEZWNWJVvu4jmyLY4udlsQQyBss=
 github.com/Scalingo/go-utils/logger v1.12.0 h1:tK1LwRz7ijYLGe7/c4SzAtNEJCbSPQnOo859O1FsOLM=

privatenetworks/list.go

@@ -12,17 +12,18 @@ import (
 
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/go-utils/errors/v3"
+	"github.com/Scalingo/go-utils/pagination"
 )
 
 const containerTypeWeb = "web"
 
-func List(ctx context.Context, app string, format string, page uint, perPage uint) error {
+func List(ctx context.Context, app string, format string, paginationReq pagination.Request) error {
 	scalingoClient, err := config.ScalingoClient(ctx)
 	if err != nil {
 		return errors.Wrapf(ctx, err, "get Scalingo client")
 	}
 
-	domainNames, err := scalingoClient.PrivateNetworksDomainsList(ctx, app, page, perPage)
+	domainNames, err := scalingoClient.PrivateNetworksDomainsList(ctx, app, paginationReq)
 	if err != nil {
 		return errors.Wrapf(ctx, err, "list private network domains")
 	}