Skip to content

Commit

Permalink
Fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
calvinmclean committed Nov 29, 2023
1 parent 6270796 commit 3b9d10c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/calvinmclean/babyapi/main.yml?branch=main)
[![License](https://img.shields.io/github/license/calvinmclean/babyapi)](https://github.com/calvinmclean/babyapi/blob/main/LICENSE)
[![Go Reference](https://pkg.go.dev/badge/github.com/calvinmclean/babyapi.svg)](https://pkg.go.dev/github.com/calvinmclean/babyapi)
[![codecov](https://codecov.io/gh/calvinmclean/babyapi/branch/main/graph/badge.svg?token=20LWQYHKE8)](https://codecov.io/gh/calvinmclean/babyapi)
[![codecov](https://codecov.io/gh/calvinmclean/babyapi/graph/badge.svg?token=BCVPF745D8)](https://codecov.io/gh/calvinmclean/babyapi)

A Go CRUD API framework so simple a baby could use it.

Expand Down
12 changes: 6 additions & 6 deletions helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ func (a *API[T]) GetRequestedResourceAndDo(do func(*http.Request, T) (render.Ren
resource, httpErr := a.GetRequestedResource(r)
if httpErr != nil {
logger.Error("error getting requested resource", "error", httpErr.Error())
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

resp, httpErr := do(r, resource)
if httpErr != nil {
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

Expand All @@ -56,7 +56,7 @@ func (a *API[T]) GetRequestedResourceAndDo(do func(*http.Request, T) (render.Ren
err := render.Render(w, r, resp)
if err != nil {
logger.Error("unable to render response", "error", err)
render.Render(w, r, ErrRender(err))
_ = render.Render(w, r, ErrRender(err))
}
}
}
Expand All @@ -69,13 +69,13 @@ func (a *API[T]) ReadRequestBodyAndDo(do func(*http.Request, T) (T, *ErrResponse
resource, httpErr := a.GetFromRequest(r)
if httpErr != nil {
logger.Error("invalid request to create resource", "error", httpErr.Error())
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

resp, httpErr := do(r, resource)
if httpErr != nil {
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

Expand All @@ -87,7 +87,7 @@ func (a *API[T]) ReadRequestBodyAndDo(do func(*http.Request, T) (T, *ErrResponse
err := render.Render(w, r, a.responseWrapper(resp))
if err != nil {
logger.Error("unable to render response", "error", err)
render.Render(w, r, ErrRender(err))
_ = render.Render(w, r, ErrRender(err))
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (a *API[T]) requestBodyMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
body, httpErr := a.GetFromRequest(r)
if httpErr != nil {
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

Expand All @@ -72,7 +72,7 @@ func (a *API[T]) resourceExistsMiddleware(next http.Handler) http.Handler {

resource, httpErr := a.GetRequestedResource(r)
if httpErr != nil {
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

Expand Down
16 changes: 8 additions & 8 deletions router.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ func (a *API[T]) Get(w http.ResponseWriter, r *http.Request) {
resource, httpErr := a.GetRequestedResource(r)
if httpErr != nil {
logger.Error("error getting requested resource", "error", httpErr.Error())
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

err := render.Render(w, r, a.responseWrapper(resource))
if err != nil {
logger.Error("unable to render response", "error", err)
render.Render(w, r, ErrRender(err))
_ = render.Render(w, r, ErrRender(err))
}
}

Expand All @@ -78,7 +78,7 @@ func (a *API[T]) GetAll(w http.ResponseWriter, r *http.Request) {
resources, err := a.storage.GetAll(a.getAllFilter(r))
if err != nil {
logger.Error("error getting resources", "error", err)
render.Render(w, r, InternalServerError(err))
_ = render.Render(w, r, InternalServerError(err))
return
}
logger.Debug("responding with resources", "count", len(resources))
Expand All @@ -91,7 +91,7 @@ func (a *API[T]) GetAll(w http.ResponseWriter, r *http.Request) {
err = render.Render(w, r, &ResourceList[render.Renderer]{Items: items})
if err != nil {
logger.Error("unable to render response", "error", err)
render.Render(w, r, ErrRender(err))
_ = render.Render(w, r, ErrRender(err))
}
}

Expand Down Expand Up @@ -188,7 +188,7 @@ func (a *API[T]) Delete(w http.ResponseWriter, r *http.Request) {
httpErr := a.beforeDelete(r)
if httpErr != nil {
logger.Error("error executing before func", "error", httpErr)
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

Expand All @@ -201,18 +201,18 @@ func (a *API[T]) Delete(w http.ResponseWriter, r *http.Request) {
logger.Error("error deleting resource", "error", err)

if errors.Is(err, ErrNotFound) {
render.Render(w, r, ErrNotFoundResponse)
_ = render.Render(w, r, ErrNotFoundResponse)
return
}

render.Render(w, r, InternalServerError(err))
_ = render.Render(w, r, InternalServerError(err))
return
}

httpErr = a.afterDelete(r)
if httpErr != nil {
logger.Error("error executing after func", "error", httpErr)
render.Render(w, r, httpErr)
_ = render.Render(w, r, httpErr)
return
}

Expand Down

0 comments on commit 3b9d10c

Please sign in to comment.