fix: report the real error when newSocketMount() fails #252
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
hessjcg
changed the title
enocom
reviewed
Jan 31, 2023
internal/proxy/proxy.go
Outdated
| @@ -406,8 +406,8 @@ func NewClient(ctx context.Context, d alloydb.Dialer, l alloydb.Logger, conf *Co | |||
| l.Errorf("failed to close mount: %v", mErr) | |||
| } | |||
| } | |||
| i, err := ShortInstURI(inst.Name) | |||
| if err != nil { | |||
| i, instUriErr := ShortInstURI(inst.Name) | |||
There was a problem hiding this comment.
Why this change? Isn't err enough here?
There was a problem hiding this comment.
The variable err is initially declared on line 401: m, err := newSocketMount(ctx, conf, pc, inst). Then if that err is not nil, we need to report why not.
On line 409, we are attempting to format the name of the instance that caused newSocketMount() to return an error. Redeclaring the variable err on line 409 hides err from line 401.
Then, on line 414, we are attempting to return an error from this function, including err in the message.
If we redeclare err on 409, then the statement on line 414 uses the err from line 409 instead of what we wanted: the error from line 401.
enocom
approved these changes
Jan 31, 2023
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.
Formatting the URI into an instance name when reporting an error should not hide the real error. Also,
avoid port conflict in root_test.go.