mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Error to ApiError to avoid ambiguity (#2954)

Browse Source 
Rename Error to ApiError to avoide ambiguity and remove redundant status code

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
This commit is contained in:
Daniel Valdivia
2023-08-16 14:18:08 -07:00
committed by GitHub
parent e7fb205c31
commit 912a4b216f
212 changed files with 2102 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
restapi/errors_test.go
View File

@@ -21,7 +21,6 @@ import (
"fmt"
"testing"
"github.com/go-openapi/swag"
"github.com/minio/console/models"
"github.com/stretchr/testify/assert"
)
@@ -34,7 +33,7 @@ func TestError(t *testing.T) {
type testError struct {
name string
args args
want *models.Error
want *CodedAPIError
}
var tests []testError
@@ -91,7 +90,10 @@ func TestError(t *testing.T) {
args: args{
err: []interface{}{e.err},
},
want: &models.Error{Code: int32(e.code), Message: swag.String(e.err.Error()), DetailedMessage: swag.String(e.err.Error())},
want: &CodedAPIError{
Code: e.code,
APIError: &models.APIError{Message: e.err.Error(), DetailedMessage: e.err.Error()},
},
})
}
tests = append(tests,
@@ -100,13 +102,16 @@ func TestError(t *testing.T) {
args: args{
err: []interface{}{ErrDefault, ErrInvalidLogin},
},
want: &models.Error{Code: int32(401), Message: swag.String(ErrDefault.Error()), DetailedMessage: swag.String(ErrDefault.Error())},
want: &CodedAPIError{
Code: int(401),
APIError: &models.APIError{Message: ErrDefault.Error(), DetailedMessage: ErrDefault.Error()},
},
})
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got := Error(tt.args.err...)
assert.Equalf(t, tt.want.Code, got.Code, "Error(%v) Got (%v)", tt.want.Code, got.Code)
assert.Equalf(t, *tt.want.DetailedMessage, *got.DetailedMessage, "Error(%s) Got (%s)", *tt.want.DetailedMessage, *got.DetailedMessage)
assert.Equalf(t, tt.want.APIError.DetailedMessage, got.APIError.DetailedMessage, "Error(%s) Got (%s)", tt.want.APIError.DetailedMessage, got.APIError.DetailedMessage)
})
}
}
@@ -119,7 +124,7 @@ func TestErrorWithContext(t *testing.T) {
tests := []struct {
name string
args args
want *models.Error
want *CodedAPIError
}{
{
name: "default error",
@@ -127,7 +132,9 @@ func TestErrorWithContext(t *testing.T) {
ctx: context.Background(),
err: []interface{}{ErrDefault},
},
want: &models.Error{Code: 500, Message: swag.String(ErrDefault.Error()), DetailedMessage: swag.String(ErrDefault.Error())},
want: &CodedAPIError{
Code: 500, APIError: &models.APIError{Message: ErrDefault.Error(), DetailedMessage: ErrDefault.Error()},
},
},
}
for _, tt := range tests {