feat(sdk): Fix error unit test and preserve sdk.Error on wrap

ovh · Sep 28, 2018 · 0a6b710 · 0a6b710
1 parent 8a64c69
commit 0a6b710
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/cli/cobra.go b/cli/cobra.go
@@ -28,7 +28,7 @@ func ExitOnError(err error, helpFunc ...func() error) {
 		return
 	}
 
-	var code int
+	code := 50 // default error code
 
 	switch e := err.(type) {
 	case sdk.Error:

diff --git a/sdk/cdsclient/http.go b/sdk/cdsclient/http.go
@@ -111,15 +111,19 @@ func (c *client) RequestJSON(method, path string, in interface{}, out interface{
 		return nil, nil, code, err
 	}
 
+	if code >= 400 {
+		if err := sdk.DecodeError(res); err != nil {
+			return res, nil, code, err
+		}
+		return res, nil, code, fmt.Errorf("HTTP %d", code)
+	}
+
 	if out != nil {
 		if err := json.Unmarshal(res, out); err != nil {
 			return res, nil, code, err
 		}
 	}
 
-	if code >= 400 {
-		return res, nil, code, fmt.Errorf("HTTP %d", code)
-	}
 	return res, header, code, nil
 }
 
@@ -149,8 +153,9 @@ func (c *client) Request(method string, path string, body io.Reader, mods ...Req
 
 	if code >= 400 {
 		if err := sdk.DecodeError(bodyBtes); err != nil {
-			return nil, nil, code, err
+			return bodyBtes, nil, code, err
 		}
+		return bodyBtes, nil, code, fmt.Errorf("HTTP %d", code)
 	}
 
 	return bodyBtes, respHeader, code, nil

diff --git a/sdk/error.go b/sdk/error.go
@@ -566,6 +566,15 @@ func WrapError(err error, format string, args ...interface{}) error {
 		return e
 	}
 
+	// if it's a Error wrap it in error with stack
+	if e, ok := err.(Error); ok {
+		return errorWithStack{
+			root:      errors.Wrap(err, m),
+			stack:     callers(),
+			httpError: e,
+		}
+	}
+
 	return errorWithStack{
 		root:      errors.Wrap(err, m),
 		stack:     callers(),
@@ -585,6 +594,15 @@ func WithStack(err error) error {
 		return e
 	}
 
+	// if it's a Error wrap it in error with stack
+	if e, ok := err.(Error); ok {
+		return errorWithStack{
+			root:      errors.WithStack(err),
+			stack:     callers(),
+			httpError: e,
+		}
+	}
+
 	return errorWithStack{
 		root:      errors.WithStack(err),
 		stack:     callers(),

diff --git a/sdk/error_test.go b/sdk/error_test.go
@@ -3,6 +3,8 @@ package sdk
 import (
 	"fmt"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestErrorIs(t *testing.T) {
@@ -16,17 +18,25 @@ func TestErrorIs(t *testing.T) {
 		want bool
 	}{
 		{
-			"Check Error is true",
+			"Check for wrapped Error is true",
 			args{
-				err: fmt.Errorf(ErrNoProject.String()),
+				err: WithStack(ErrNoProject),
 				t:   ErrNoProject,
 			},
 			true,
 		},
 		{
-			"Check Error is false",
+			"Check for Error is true",
 			args{
-				err: fmt.Errorf("FOO"),
+				err: ErrNoProject,
+				t:   ErrNoProject,
+			},
+			true,
+		},
+		{
+			"Check for other error is false",
+			args{
+				err: fmt.Errorf("project does not exist"),
 				t:   ErrNoProject,
 			},
 			false,
@@ -43,18 +53,25 @@ func TestErrorIs(t *testing.T) {
 
 func TestNewError(t *testing.T) {
 	err := NewError(ErrWrongRequest, fmt.Errorf("this is an error generated from vendor"))
+	assert.Equal(t, "TestNewError: wrong request (caused by: this is an error generated from vendor)", err.Error())
+
 	// print the error call stack
 	fmt.Println(err)
 	// print the error stack trace
 	fmt.Printf("%+v\n", err)
 
 	httpErr := ExtractHTTPError(err, "fr")
+
 	// print the http error
 	fmt.Println(httpErr)
+
+	assert.Equal(t, "la requête est incorrecte", httpErr.Error())
 }
 
 func TestWrapError(t *testing.T) {
 	err := oneForStackTest()
+	assert.Equal(t, "TestWrapError>oneForStackTest>twoForStackTest>threeForStackTest>fourForStackTest>fiveForStackTest: internal server error (caused by: one: two: three: four: five: this is an error generated from vendor)", err.Error())
+
 	// print the error call stack
 	fmt.Println(err)
 	// print the error stack trace