Skip to content

fix: Fix problematic error returns #29883

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

Merged
merged 1 commit into from
Apr 1, 2025
Merged

Conversation

cuishuang
Copy link
Contributor

@cuishuang cuishuang commented Mar 9, 2025

Description

Because err has been judged before, err here must be nil.

According to the context logic, it should be intErr

For #29936

TODO only if you're a HashiCorp employee

  • Backport Labels: If this fix needs to be backported, use the appropriate backport/ label that matches the desired release branch. Note that in the CE repo, the latest release branch will look like backport/x.x.x, but older release branches will be backport/ent/x.x.x+ent.
    • LTS: If this fixes a critical security vulnerability or severity 1 bug, it will also need to be backported to the current LTS versions of Vault. To ensure this, use all available enterprise labels.
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@cuishuang cuishuang requested review from a team as code owners March 9, 2025 05:29
@cuishuang cuishuang requested a review from mercedesbh March 9, 2025 05:29
@heatherezell
Copy link
Contributor

Hello! Could you provide some context around this change? Is there an open issue tracking a discussion of this? Thanks!

Signed-off-by: cuishuang <imcusg@gmail.com>
@cuishuang
Copy link
Contributor Author

Hello! Could you provide some context around this change? Is there an open issue tracking a discussion of this? Thanks!

Thanks for your reply.

Oh, I resubmitted the code with only one change. I believe the issue this change addresses is evident. The same situation can be seen in several other places in the code, such as vault/builtin/credential/userpass/path_users.go#231 and vault/builtin/logical/consul/path_config.go:101.

Do I still need to create an issue?

@heatherezell
Copy link
Contributor

I would appreciate it if you would, and link to this PR, for further context. What may be evident to one person may not be as clear to another. :)
Thanks!!

@cuishuang
Copy link
Contributor Author

I would appreciate it if you would, and link to this PR, for further context. What may be evident to one person may not be as clear to another. :) Thanks!!

Thank you for your suggestion; I have added the issue. Please review it again.

@cuishuang
Copy link
Contributor Author

I would appreciate it if you would, and link to this PR, for further context. What may be evident to one person may not be as clear to another. :) Thanks!!

Friendly ping

Copy link
Contributor

@VioletHynes VioletHynes left a comment

Choose a reason for hiding this comment

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

Thanks! This looks good. Great catch!

@VioletHynes VioletHynes merged commit 31f8c8c into hashicorp:main Apr 1, 2025
67 of 69 checks passed
hellobontempo pushed a commit that referenced this pull request May 21, 2025
Signed-off-by: cuishuang <imcusg@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants