Don't require secret id in user if already given in jdbc url#17
Open
dmcgillen wants to merge 2 commits intoaws:masterfrom
Open
Don't require secret id in user if already given in jdbc url#17dmcgillen wants to merge 2 commits intoaws:masterfrom
dmcgillen wants to merge 2 commits intoaws:masterfrom
Conversation
dmcgillen
commented
Sep 5, 2019
| } | ||
| } else { | ||
| return getWrappedDriver().connect(unwrappedUrl, info); | ||
| } |
Author
There was a problem hiding this comment.
This is existing code that was previously after this if. It only applies if you are using a full jdbc url with the scheme, so I've moved it up here.
dmcgillen
commented
Sep 5, 2019
| String credentialsSecretId = info.getProperty("user"); | ||
| try { | ||
| return connectWithSecret(unwrappedUrl, info, credentialsSecretId); | ||
| return connectWithSecret(unwrappedUrl, info, url); |
Author
There was a problem hiding this comment.
And in the case a user is using a secret as the jdbc url, just use that value rather than looking in user.
Author
|
Let me know if any help is required or you'd like any changes to this PR. Cheers! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Issue #, if available:
Description of changes:
Currently, the jdbc url can be a secret id, which is great, as it saves having to duplicate all the connection details already stored in secrets manager to build a full jdbc url. User, however, is still required to be passed in, and is also required to be a secret id, so just duplicates the one passed in under jdbc url. This change means that if the jdbc url is a secret id, you do not need to pass the secret id in again as user.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.