refactor(alerts): replace errgo with ErrCtx

Scalingo · Feb 16, 2024 · 4bc8428 · 4bc8428
1 parent 56a24f6
commit 4bc8428
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/alerts/add.go b/alerts/add.go
@@ -3,22 +3,21 @@ package alerts
 import (
 	"context"
 
-	"gopkg.in/errgo.v1"
-
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
 	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-utils/errors/v2"
 )
 
 func Add(ctx context.Context, app string, params scalingo.AlertAddParams) error {
 	c, err := config.ScalingoClient(ctx)
 	if err != nil {
-		return errgo.Notef(err, "fail to get Scalingo client")
+		return errors.Wrap(ctx, err, "get Scalingo client")
 	}
 
 	a, err := c.AlertAdd(ctx, app, params)
 	if err != nil {
-		return errgo.Mask(err)
+		return errors.Wrap(ctx, err, "add alert")
 	}
 
 	io.Status("Alert created for the container type", a.ContainerType)

diff --git a/alerts/list.go b/alerts/list.go
@@ -4,22 +4,23 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strconv"
 
 	"github.com/olekukonko/tablewriter"
-	"gopkg.in/errgo.v1"
 
 	"github.com/Scalingo/cli/config"
+	"github.com/Scalingo/go-utils/errors/v2"
 )
 
 func List(ctx context.Context, app string) error {
 	c, err := config.ScalingoClient(ctx)
 	if err != nil {
-		return errgo.Notef(err, "fail to get Scalingo client")
+		return errors.Wrap(ctx, err, "get Scalingo client")
 	}
 
 	alerts, err := c.AlertsList(ctx, app)
 	if err != nil {
-		return errgo.Mask(err)
+		return errors.Wrap(ctx, err, "list alerts")
 	}
 
 	t := tablewriter.NewWriter(os.Stdout)
@@ -49,7 +50,7 @@ func List(ctx context.Context, app string) error {
 
 		row := []string{
 			alert.ID,
-			fmt.Sprint(!alert.Disabled),
+			strconv.FormatBool(!alert.Disabled),
 			alert.ContainerType,
 			alert.Metric,
 			fmt.Sprintf("%s %.2f%s", above, alert.Limit, durationString),

diff --git a/alerts/remove.go b/alerts/remove.go
@@ -3,21 +3,20 @@ package alerts
 import (
 	"context"
 
-	"gopkg.in/errgo.v1"
-
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
+	"github.com/Scalingo/go-utils/errors/v2"
 )
 
 func Remove(ctx context.Context, app, id string) error {
 	c, err := config.ScalingoClient(ctx)
 	if err != nil {
-		return errgo.Notef(err, "fail to get Scalingo client")
+		return errors.Wrapf(ctx, err, "get Scalingo client")
 	}
 
 	err = c.AlertRemove(ctx, app, id)
 	if err != nil {
-		return errgo.Mask(err)
+		return errors.Wrapf(ctx, err, "remove alert")
 	}
 
 	io.Status("The alert has been deleted")

diff --git a/alerts/update.go b/alerts/update.go
@@ -3,22 +3,21 @@ package alerts
 import (
 	"context"
 
-	"gopkg.in/errgo.v1"
-
 	"github.com/Scalingo/cli/config"
 	"github.com/Scalingo/cli/io"
 	"github.com/Scalingo/go-scalingo/v6"
+	"github.com/Scalingo/go-utils/errors/v2"
 )
 
 func Update(ctx context.Context, app, id string, params scalingo.AlertUpdateParams) error {
 	c, err := config.ScalingoClient(ctx)
 	if err != nil {
-		return errgo.Notef(err, "fail to get Scalingo client")
+		return errors.Wrapf(ctx, err, "get Scalingo client")
 	}
 
 	_, err = c.AlertUpdate(ctx, app, id, params)
 	if err != nil {
-		return errgo.Mask(err, errgo.Any)
+		return errors.Wrapf(ctx, err, "update alert")
 	}
 
 	var msg string