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

Augmented AD ldap sync #5086

Merged
merged 3 commits into from
Oct 13, 2015
Merged

Augmented AD ldap sync #5086

merged 3 commits into from
Oct 13, 2015

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Oct 12, 2015

Adds support for the augmented AD with first-class users, first-class groups, membership on the users, metadata on the groups.

@stevekuznetsov

@deads2k deads2k force-pushed the enhanced-ad branch 3 times, most recently from 84b6339 to 871a5a7 Compare October 12, 2015 19:11
@deads2k deads2k changed the title [WIP] Augmented AD ldap sync Augmented AD ldap sync Oct 12, 2015
@deads2k
Copy link
Contributor Author

deads2k commented Oct 12, 2015

Tests added. This is ready for review.

@stevekuznetsov stevekuznetsov mentioned this pull request Oct 12, 2015
27 tasks
ClientConfig *ldaputil.LDAPClientConfig
Config *api.AugmentedActiveDirectoryConfig

enhancedADLDAPInterface *ad.EnhancedADLDAPInterface
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enhanced or augmented?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

enhanced or augmented?

augmented

@stevekuznetsov
Copy link
Contributor

Looks reasonable

@@ -63,7 +63,7 @@ func (s *LDAPGroupSyncer) Sync() ([]*userapi.Group, []error) {
// get membership data
memberEntries, err := s.GroupMemberExtractor.ExtractMembers(ldapGroupUID)
if err != nil {
fmt.Fprintf(s.Err, "Error determining LDAP group membership for %q: %v. Continuing with the next LDAP group.", ldapGroupUID, err)
fmt.Fprintf(s.Err, "Error determining LDAP group membership for %q: %v. Continuing with the next LDAP group.\n", ldapGroupUID, err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kill ". Continuing with the next LDAP group." globally, I think... there may not be a next group... you'll see status on the next group when it prints

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kill ". Continuing with the next LDAP group." globally, I think... there may not be a next group... you'll see status on the next group when it prints

done.

@deads2k deads2k force-pushed the enhanced-ad branch 3 times, most recently from aa31a91 to 090e7bd Compare October 12, 2015 20:29
@deads2k
Copy link
Contributor Author

deads2k commented Oct 12, 2015

[test][extended:authentication]

@stevekuznetsov
Copy link
Contributor

LGTM now.

@liggitt
Copy link
Contributor

liggitt commented Oct 12, 2015

LGTM

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/5720/)

@deads2k
Copy link
Contributor Author

deads2k commented Oct 12, 2015

[merge]

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/3599/) (Image: devenv-fedora_2464)

@deads2k
Copy link
Contributor Author

deads2k commented Oct 13, 2015

infrastructure [merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 115cc5d

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 115cc5d

openshift-bot pushed a commit that referenced this pull request Oct 13, 2015
@openshift-bot openshift-bot merged commit b5b8277 into openshift:master Oct 13, 2015
@deads2k deads2k deleted the enhanced-ad branch November 5, 2015 15:04
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.

4 participants