Skip to content

Commit 90867bc

Browse files
author
Marco Talento
committed
fix all golangci linters errors
1 parent d0abf93 commit 90867bc

File tree

11 files changed

+149
-136
lines changed

11 files changed

+149
-136
lines changed

‎.golangci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,4 @@ linters-settings:
222222
disabled: true
223223

224224
misspell:
225-
locale: "US" # Fix the colour => color, and co
225+
locale: "UK" # Fix the colour => color, and co

‎app/context.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@ func (sc *Context) SetTraceID(traceID string) *Context {
6565

6666
// TraceID returns the trace identifier for the current flow
6767
func (sc *Context) TraceID() string {
68-
return sc.Context.Value(TraceIDKey).(string)
68+
traceID := sc.Context.Value(TraceIDKey)
69+
70+
if id, ok := traceID.(string); ok {
71+
return id
72+
}
73+
74+
return ""
6975
}
7076

7177
// FromContext returns a new Context from a context.Context

‎app/context_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ import (
55
"testing"
66

77
"github.com/google/uuid"
8-
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
99
)
1010

1111
func TestNewContext(t *testing.T) {
1212
parentCtx := context.Background()
1313

1414
ctx := NewContext(parentCtx)
1515

16-
assert.NotEmpty(t, ctx.TraceID())
16+
require.NotEmpty(t, ctx.TraceID())
1717

1818
_, err := uuid.Parse(ctx.TraceID())
1919

20-
assert.NoError(t, err)
20+
require.NoError(t, err)
2121
}
2222

2323
func TestFromContext(t *testing.T) {
@@ -31,30 +31,30 @@ func TestFromContext(t *testing.T) {
3131

3232
ctx := FromContext(parentCtx)
3333

34-
assert.Equal(t, expectedTraceID, ctx.TraceID())
34+
require.Equal(t, expectedTraceID, ctx.TraceID())
3535

3636
userID, checkUser := ctx.UserID()
37-
assert.Equal(t, expectedUserID, userID)
38-
assert.True(t, checkUser)
37+
require.Equal(t, expectedUserID, userID)
38+
require.True(t, checkUser)
3939

4040
tenantID, checkTenant := ctx.TenantID()
41-
assert.Equal(t, expectedTenantID, tenantID)
42-
assert.True(t, checkTenant)
41+
require.Equal(t, expectedTenantID, tenantID)
42+
require.True(t, checkTenant)
4343
}
4444

4545
func TestFromEmptyContext(t *testing.T) {
4646
parentCtx := context.Background()
4747
ctx := FromContext(parentCtx)
4848

49-
assert.NotEmpty(t, ctx.TraceID())
49+
require.NotEmpty(t, ctx.TraceID())
5050

5151
userID, checkUser := ctx.UserID()
52-
assert.Equal(t, "", userID)
53-
assert.False(t, checkUser)
52+
require.Equal(t, "", userID)
53+
require.False(t, checkUser)
5454

5555
tenantID, checkTenant := ctx.TenantID()
56-
assert.Equal(t, "", tenantID)
57-
assert.False(t, checkTenant)
56+
require.Equal(t, "", tenantID)
57+
require.False(t, checkTenant)
5858
}
5959

6060
func TestContextCancellation(t *testing.T) {
@@ -64,5 +64,5 @@ func TestContextCancellation(t *testing.T) {
6464

6565
cancel()
6666

67-
assert.Equal(t, context.Canceled, ctx.Err())
67+
require.Equal(t, context.Canceled, ctx.Err())
6868
}

‎app/error.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const (
1212
Validation ErrorType = "validation"
1313
// Permission error
1414
Permission ErrorType = "permission"
15-
// Unauthorized error
16-
Unauthorized ErrorType = "unauthorized"
15+
// Unauthorised error
16+
Unauthorised ErrorType = "unauthorised"
1717
// Conflict error
1818
Conflict ErrorType = "conflict"
1919
// Timeout error
@@ -89,7 +89,7 @@ func (e Error) Severity() ErrorSeverity {
8989
}
9090

9191
// Set the original error severity
92-
func (e Error) SetSeverity(severity ErrorSeverity) Error {
92+
func (e *Error) SetSeverity(severity ErrorSeverity) *Error {
9393
e.severity = severity
9494
return e
9595
}
@@ -100,13 +100,13 @@ func (e Error) Detail() string {
100100
}
101101

102102
// Set the erro detail
103-
func (e Error) SetDetail(detail string) Error {
103+
func (e *Error) SetDetail(detail string) *Error {
104104
e.detail = detail
105105
return e
106106
}
107107

108108
// wrap the original error cause
109-
func (e Error) Wrap(err error) Error {
109+
func (e *Error) Wrap(err error) *Error {
110110
e.cause = err
111111
return e
112112
}
@@ -130,8 +130,8 @@ func (e *Error) AddValidationError(err FieldValidationError) {
130130
}
131131

132132
// NewError creates a application new error
133-
func NewError(code string, errType ErrorType, severity ErrorSeverity, msg string) Error {
134-
return Error{
133+
func NewError(code string, errType ErrorType, severity ErrorSeverity, msg string) *Error {
134+
return &Error{
135135
code: code,
136136
errType: errType,
137137
severity: severity,
@@ -140,41 +140,41 @@ func NewError(code string, errType ErrorType, severity ErrorSeverity, msg string
140140
}
141141

142142
// NewInternalError creates an error of type internal
143-
func NewInternalError(code string, msg string) Error {
143+
func NewInternalError(code string, msg string) *Error {
144144
return NewError(code, Internal, High, msg)
145145
}
146146

147147
// NewValidationError creates an error of type validation
148-
func NewValidationError(code string, msg string) Error {
148+
func NewValidationError(code string, msg string) *Error {
149149
return NewError(code, Validation, Low, msg)
150150
}
151151

152152
// NewNotFoundError creates an error of type not found
153-
func NewNotFoundError(code string, msg string) Error {
153+
func NewNotFoundError(code string, msg string) *Error {
154154
return NewError(code, NotFound, Low, msg)
155155
}
156156

157157
// NewPermissionError creates an error of type permission
158-
func NewPermissionError(code string, msg string) Error {
158+
func NewPermissionError(code string, msg string) *Error {
159159
return NewError(code, Permission, Low, msg)
160160
}
161161

162-
// NewUnauthorizedError creates an error of type unauthorized
163-
func NewUnauthorizedError(code string, msg string) Error {
164-
return NewError(code, Unauthorized, Low, msg)
162+
// NewUnauthorisedError creates an error of type unauthorised
163+
func NewUnauthorisedError(code string, msg string) *Error {
164+
return NewError(code, Unauthorised, Low, msg)
165165
}
166166

167167
// NewConflictError creates an error of type conflict
168-
func NewConflictError(code string, msg string) Error {
168+
func NewConflictError(code string, msg string) *Error {
169169
return NewError(code, Conflict, Low, msg)
170170
}
171171

172172
// NewTimeoutError creates an error of type timeout
173-
func NewTimeoutError(code string, msg string) Error {
173+
func NewTimeoutError(code string, msg string) *Error {
174174
return NewError(code, Timeout, Low, msg)
175175
}
176176

177177
// NewCancelledError creates an error of type cancelled
178-
func NewCancelledError(code string, msg string) Error {
178+
func NewCancelledError(code string, msg string) *Error {
179179
return NewError(code, Cancelled, Low, msg)
180180
}

‎app/error_test.go‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ import (
44
"errors"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
88
)
99

1010
func TestNewAppError(t *testing.T) {
1111
err := NewError("error_code", Internal, High, "Error while running the test").SetDetail("More context about the error")
1212

13-
assert.Equal(t, "error_code", err.Code())
14-
assert.Equal(t, Internal, err.Type())
15-
assert.Equal(t, High, err.Severity())
16-
assert.Equal(t, "Error while running the test", err.Error())
17-
assert.Equal(t, "More context about the error", err.Detail())
18-
assert.NoError(t, err.Cause())
13+
require.Equal(t, "error_code", err.Code())
14+
require.Equal(t, Internal, err.Type())
15+
require.Equal(t, High, err.Severity())
16+
require.Equal(t, "Error while running the test", err.Error())
17+
require.Equal(t, "More context about the error", err.Detail())
18+
require.NoError(t, err.Cause())
1919
}
2020

2121
func TestAppCriticalErrorWrap(t *testing.T) {
2222
cause := errors.New("Inner Error that trigger the AppError")
2323
err := NewError("error_code", Internal, High, "Error while running the test").Wrap(cause).SetSeverity(Critical)
2424

25-
assert.ErrorIs(t, cause, err.Cause())
26-
assert.Equal(t, Critical, err.Severity())
25+
require.ErrorIs(t, cause, err.Cause())
26+
require.Equal(t, Critical, err.Severity())
2727
}
2828

2929
func TestNewValidationError(t *testing.T) {
@@ -36,80 +36,80 @@ func TestNewValidationError(t *testing.T) {
3636
err.AddValidationError(NewFieldValidationError("age", "user is under 18", "user must be an adult"))
3737
err.AddValidationError(NewFieldValidationError("age", "user is too young"))
3838

39-
assert.Equal(t, "validate_user", err.Code())
40-
assert.Equal(t, Validation, err.Type())
41-
assert.Equal(t, Low, err.Severity())
42-
assert.Equal(t, "Error Validating User", err.Error())
43-
assert.NoError(t, err.Cause())
44-
assert.Equal(t, expectedValidationErrs, err.ValidationErrors())
39+
require.Equal(t, "validate_user", err.Code())
40+
require.Equal(t, Validation, err.Type())
41+
require.Equal(t, Low, err.Severity())
42+
require.Equal(t, "Error Validating User", err.Error())
43+
require.NoError(t, err.Cause())
44+
require.Equal(t, expectedValidationErrs, err.ValidationErrors())
4545
}
4646

4747
func TestNewInternalError(t *testing.T) {
4848
err := NewInternalError("error_code", "Error Message")
4949

50-
assert.Equal(t, "error_code", err.Code())
51-
assert.Equal(t, Internal, err.Type())
52-
assert.Equal(t, High, err.Severity())
53-
assert.Equal(t, "Error Message", err.Error())
54-
assert.NoError(t, err.Cause())
50+
require.Equal(t, "error_code", err.Code())
51+
require.Equal(t, Internal, err.Type())
52+
require.Equal(t, High, err.Severity())
53+
require.Equal(t, "Error Message", err.Error())
54+
require.NoError(t, err.Cause())
5555
}
5656

5757
func TestNewNotFoundError(t *testing.T) {
5858
err := NewNotFoundError("error_code", "Error Message")
5959

60-
assert.Equal(t, "error_code", err.Code())
61-
assert.Equal(t, NotFound, err.Type())
62-
assert.Equal(t, Low, err.Severity())
63-
assert.Equal(t, "Error Message", err.Error())
64-
assert.NoError(t, err.Cause())
60+
require.Equal(t, "error_code", err.Code())
61+
require.Equal(t, NotFound, err.Type())
62+
require.Equal(t, Low, err.Severity())
63+
require.Equal(t, "Error Message", err.Error())
64+
require.NoError(t, err.Cause())
6565
}
6666

6767
func TestNewPermissionError(t *testing.T) {
6868
err := NewPermissionError("error_code", "Error Message")
6969

70-
assert.Equal(t, "error_code", err.Code())
71-
assert.Equal(t, Permission, err.Type())
72-
assert.Equal(t, Low, err.Severity())
73-
assert.Equal(t, "Error Message", err.Error())
74-
assert.NoError(t, err.Cause())
70+
require.Equal(t, "error_code", err.Code())
71+
require.Equal(t, Permission, err.Type())
72+
require.Equal(t, Low, err.Severity())
73+
require.Equal(t, "Error Message", err.Error())
74+
require.NoError(t, err.Cause())
7575
}
7676

77-
func TestNewUnauthorizedError(t *testing.T) {
78-
err := NewUnauthorizedError("error_code", "Error Message")
77+
func TestNewUnauthorisedError(t *testing.T) {
78+
err := NewUnauthorisedError("error_code", "Error Message")
7979

80-
assert.Equal(t, "error_code", err.Code())
81-
assert.Equal(t, Unauthorized, err.Type())
82-
assert.Equal(t, Low, err.Severity())
83-
assert.Equal(t, "Error Message", err.Error())
84-
assert.NoError(t, err.Cause())
80+
require.Equal(t, "error_code", err.Code())
81+
require.Equal(t, Unauthorised, err.Type())
82+
require.Equal(t, Low, err.Severity())
83+
require.Equal(t, "Error Message", err.Error())
84+
require.NoError(t, err.Cause())
8585
}
8686

8787
func TestNewConflictError(t *testing.T) {
8888
err := NewConflictError("error_code", "Error Message")
8989

90-
assert.Equal(t, "error_code", err.Code())
91-
assert.Equal(t, Conflict, err.Type())
92-
assert.Equal(t, Low, err.Severity())
93-
assert.Equal(t, "Error Message", err.Error())
94-
assert.NoError(t, err.Cause())
90+
require.Equal(t, "error_code", err.Code())
91+
require.Equal(t, Conflict, err.Type())
92+
require.Equal(t, Low, err.Severity())
93+
require.Equal(t, "Error Message", err.Error())
94+
require.NoError(t, err.Cause())
9595
}
9696

9797
func TestNewTimeoutError(t *testing.T) {
9898
err := NewTimeoutError("error_code", "Error Message")
9999

100-
assert.Equal(t, "error_code", err.Code())
101-
assert.Equal(t, Timeout, err.Type())
102-
assert.Equal(t, Low, err.Severity())
103-
assert.Equal(t, "Error Message", err.Error())
104-
assert.NoError(t, err.Cause())
100+
require.Equal(t, "error_code", err.Code())
101+
require.Equal(t, Timeout, err.Type())
102+
require.Equal(t, Low, err.Severity())
103+
require.Equal(t, "Error Message", err.Error())
104+
require.NoError(t, err.Cause())
105105
}
106106

107107
func TestNewCancelledError(t *testing.T) {
108108
err := NewCancelledError("error_code", "Error Message")
109109

110-
assert.Equal(t, "error_code", err.Code())
111-
assert.Equal(t, Cancelled, err.Type())
112-
assert.Equal(t, Low, err.Severity())
113-
assert.Equal(t, "Error Message", err.Error())
114-
assert.NoError(t, err.Cause())
110+
require.Equal(t, "error_code", err.Code())
111+
require.Equal(t, Cancelled, err.Type())
112+
require.Equal(t, Low, err.Severity())
113+
require.Equal(t, "Error Message", err.Error())
114+
require.NoError(t, err.Cause())
115115
}

0 commit comments

Comments
 (0)