fix(test) string format

Author: curzolapierre

apps/operations.go

@@ -52,12 +52,12 @@ func (w *OperationWaiter) SetPrompt(p string) {
 func (w *OperationWaiter) WaitOperation(ctx context.Context) (*scalingo.Operation, error) {
 	opURL, err := url.Parse(w.url)
 	if err != nil {
-		return nil, errors.Notef(ctx, err, "parse url of operation")
+		return nil, errors.Wrap(ctx, err, "parse url of operation")
 	}
 
 	c, err := config.ScalingoClient(ctx)
 	if err != nil {
-		return nil, errors.Notef(ctx, err, "get Scalingo client")
+		return nil, errors.Wrap(ctx, err, "get Scalingo client")
 	}
 
 	var op *scalingo.Operation
@@ -70,7 +70,7 @@ func (w *OperationWaiter) WaitOperation(ctx context.Context) (*scalingo.Operatio
 
 	op, err = c.OperationsShow(ctx, w.app, opID)
 	if err != nil {
-		return nil, errors.Notef(ctx, err, "get operation %v", opID)
+		return nil, errors.Wrapf(ctx, err, "get operation %v", opID)
 	}
 
 	go func() {
@@ -89,15 +89,15 @@ func (w *OperationWaiter) WaitOperation(ctx context.Context) (*scalingo.Operatio
 		}
 	}()
 
-	fmt.Fprintf(w.output, w.prompt)
+	fmt.Fprint(w.output, w.prompt)
 	spinner := io.NewSpinner(os.Stderr)
 	go spinner.Start()
 	defer spinner.Stop()
 
 	for {
 		select {
 		case err := <-errs:
-			return op, errors.Notef(ctx, err, "get operation %v", op.ID)
+			return op, errors.Wrapf(ctx, err, "get operation %v", op.ID)
 		case <-done:
 			if op.Status == "done" {
 				fmt.Printf("\bDone in %.3f seconds\n", op.ElapsedDuration())

git/setup.go

@@ -7,8 +7,9 @@ import (
 	gitconfig "github.com/go-git/go-git/v5/config"
 	errgo "gopkg.in/errgo.v1"
 
+	"github.com/pkg/errors"
+
 	"github.com/Scalingo/cli/io"
-	"github.com/Scalingo/cli/utils"
 	"github.com/Scalingo/go-scalingo/v7/debug"
 )
 
@@ -63,10 +64,10 @@ func createRemoteInRepository(repository *git.Repository, remoteName string, url
 		URLs: []string{url},
 	})
 	if err != nil {
-		errWrapped := utils.WrapError(err, "fail to create the Git remote")
+		errWrapped := errors.Wrapf(err, "create the Git remote")
 		if err == git.ErrRemoteExists {
 			message := "Fail to configure git repository, '" + remoteName + "' remote already exists (use --force option to override)"
-			errWrapped = utils.WrapError(errWrapped, message)
+			errWrapped = errors.Wrap(errWrapped, message)
 		}
 		return errWrapped
 	}
@@ -76,7 +77,7 @@ func createRemoteInRepository(repository *git.Repository, remoteName string, url
 func deleteThenCreateRemoteInRepository(repository *git.Repository, remoteName string, url string) error {
 	err := repository.DeleteRemote(remoteName)
 	if err != nil {
-		return utils.WrapError(err, "fail to delete the Git remote")
+		return errors.Wrap(err, "delete the Git remote")
 	}
 	return createRemoteInRepository(repository, remoteName, url)
 }

utils/errors.go

@@ -1,8 +1,6 @@
 package utils
 
 import (
-	"gopkg.in/errgo.v1"
-
 	"github.com/Scalingo/go-scalingo/v7/http"
 	errors "github.com/Scalingo/go-utils/errors/v2"
 )
@@ -15,7 +13,3 @@ func IsRegionDisabledError(err error) bool {
 	httperr, ok := reqerr.APIError.(http.ForbiddenError)
 	return ok && httperr.Code == "region_disabled"
 }
-
-func WrapError(err error, wrappingMessage string) error {
-	return errgo.Notef(err, wrappingMessage)
-}