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

Backport of sdk/ldap: update interface to use DialURL into release/1.11.x #20210

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #20200 to be assessed for backporting due to the inclusion of the label backport/1.11.x.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


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.DialURL function instead of the deprecated ldap.Dial and ldap.DialTLS functions.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/ldap-dialurl/secretly-fancy-gannet branch 2 times, most recently from 5980aba to 940a60f Compare April 17, 2023 20:34
@hashicorp-cla
Copy link

hashicorp-cla commented Apr 17, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • jasonodonnell
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

* sdk/ldap: update interface to use DialURL

* Fix scheme

* Fix race condition

* Add tls config dialopt
@jasonodonnell jasonodonnell marked this pull request as ready for review April 17, 2023 20:50
@jasonodonnell jasonodonnell deleted the backport/ldap-dialurl/secretly-fancy-gannet branch April 17, 2023 20:51
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