Refactoring + error handling fixes #159
Merged
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
… on 2xx responses.
…= nil` are unreachable code.
jmigueprieto
commented
Nov 5, 2024
| err = decode(&localVarReturnValue, localVarBody, localVarHttpResponse.Header.Get("Content-Type")) | ||
| if err == nil { | ||
| return localVarReturnValue, localVarHttpResponse, err | ||
| } | ||
| } | ||
| if localVarHttpResponse.StatusCode >= 300 { | ||
| newErr := fmt.Errorf(string(localVarBody)) | ||
| if localVarHttpResponse.StatusCode == 200 { |
jmigueprieto
commented
Nov 6, 2024
| assert.Fail(t, "err is not of type GenericSwaggerError") | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Added some tests to check executor error responses
jmigueprieto
commented
Nov 6, 2024
| @@ -426,7 +427,10 @@ func (e *WorkflowExecutor) UpdateTask(taskId string, workflowInstanceId string, | |||
| return err | |||
| } | |||
| taskResult.Status = status | |||
| e.taskClient.UpdateTask(context.Background(), taskResult) | |||
| _, _, err = e.taskClient.UpdateTask(context.Background(), taskResult) | |||
| if err != nil { | |||
There was a problem hiding this comment.
executor.UpdateTask was not handling errors properly
jmigueprieto
commented
Nov 6, 2024
| context.Background(), | ||
| overwrite, | ||
| *workflow, | ||
| ) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if response.StatusCode > 299 { |
There was a problem hiding this comment.
These checks after
if err != nil {
return err
}
don't make sense. err is going to be not nil and this line won't be reached.
jmigueprieto
force-pushed
the
fix/improve-error-handling
branch
from
1c79d79 to
e25db64
Compare
jmigueprieto
commented
Nov 6, 2024
| if err != nil { | ||
| return err | ||
| } | ||
| if response.StatusCode != 200 { |
There was a problem hiding this comment.
unreachable code
jmigueprieto
commented
Nov 6, 2024
| ) | ||
|
|
||
| type UserClient interface { | ||
| CheckPermissions(ctx context.Context, userId string, type_ string, id string) (map[string]interface{}, *http.Response, error) | ||
| DeleteUser(ctx context.Context, id string) (*http.Response, error) | ||
| GetGrantedPermissions(ctx context.Context, userId string) ([]rbac.GrantedAccess, *http.Response, error) | ||
| GetGrantedPermissions(ctx context.Context, userId string) (rbac.GrantedAccessResponse, *http.Response, error) |
There was a problem hiding this comment.
The return type was wrong. Because of buggy error handling this was not caught by the tests before
jmigueprieto
commented
Nov 6, 2024
| @@ -33,7 +33,7 @@ func TestDeleteEnvVariable(t *testing.T) { | |||
| message, resp, err := envClient.DeleteEnvVariable(ctx, "testKey") | |||
| assert.NoError(t, err) | |||
| assert.NotNil(t, resp) | |||
| assert.Equal(t, "", message) | |||
| assert.Equal(t, "test value", message) | |||
There was a problem hiding this comment.
"test value" should have been the expected value of the test.
But, the backend is returning the environment variable value when deleting as string but the content-type is application/json
jmigueprieto
changed the title
…g after code handling changes.
jmigueprieto
force-pushed
the
fix/improve-error-handling
branch
from
7bf109d to
365e1a6
Compare
c4lm
approved these changes
Nov 6, 2024
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.
Follow up of #157
Changes in this PR
UserClient.GetGrantedPermissions()implementation.For more details take a look at the comments.
TODO: More testing (in a next PR)