sdk/ldap: update interface to use DialURL #20200
Merged
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
fairclothjm
reviewed
Apr 17, 2023
sdk/helper/ldaputil/ldap.go
Outdated
| @@ -16,16 +14,11 @@ func NewLDAP() LDAP { | |||
| // LDAP provides ldap functionality, but through an interface | |||
| // rather than statically. This allows faking it for tests. | |||
| type LDAP interface { | |||
| Dial(network, addr string) (Connection, error) | |||
| DialTLS(network, addr string, config *tls.Config) (Connection, error) | |||
| Dial(addr string, opts ...ldap.DialOpt) (Connection, error) | |||
There was a problem hiding this comment.
I believe this change will have consequences for both vault-plugin-secrets-openldap and vault-plugin-secrets-ad. I think that is ok though? From what I can see these are only used in tests and it should be easy enough to update the tests if/when we update the sdk/ldaputil dependency.
There was a problem hiding this comment.
It will, the mocks need updating.
fairclothjm
approved these changes
Apr 17, 2023
raymonstah
reviewed
Apr 17, 2023
The tests use the client DialLDAP method, so they shouldn't need updating. |
raymonstah
reviewed
Apr 17, 2023
raymonstah
approved these changes
Apr 17, 2023
jasonodonnell
added a commit
that referenced
this pull request
Apr 17, 2023
* sdk/ldap: update interface to use DialURL * Fix scheme * Fix race condition * Add tls config dialopt
jasonodonnell
added a commit
that referenced
this pull request
Apr 17, 2023
* sdk/ldap: update interface to use DialURL * Fix scheme * Fix race condition * Add tls config dialopt
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.
I recently merged #20144 which adds connection timeout configuration, however, this was causing race tests to fail since it was changing a package variable. To fix this, I've changed the LDAP interface to use the suggested
ldap.DialURLfunction instead of the deprecatedldap.Dialandldap.DialTLSfunctions.