Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

client: remaining errors.Is conversions #18614

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

redwrasse
Copy link
Contributor

PR for rest of errors.Is conversions for the client modules, as part of #18576

@k8s-ci-robot
Copy link

Hi @redwrasse. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@codecov-commenter
Copy link

codecov-commenter commented Sep 20, 2024

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 75.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 68.80%. Comparing base (112e6a3) to head (60fe020).

Current head 60fe020 differs from pull request most recent head ecc2c5e

Please upload reports for the commit ecc2c5e to get more accurate results.

Files with missing lines Patch % Lines
client/v3/client.go 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
Files with missing lines Coverage Δ
client/v3/retry_interceptor.go 65.61% <100.00%> (ø)
client/v3/client.go 84.89% <0.00%> (ø)

... and 15 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #18614      +/-   ##
==========================================
+ Coverage   68.77%   68.80%   +0.03%     
==========================================
  Files         420      420              
  Lines       35522    35522              
==========================================
+ Hits        24431    24442      +11     
+ Misses       9663     9659       -4     
+ Partials     1428     1421       -7     

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 112e6a3...ecc2c5e. Read the comment docs.

@ivanvc
Copy link
Member

ivanvc commented Sep 20, 2024

/ok-to-test

@ivanvc
Copy link
Member

ivanvc commented Sep 20, 2024

Thanks for the pull request, @redwrasse. I think we may be missing the following ones:

  • client/v3/retry_interceptor.go:257
  • client/pkg/fileutil/preallocate_darwin.go:43
  • client/v3/client.go:223
  • client/internal/v2/client_test.go:441
  • client/internal/v2/client_test.go:747

@redwrasse
Copy link
Contributor Author

Thanks @ivanvc, let me try to fix those...

@redwrasse
Copy link
Contributor Author

@ivanvc I've updated the PR according to your list #18614 (comment),
with a few slight differences:

Updated as in your list with errors.Is:

  • client/v3/retry_interceptor.go:257
  • client/pkg/fileutil/preallocate_darwin.go:43
  • client/v3/client.go:223

client/internal/v2/client_test.go:441 and client/internal/v2/client_test.go:747 I did not update because of the way those lines are structured. First check is against a nil error, second check is checking explicit error string equality given the variety of tt.wantErr in the testcases, so errors.Is doesn't appear to make sense here to me. Let me know if you think otherwise/should approach differently:

if (tt.wantErr == nil && tt.wantErr != err) || (tt.wantErr != nil && tt.wantErr.Error() != err.Error()) {
...
}

Found a couple more lines to fix:

  • additional client/v3/retry_interceptor.go:149
  • additional client/v3/retry_interceptor.go:156

And finally updated the example code in the README client/internal/v2/README.md to use errors.Is and errors.As.

@redwrasse redwrasse force-pushed the redwrasse/client/rest-of-errors-is branch from 3f91d3b to ecc2c5e Compare September 23, 2024 00:43
Copy link
Member

@ivanvc ivanvc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks, @redwrasse. Feel free to undraft whenever you're ready.

@redwrasse redwrasse marked this pull request as ready for review September 23, 2024 04:51
@redwrasse
Copy link
Contributor Author

Marked ready for review again, thanks for your patience.

Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - Thanks @redwrasse

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, ivanvc, jmhbnz, redwrasse

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jmhbnz jmhbnz merged commit 1a08fb2 into etcd-io:main Sep 25, 2024
43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

6 participants