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

Match our Fork with go-ldap/ldap #4

Merged
merged 8 commits into from
Nov 25, 2019
Merged

Match our Fork with go-ldap/ldap #4

merged 8 commits into from
Nov 25, 2019

Conversation

hahmadia
Copy link

We should update our fork since https://mattermost.atlassian.net/browse/MM-19422 requires using a new version of a package ldap is using (asn1-ber) and without merging in the changes from go-ldap/ldap, it doesn't reference the correct module and updating will be difficult.

regeda and others added 8 commits October 22, 2019 10:33
* unified request flow && external binding to LDAP

* fix debug mode

* go.mod was added
* Rename asn1.ber dependency.

* go mod tidy

* Update travic CI to new asn1 ber

* Update travis go_import_path
I believe that this (plus a new tag) is what is necessary for native go modules support -- right now go modules complains that the version tag is >= v2 but the module doesn't claim to be a version >= v2.
…go-ldap#247)

* Moved v3 to subfolder to allow for versioning >2 with go modules. Reverted top level go.mod to fix backward compatibility

* Updated readme to include directions on Go Modules, including the rationale
@hanzei
Copy link

hanzei commented Nov 25, 2019

@hahmadia is this ready for review?

@hahmadia
Copy link
Author

hahmadia commented Nov 25, 2019

@hahmadia is this ready for review?

This won't need a review. I spoke with @mkraft and he told me this can be merged in. We are simply updating our fork to match that of go-ldap/go.

@hahmadia hahmadia merged commit ef4da40 into mattermost:master Nov 25, 2019
@hahmadia hahmadia deleted the MatchGoLdapMaster branch November 25, 2019 20:11
@hahmadia hahmadia restored the MatchGoLdapMaster branch November 25, 2019 20:13
hahmadia added a commit that referenced this pull request Nov 25, 2019
@hahmadia hahmadia deleted the MatchGoLdapMaster branch November 25, 2019 20:41
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.

8 participants