runservice: return right error on not existing run #451
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@alessandro-sorint Instead of doing a fix by just adding a missing return lets convert it to a style that avoid such errors using a new function instead of putting all the logic in ServeHTTP. See for example 1e5cb9e where we use a |
alessandro-sorint
force-pushed
the
fix-apirunbygroup
branch
from
780ba5a to
2effc50
Compare
@sgotti I added a do function |
sgotti
requested changes
Oct 20, 2023
| } | ||
|
|
||
| cgts, err := types.MarshalChangeGroupsUpdateToken(cgt) | ||
| if err != nil { | ||
| http.Error(w, err.Error(), http.StatusInternalServerError) | ||
| return | ||
| return nil, util.NewAPIError(util.ErrInternal, err) |
| @@ -540,22 +550,19 @@ func (h *RunByGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | |||
| }) | |||
| if err != nil { | |||
| h.log.Err(err).Send() | |||
| http.Error(w, err.Error(), http.StatusInternalServerError) | |||
| return | |||
| return nil, util.NewAPIError(util.ErrInternal, err) | |||
There was a problem hiding this comment.
Just return errors.WithStack(err). No need to explicitly define an ErrInternal. Every error not of type APIError is considered by http util an internal error. See the other APIs.
| @@ -540,22 +550,19 @@ func (h *RunByGroupHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | |||
| }) | |||
| if err != nil { | |||
| h.log.Err(err).Send() | |||
tests/setup_test.go
Outdated
| @@ -5780,6 +5780,39 @@ func TestGetProjectRuns(t *testing.T) { | |||
| } | |||
| }) | |||
| } | |||
|
|
|||
| t.Run("test get run not exists", func(t *testing.T) { | |||
alessandro-sorint
force-pushed
the
fix-apirunbygroup
branch
from
2effc50 to
753b471
Compare
A missing return after nil run check caused the return of a wrong error. Fix this by moving the logic to a dedicated function instead of doing everything in ServeHTTP.
alessandro-sorint
force-pushed
the
fix-apirunbygroup
branch
from
753b471 to
ca84e0c
Compare
alessandro-sorint
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A missing return after nil run check caused the return of a wrong error.
Fix this by moving the logic to a dedicated function instead of doing everything in ServeHTTP.