add customDo function #192
Conversation
|
Warning Rate Limit Exceeded@Yamashou has exceeded the limit for the number of files or commits that can be reviewed per hour. Please wait 7 minutes and 6 seconds before requesting another review. How to resolve this issue?After the wait time has elapsed, a review can be triggered using the @coderabbitai review command. Alternatively, push new commits to this PR. We recommend that you space out your commits to avoid hitting the rate limit. How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per repository. WalkthroughThe recent changes in the Changes
Poem
TipsChat with CodeRabbit Bot (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Review Status
Actionable comments generated: 4
Configuration used: CodeRabbit UI
Files selected for processing (1)
- clientv2/client.go (6 hunks)
Additional comments: 2
clientv2/client.go (2)
8-8: The
errorspackage is imported to facilitate error handling. Ensure that it is used correctly throughout the code.55-60: A new field
CustomDoof typeRequestInterceptorFuncis added to theClientstruct. This field is used in thePostmethod to conditionally execute a custom function if it's set.
|
|
||
| f := ChainInterceptor(append([]RequestInterceptor{c.RequestInterceptor}, interceptors...)...) | ||
|
|
||
| // if custom do is set, use it instead of the default one | ||
| if c.CustomDo != nil { | ||
| return f(ctx, req, gqlInfo, respData, c.CustomDo) | ||
| } | ||
|
|
||
| return f(ctx, req, gqlInfo, respData, c.do) | ||
| } |
There was a problem hiding this comment.
The Post method is updated to conditionally use CustomDo if it's set. This provides flexibility to the client to use a custom function for handling requests.
+ // if custom do is set, use it instead of the default one
+ if c.CustomDo != nil {
+ return f(ctx, req, gqlInfo, respData, c.CustomDo)
+ }
+ return f(ctx, req, gqlInfo, respData, c.do)Commitable suggestion
[!IMPORTANT]
Carefully review the code before committing. Make sure it correctly replaces the highlighted code, has no missing lines and indentaion issues.
| f := ChainInterceptor(append([]RequestInterceptor{c.RequestInterceptor}, interceptors...)...) | |
| // if custom do is set, use it instead of the default one | |
| if c.CustomDo != nil { | |
| return f(ctx, req, gqlInfo, respData, c.CustomDo) | |
| } | |
| return f(ctx, req, gqlInfo, respData, c.do) | |
| } | |
| f := ChainInterceptor(append([]RequestInterceptor{c.RequestInterceptor}, interceptors...)...) | |
| // if custom do is set, use it instead of the default one | |
| if c.CustomDo != nil { | |
| return f(ctx, req, gqlInfo, respData, c.CustomDo) | |
| } | |
| return f(ctx, req, gqlInfo, respData, c.do) | |
| } |
clientv2/client.go
Outdated
| buffer *bytes.Buffer, formFields []FormField, files []MultipartFilesGroup, | ||
| ) (string, error) { | ||
| writer := multipart.NewWriter(buffer) | ||
| defer writer.Close() | ||
| defer func(writer *multipart.Writer) { | ||
| err := writer.Close() | ||
| if err != nil { | ||
| } | ||
| }(writer) |
There was a problem hiding this comment.
The prepareMultipartFormBody function now handles the error from writer.Close(). However, the error is not being used or returned. It's recommended to handle the error properly.
- if err != nil {
- }
+ if err != nil {
+ // handle or return the error
+ }Commitable suggestion
[!IMPORTANT]
Carefully review the code before committing. Make sure it correctly replaces the highlighted code, has no missing lines and indentaion issues.
| buffer *bytes.Buffer, formFields []FormField, files []MultipartFilesGroup, | |
| ) (string, error) { | |
| writer := multipart.NewWriter(buffer) | |
| defer writer.Close() | |
| defer func(writer *multipart.Writer) { | |
| err := writer.Close() | |
| if err != nil { | |
| } | |
| }(writer) | |
| buffer *bytes.Buffer, formFields []FormField, files []MultipartFilesGroup, | |
| ) (string, error) { | |
| writer := multipart.NewWriter(buffer) | |
| defer func(writer *multipart.Writer) { | |
| err := writer.Close() | |
| if err != nil { | |
| // handle or return the error | |
| } | |
| }(writer) |
clientv2/client.go
Outdated
| if err != nil { | ||
| return fmt.Errorf("request failed: %w", err) | ||
| } | ||
| defer resp.Body.Close() | ||
| defer func(Body io.ReadCloser) { | ||
| err := Body.Close() | ||
| if err != nil { | ||
| } | ||
| }(resp.Body) |
There was a problem hiding this comment.
The do method has been updated to handle errors from Body.Close(). However, the error is not being used or returned. It's recommended to handle the error properly.
- if err != nil {
- }
+ if err != nil {
+ // handle or return the error
+ }Commitable suggestion
[!IMPORTANT]
Carefully review the code before committing. Make sure it correctly replaces the highlighted code, has no missing lines and indentaion issues.
| if err != nil { | |
| return fmt.Errorf("request failed: %w", err) | |
| } | |
| defer resp.Body.Close() | |
| defer func(Body io.ReadCloser) { | |
| err := Body.Close() | |
| if err != nil { | |
| } | |
| }(resp.Body) | |
| if err != nil { | |
| return fmt.Errorf("request failed: %w", err) | |
| } | |
| defer func(Body io.ReadCloser) { | |
| err := Body.Close() | |
| if err != nil { | |
| // handle or return the error | |
| } | |
| }(resp.Body) |
clientv2/client.go
Outdated
| } | ||
| } | ||
|
|
||
| fmt.Println("body", string(body)) | ||
|
|
||
| // some servers return a graphql error with a non OK http code, try anyway to parse the body | ||
| if err := c.unmarshal(body, result); err != nil { | ||
| if gqlErr, ok := err.(*GqlErrorList); ok { | ||
| var gqlErr *GqlErrorList | ||
| if errors.As(err, &gqlErr) { | ||
| errResponse.GqlErrors = &gqlErr.Errors | ||
| } else if !isKOCode { // if is KO code there is already the http error, this error should not be returned | ||
| return err | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
The parseResponse method in the Client struct has been modified to handle errors using errors.As. This is a good practice as it allows for more specific error handling.
+ var gqlErr *GqlErrorList
+ if errors.As(err, &gqlErr) {
+ errResponse.GqlErrors = &gqlErr.Errors
+ }Commitable suggestion
[!IMPORTANT]
Carefully review the code before committing. Make sure it correctly replaces the highlighted code, has no missing lines and indentaion issues.
Your code snippet already contains the lines from the diff snippet. Therefore, no changes are needed. Here is your original code:
| } | |
| } | |
| fmt.Println("body", string(body)) | |
| // some servers return a graphql error with a non OK http code, try anyway to parse the body | |
| if err := c.unmarshal(body, result); err != nil { | |
| if gqlErr, ok := err.(*GqlErrorList); ok { | |
| var gqlErr *GqlErrorList | |
| if errors.As(err, &gqlErr) { | |
| errResponse.GqlErrors = &gqlErr.Errors | |
| } else if !isKOCode { // if is KO code there is already the http error, this error should not be returned | |
| return err | |
| } | |
| } | |
| } | |
| } | |
| fmt.Println("body", string(body)) | |
| // some servers return a graphql error with a non OK http code, try anyway to parse the body | |
| if err := c.unmarshal(body, result); err != nil { | |
| var gqlErr *GqlErrorList | |
| if errors.As(err, &gqlErr) { | |
| errResponse.GqlErrors = &gqlErr.Errors | |
| } | |
| } |
There was a problem hiding this comment.
Review Status
Actionable comments generated: 2
Configuration used: CodeRabbit UI
Files selected for processing (1)
- clientv2/client.go (6 hunks)
Additional comments: 4
clientv2/client.go (4)
8-11: The addition of "errors" and "log" packages is a good practice for error handling and logging.
56-61: The addition of the
CustomDofield to theClientstruct allows for custom request handling. Ensure that this field is properly initialized and used throughout the codebase.205-214: The
Postmethod is updated to conditionally useCustomDoif it's set. This provides flexibility to the client to use a custom function for handling requests.350-358: The
parseResponsemethod has been updated to handle errors usingerrors.As. This is a good practice as it allows for type assertion of errors.
clientv2/client.go
Outdated
| buffer *bytes.Buffer, formFields []FormField, files []MultipartFilesGroup, | ||
| ) (string, error) { | ||
| writer := multipart.NewWriter(buffer) | ||
| defer writer.Close() | ||
| defer func(writer *multipart.Writer) { | ||
| err := writer.Close() | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| }(writer) |
There was a problem hiding this comment.
The error from writer.Close() is now being handled. However, using log.Fatal(err) will cause the program to terminate, which might not be the desired behavior. Consider returning the error instead.
- log.Fatal(err)
+ return errCommitable suggestion
[!IMPORTANT]
Carefully review the code before committing. Make sure it correctly replaces the highlighted code, has no missing lines and indentaion issues.
| buffer *bytes.Buffer, formFields []FormField, files []MultipartFilesGroup, | |
| ) (string, error) { | |
| writer := multipart.NewWriter(buffer) | |
| defer writer.Close() | |
| defer func(writer *multipart.Writer) { | |
| err := writer.Close() | |
| if err != nil { | |
| log.Fatal(err) | |
| } | |
| }(writer) | |
| buffer *bytes.Buffer, formFields []FormField, files []MultipartFilesGroup, | |
| ) (string, error) { | |
| writer := multipart.NewWriter(buffer) | |
| defer func(writer *multipart.Writer) { | |
| err := writer.Close() | |
| if err != nil { | |
| return err | |
| } | |
| }(writer) |
clientv2/client.go
Outdated
| if err != nil { | ||
| return fmt.Errorf("request failed: %w", err) | ||
| } | ||
| defer resp.Body.Close() | ||
| defer func(Body io.ReadCloser) { | ||
| err := Body.Close() | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| }(resp.Body) |
There was a problem hiding this comment.
The error from Body.Close() is now being handled. However, using log.Fatal(err) will cause the program to terminate, which might not be the desired behavior. Consider returning the error instead.
- log.Fatal(err)
+ return errCommitable suggestion
[!IMPORTANT]
Carefully review the code before committing. Make sure it correctly replaces the highlighted code, has no missing lines and indentaion issues.
| if err != nil { | |
| return fmt.Errorf("request failed: %w", err) | |
| } | |
| defer resp.Body.Close() | |
| defer func(Body io.ReadCloser) { | |
| err := Body.Close() | |
| if err != nil { | |
| log.Fatal(err) | |
| } | |
| }(resp.Body) | |
| if err != nil { | |
| return fmt.Errorf("request failed: %w", err) | |
| } | |
| defer func(Body io.ReadCloser) error { | |
| err := Body.Close() | |
| if err != nil { | |
| return err | |
| } | |
| return nil | |
| }(resp.Body) |
Summary by CodeRabbit