diff --git a/.golangci.yml b/.golangci.yml index 81fc978..a8c1953 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -14,6 +14,7 @@ linters: - gci # not working, shows errors on freshly formatted file - varnamelen - lll + linters-settings: errcheck: exclude-functions: @@ -25,3 +26,16 @@ linters-settings: varnamelen: ignore-decls: - c *gin.Context + wrapcheck: + ignoreSigs: + - .JSON( + - .Errorf( + - errors.New( + - errors.Unwrap( + - .Wrap( + - .Wrapf( + - .WithMessage( + - .WithMessagef( + - .WithStack( + ignorePackageGlobs: + - git.javil.eu/jacob1123/budgeteer/postgres \ No newline at end of file diff --git a/server/account_test.go b/server/account_test.go index f0f9795..663cf75 100644 --- a/server/account_test.go +++ b/server/account_test.go @@ -1,6 +1,7 @@ package server import ( + "context" "encoding/json" "net/http" "net/http/httptest" @@ -35,11 +36,10 @@ func TestRegisterUser(t *testing.T) { t.Run("RegisterUser", func(t *testing.T) { t.Parallel() - request, err := http.NewRequest( + request, err := http.NewRequestWithContext(context.Background(), http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`)) - request.Header.Set("Content-Type", "application/json") context := engine.NewContext(request, recorder) if err != nil { t.Errorf("error creating request: %s", err) diff --git a/server/budgeting.go b/server/budgeting.go index f3cb07e..ae4cb39 100644 --- a/server/budgeting.go +++ b/server/budgeting.go @@ -41,7 +41,7 @@ func (h *Handler) budgetingForMonth(c echo.Context) error { month, err := getDate(c) if err != nil { - c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String()) + return c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String()) } data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month) diff --git a/server/session.go b/server/session.go index 66c535a..172f5ec 100644 --- a/server/session.go +++ b/server/session.go @@ -35,7 +35,7 @@ func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolin tokenString = tokenString[7:] token, err := h.TokenVerifier.VerifyToken(tokenString) if err != nil { - return nil, fmt.Errorf("verify token '%s': %s", tokenString, err) + return nil, fmt.Errorf("verify token '%s': %w", tokenString, err) } return token, nil