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

directory.Group entry for groups #1118

Merged
merged 11 commits into from
Jul 22, 2020
Merged

directory.Group entry for groups #1118

merged 11 commits into from
Jul 22, 2020

Conversation

calebdoxsey
Copy link
Contributor

@calebdoxsey calebdoxsey commented Jul 20, 2020

Summary

This PR changes how we store groups. We will now store a separate directory.Group entry in the databroker and the directory.User groups field has been renamed to group_ids. On evaluation we then look up the corresponding directory.Group based on that ID.

I updated all the directory providers to return this information and updated the manager to sync it accordingly. Other changes:

  1. The Azure group name was displayName not name.
  2. Using field selection with Google resulted in a 400 error when I tested it locally, so I removed it and returned everything.

Related

(bdd edit)

Checklist:

  • add related issues
  • updated docs
  • updated unit tests
  • updated UPGRADING.md
  • ready for review

@calebdoxsey calebdoxsey requested a review from a team as a code owner July 20, 2020 22:09
@codeclimate
Copy link

codeclimate bot commented Jul 20, 2020

Code Climate has analyzed commit f99de4f and detected 2 issues on this pull request.

Here's the issue category breakdown:

Category Count
Complexity 2

View more on Code Climate.

internal/controlplane/luascripts/statik.go Outdated Show resolved Hide resolved
internal/frontend/assets/html/dashboard.go.html Outdated Show resolved Hide resolved
internal/directory/google/google.go Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jul 21, 2020

Codecov Report

Merging #1118 into master will decrease coverage by 0.7%.
The diff coverage is 35.9%.

@@           Coverage Diff            @@
##           master   #1118     +/-   ##
========================================
- Coverage    55.4%   54.6%   -0.8%     
========================================
  Files         100     100             
  Lines        7121    7251    +130     
========================================
+ Hits         3951    3966     +15     
- Misses       2865    2980    +115     
  Partials      305     305             
Impacted Files Coverage Δ
authorize/evaluator/evaluator.go 25.3% <0.0%> (-2.2%) ⬇️
internal/identity/manager/manager.go 0.0% <0.0%> (ø)
authenticate/handlers.go 68.9% <27.2%> (-1.5%) ⬇️
internal/directory/okta/okta.go 74.3% <77.7%> (+0.6%) ⬆️
internal/directory/onelogin/onelogin.go 71.1% <80.9%> (+0.5%) ⬆️
internal/directory/github/github.go 68.6% <81.8%> (+1.1%) ⬆️
internal/directory/gitlab/gitlab.go 71.1% <83.3%> (+0.8%) ⬆️
internal/directory/azure/azure.go 71.8% <84.2%> (+0.5%) ⬆️
internal/controlplane/xds_listeners.go 46.2% <0.0%> (+0.1%) ⬆️

@calebdoxsey calebdoxsey merged commit 1ad243d into master Jul 22, 2020
@calebdoxsey calebdoxsey deleted the cdoxsey/directory-groups branch July 22, 2020 17:28
@desimone desimone added this to the 0.10.0 milestone Aug 6, 2020
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.

2 participants