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

Author: EtienneM

CHANGELOG.md

@@ -10,6 +10,7 @@
 * feat(sshkeys): add support for ed25519 keys
 * feat(apps/create): detect Git main branch name
 * fix(databases): `parseScheduleAtFlag` returns a validation error
+* fix(privatenetworks): `PrivateNetworksDomainsList` must take a `pagination.Request` in argument
 
 ## 1.43.3
 

apps/create.go

@@ -32,7 +32,7 @@ func Create(ctx context.Context, appName, remote, buildpack, projectID string, h
 
 	if buildpack != "" {
 		fmt.Println("Installing custom buildpack...")
-		_, _, err := c.VariableSet(ctx, app.Name, "BUILDPACK_URL", buildpack)
+		_, err := c.VariableSet(ctx, app.Name, "BUILDPACK_URL", buildpack)
 		if err != nil {
 			fmt.Println("Failed to set custom buildpack. Please add BUILDPACK_URL=" + buildpack + " to your application environment")
 		}

apps/operations.go

@@ -27,16 +27,17 @@ type OperationWaiter struct {
 	url    string
 }
 
+// TODO make it rivate and remove it?
 func NewOperationWaiterFromHTTPResponse(app string, res *http.Response) *OperationWaiter {
 	operationURL := res.Header.Get("Location")
-	return NewOperationWaiterFromURL(app, operationURL)
+	return newOperationWaiterFromURL(app, operationURL)
 }
 
-func NewOperationWaiterFromURL(app, url string) *OperationWaiter {
-	return NewOperationWaiter(os.Stderr, app, url)
+func newOperationWaiterFromURL(app, url string) *OperationWaiter {
+	return newOperationWaiter(os.Stderr, app, url)
 }
 
-func NewOperationWaiter(output stdio.Writer, app, url string) *OperationWaiter {
+func newOperationWaiter(output stdio.Writer, app, url string) *OperationWaiter {
 	return &OperationWaiter{
 		output: output,
 		app:    app,

apps/restart.go

@@ -17,18 +17,17 @@ func Restart(ctx context.Context, app string, sync bool, args []string) error {
 		return errors.Wrapf(ctx, err, "fail to get Scalingo client")
 	}
 
-	res, err := c.AppsRestart(ctx, app, &params)
+	restartOpURL, err := c.AppsRestart(ctx, app, &params)
 	if err != nil {
 		return errors.Wrapf(ctx, err, "restart app %s", app)
 	}
-	res.Body.Close()
 
 	if !sync {
 		fmt.Println("Your application is being restarted.")
 		return nil
 	}
 
-	waiter := NewOperationWaiterFromHTTPResponse(app, res)
+	waiter := newOperationWaiterFromURL(app, restartOpURL)
 	_, err = waiter.WaitOperation(ctx)
 	if err != nil {
 		return errors.Wrap(ctx, err, "wait for restart operation")

apps/run.go

@@ -139,7 +139,7 @@ func Run(ctx context.Context, opts RunOpts) error {
 		return nil
 	}
 
-	waiter := NewOperationWaiter(runCtx.waitingTextOutputWriter, opts.App, runRes.OperationURL)
+	waiter := newOperationWaiter(runCtx.waitingTextOutputWriter, opts.App, runRes.OperationURL)
 	waiter.SetPrompt(fmt.Sprintf("-----> Starting container %v   ", runRes.Container.Label))
 	operation, err := waiter.WaitOperation(ctx)
 	if err != nil {

apps/scale.go

@@ -2,7 +2,6 @@ package apps
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
 	"strconv"
@@ -107,7 +106,7 @@ func Scale(ctx context.Context, app string, sync bool, types []string) error {
 		}
 	}
 
-	res, err := c.AppsScale(ctx, app, scaleParams)
+	resContainerTypes, operationURL, err := c.AppsScale(ctx, app, scaleParams)
 	if err != nil {
 		if !utils.IsPaymentRequiredAndFreeTrialExceededError(err) {
 			var reqestFailedError *http.RequestFailedError
@@ -127,27 +126,20 @@ func Scale(ctx context.Context, app string, sync bool, types []string) error {
 			return Scale(ctx, app, sync, types)
 		})
 	}
-	defer res.Body.Close()
-
-	var scaleRes ScaleRes
-	err = json.NewDecoder(res.Body).Decode(&scaleRes)
-	if err != nil {
-		return errors.Wrapf(ctx, err, "fail to decode API response to scale operation")
-	}
 
 	fmt.Printf("Your application is being scaled to:\n")
-	for _, ct := range scaleRes.Containers {
+	for _, ct := range resContainerTypes {
 		fmt.Println(io.Indent(fmt.Sprintf("%s: %d - %s", ct.Name, ct.Amount, ct.Size), 2))
 	}
 
 	if !sync {
 		return nil
 	}
 
-	waiter := NewOperationWaiterFromHTTPResponse(app, res)
+	waiter := newOperationWaiterFromURL(app, operationURL)
 	_, err = waiter.WaitOperation(ctx)
 	if err != nil {
-		return errors.Wrapf(ctx, err, "fail to handle the scale operation")
+		return errors.Wrapf(ctx, err, "wait for the end of the scale operation")
 	}
 
 	fmt.Println("Your application has been scaled.")

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)
 			}