Fix tests.

api/errors_test.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"reflect"
 	"testing"
+
+	"github.com/smallstep/certificates/errs"
 )
 
 func TestError_MarshalJSON(t *testing.T) {
@@ -22,7 +24,7 @@ func TestError_MarshalJSON(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			e := &Error{
+			e := &errs.Error{
 				Status: tt.fields.Status,
 				Err:    tt.fields.Err,
 			}
@@ -45,15 +47,15 @@ func TestError_UnmarshalJSON(t *testing.T) {
 	tests := []struct {
 		name     string
 		args     args
-		expected *Error
+		expected *errs.Error
 		wantErr  bool
 	}{
-		{"ok", args{[]byte(`{"status":400,"message":"bad request"}`)}, &Error{Status: 400, Err: fmt.Errorf("bad request")}, false},
-		{"fail", args{[]byte(`{"status":"400","message":"bad request"}`)}, &Error{}, true},
+		{"ok", args{[]byte(`{"status":400,"message":"bad request"}`)}, &errs.Error{Status: 400, Err: fmt.Errorf("bad request")}, false},
+		{"fail", args{[]byte(`{"status":"400","message":"bad request"}`)}, &errs.Error{}, true},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			e := new(Error)
+			e := new(errs.Error)
 			if err := e.UnmarshalJSON(tt.args.data); (err != nil) != tt.wantErr {
 				t.Errorf("Error.UnmarshalJSON() error = %v, wantErr %v", err, tt.wantErr)
 			}

api/revoke_test.go

@@ -16,18 +16,19 @@ import (
 	"github.com/smallstep/assert"
 	"github.com/smallstep/certificates/authority"
 	"github.com/smallstep/certificates/authority/provisioner"
+	"github.com/smallstep/certificates/errs"
 	"github.com/smallstep/certificates/logging"
 )
 
 func TestRevokeRequestValidate(t *testing.T) {
 	type test struct {
 		rr  *RevokeRequest
-		err *Error
+		err *errs.Error
 	}
 	tests := map[string]test{
 		"error/missing serial": {
 			rr:  &RevokeRequest{},
-			err: &Error{Err: errors.New("missing serial"), Status: http.StatusBadRequest},
+			err: &errs.Error{Err: errors.New("missing serial"), Status: http.StatusBadRequest},
 		},
 		"error/bad reasonCode": {
 			rr: &RevokeRequest{
@@ -35,7 +36,7 @@ func TestRevokeRequestValidate(t *testing.T) {
 				ReasonCode: 15,
 				Passive:    true,
 			},
-			err: &Error{Err: errors.New("reasonCode out of bounds"), Status: http.StatusBadRequest},
+			err: &errs.Error{Err: errors.New("reasonCode out of bounds"), Status: http.StatusBadRequest},
 		},
 		"error/non-passive not implemented": {
 			rr: &RevokeRequest{
@@ -43,7 +44,7 @@ func TestRevokeRequestValidate(t *testing.T) {
 				ReasonCode: 8,
 				Passive:    false,
 			},
-			err: &Error{Err: errors.New("non-passive revocation not implemented"), Status: http.StatusNotImplemented},
+			err: &errs.Error{Err: errors.New("non-passive revocation not implemented"), Status: http.StatusNotImplemented},
 		},
 		"ok": {
 			rr: &RevokeRequest{
@@ -57,7 +58,7 @@ func TestRevokeRequestValidate(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			if err := tc.rr.Validate(); err != nil {
 				switch v := err.(type) {
-				case *Error:
+				case *errs.Error:
 					assert.HasPrefix(t, v.Error(), tc.err.Error())
 					assert.Equals(t, v.StatusCode(), tc.err.Status)
 				default:
@@ -189,7 +190,7 @@ func Test_caHandler_Revoke(t *testing.T) {
 						return nil, nil
 					},
 					revoke: func(ctx context.Context, opts *authority.RevokeOptions) error {
-						return InternalServerError(errors.New("force"))
+						return errs.InternalServerError(errors.New("force"))
 					},
 				},
 			}

api/utils_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
+	"github.com/smallstep/certificates/errs"
 	"github.com/smallstep/certificates/logging"
 )
 
@@ -108,7 +109,7 @@ func TestReadJSON(t *testing.T) {
 				t.Errorf("ReadJSON() error = %v, wantErr %v", err, tt.wantErr)
 			}
 			if tt.wantErr {
-				e, ok := err.(*Error)
+				e, ok := err.(*errs.Error)
 				if ok {
 					if code := e.StatusCode(); code != 400 {
 						t.Errorf("error.StatusCode() = %v, wants 400", code)