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.

Sign up for GitHub

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

Jump to bottom

Google: Add Support for Multiple Admin Emails to Retrieve Group Lists #2911

Merged
merged 2 commits into from
Jun 7, 2023
Merged

Google: Add Support for Multiple Admin Emails to Retrieve Group Lists #2911

merged 2 commits into from
Jun 7, 2023

Conversation

vsychov
Copy link
Contributor

@vsychov vsychov commented Apr 23, 2023

Hello,

This pull request resolves issue #2895.

The old-style adminEmail configuration is still functional, but it will now log a deprecation message.
The new-style configuration is illustrated in the example below:

domainToAdminEmail:
    '*': 'admin@example.com',
    'example1.com': 'admin@example1.com'
    'example2.com': 'sysadm@example2.com'

I will make changes to https://github.com/dexidp/website/blob/main/content/docs/connectors/google.md if you decide to merge this pull request.

@vsychov vsychov mentioned this pull request Apr 23, 2023
Closed
2 tasks
@vsychov
dexidp#2895: Add Support for Multiple Admin Emails to Retrieve Group …
27d7eb5 
…Lists from Different Google Workspaces

Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
@vsychov
Copy link
Contributor Author

vsychov commented May 20, 2023

Hello @JoelSpeed, @nabokihms, @sagikazarmark, @bonifaido, @rithujohn191, @justaugustus, can you please review this PR?

nabokihms
nabokihms reviewed May 23, 2023
View reviewed changes
Copy link
Member

@nabokihms nabokihms left a comment

Choose a reason for hiding this comment

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

@vsychov Thanks for the PR. The code looks good to me. I'd like to ask Márk for additional review because he is the last person involved with Google connector.

connector/google/google.go Outdated Show resolved Hide resolved
connector/google/google.go Outdated Show resolved Hide resolved
connector/google/google.go Outdated Show resolved Hide resolved
connector/google/google.go Outdated Show resolved Hide resolved
connector/google/google.go Show resolved Hide resolved
vsychov added a commit to vsychov/dex that referenced this pull request May 24, 2023
@vsychov
dexidp#2911: adjust code after code review, add more test coverage
e0e8d16 
Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
@vsychov
dexidp#2911: adjust code after code review, add more test coverage
3f5e6c7 
Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
@vsychov
Copy link
Contributor Author

vsychov commented May 24, 2023

@nabokihms, all you comments resolved.

@vsychov vsychov requested a review from nabokihms June 3, 2023 21:06
@vsychov
Copy link
Contributor Author

vsychov commented Jun 3, 2023

Hello @nabokihms, would it be possible to merge this at your earliest convenience?

@nabokihms
Copy link
Member

Looks good to me.

@nabokihms nabokihms merged commit 6cd5c8b into dexidp:master Jun 7, 2023
9 of 10 checks passed
@nabokihms nabokihms changed the title #2895: Add Support for Multiple Admin Emails to Retrieve Group Lists Add Support for Multiple Admin Emails to Retrieve Group Lists Jun 7, 2023
@nabokihms nabokihms changed the title Add Support for Multiple Admin Emails to Retrieve Group Lists Google: Add Support for Multiple Admin Emails to Retrieve Group Lists Jun 7, 2023
@vsychov vsychov mentioned this pull request Jun 8, 2023
Merged
vsychov added a commit to vsychov/website that referenced this pull request Jun 8, 2023
@vsychov
adjust documentation according to pr's dexidp/dex#2989 and dexidp/dex…
580fc6b 
…#2911

Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
xtremerui pushed a commit to concourse/dex that referenced this pull request Jun 30, 2023
upstream dex release: v2.37.0
8337b8f 
The official container image for this release can be pulled from
```
ghcr.io/dexidp/dex:v2.37.0
```
<!-- Release notes generated using configuration in .github/release.yml at v2.37.x -->

## What's Changed
### Exciting New Features 🎉
* TLS cert reloader by @seankhliao in dexidp#2964
### Enhancements 🚀
* Add xx to cross-compile binaries in Docker by @sagikazarmark in dexidp#2898
* Spelling by @jsoref in dexidp#2919
* LDAP case-insensitive DN attribute by @nabokihms in dexidp#2829
* Utilize native git diff --exit-code by @marcofranssen in dexidp#2981
* Google: Add Support for Multiple Admin Emails to Retrieve Group Lists by @vsychov in dexidp#2911
### Bug Fixes 🐛
* Do not skip approval screen by default by @nabokihms in dexidp#2897
* Fail if OIDC config contains hosted domains by @nabokihms in dexidp#2937
### Dependency Updates ⬆️
* build(deps): bump alpine from 3.17.2 to 3.17.3 by @dependabot in dexidp#2879
* build(deps): bump mheap/github-action-required-labels from 3 to 4 by @dependabot in dexidp#2881
* build(deps): bump google.golang.org/grpc from 1.53.0 to 1.54.0 by @dependabot in dexidp#2873
* build(deps): bump golang.org/x/oauth2 from 0.6.0 to 0.7.0 by @dependabot in dexidp#2892
* build(deps): bump golang from 1.20.2-alpine3.16 to 1.20.3-alpine3.16 by @dependabot in dexidp#2884
* build(deps): bump github.com/spf13/cobra from 1.6.1 to 1.7.0 by @dependabot in dexidp#2885
* build(deps): bump aquasecurity/trivy-action from 0.9.2 to 0.10.0 by @dependabot in dexidp#2905
* build(deps): bump github.com/prometheus/client_golang from 1.14.0 to 1.15.0 by @dependabot in dexidp#2900
* build(deps): bump golang.org/x/crypto from 0.7.0 to 0.8.0 by @dependabot in dexidp#2891
* build(deps): bump github.com/russellhaering/goxmldsig from 1.3.0 to 1.4.0 by @dependabot in dexidp#2920
* build(deps): bump golang from 1.20.3-alpine3.16 to 1.20.4-alpine3.16 by @dependabot in dexidp#2924
* build(deps): bump github.com/lib/pq from 1.10.7 to 1.10.9 by @dependabot in dexidp#2922
* build(deps): bump golang.org/x/oauth2 from 0.7.0 to 0.8.0 by @dependabot in dexidp#2929
* build(deps): bump google.golang.org/grpc from 1.54.0 to 1.55.0 by @dependabot in dexidp#2932
* build(deps): bump go.etcd.io/etcd/client/pkg/v3 from 3.5.7 to 3.5.8 by @dependabot in dexidp#2899
* build(deps): bump github.com/beevik/etree from 1.1.0 to 1.1.4 by @dependabot in dexidp#2939
* build(deps): bump github.com/go-sql-driver/mysql from 1.7.0 to 1.7.1 by @dependabot in dexidp#2938
* build(deps): bump go.etcd.io/etcd/client/pkg/v3 from 3.5.8 to 3.5.9 by @dependabot in dexidp#2946
* build(deps): bump github/codeql-action from 2.3.1 to 2.3.3 by @dependabot in dexidp#2943
* build(deps): bump anchore/sbom-action from 0.14.1 to 0.14.2 by @dependabot in dexidp#2942
* build(deps): bump alpine from 3.17.3 to 3.18.0 by @dependabot in dexidp#2930
* build(deps): bump google.golang.org/grpc from 1.53.0 to 1.55.0 in /api/v2 by @dependabot in dexidp#2927
* build(deps): bump google.golang.org/api from 0.114.0 to 0.122.0 by @dependabot in dexidp#2931
* build(deps): bump entgo.io/ent from 0.11.10 to 0.12.3 by @dependabot in dexidp#2923
* build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.7 to 3.5.9 by @dependabot in dexidp#2944
* build(deps): bump github.com/prometheus/client_golang from 1.15.0 to 1.15.1 by @dependabot in dexidp#2945
* build(deps): bump helm/kind-action from 1.5.0 to 1.7.0 by @dependabot in dexidp#2956
* build(deps): bump github.com/sirupsen/logrus from 1.9.0 to 1.9.2 by @dependabot in dexidp#2957
* build(deps): bump actions/setup-go from 4.0.0 to 4.0.1 by @dependabot in dexidp#2949
* build(deps): bump golang.org/x/crypto from 0.8.0 to 0.9.0 by @dependabot in dexidp#2948
* build(deps): bump google.golang.org/api from 0.122.0 to 0.123.0 by @dependabot in dexidp#2959
* build(deps): bump github.com/beevik/etree from 1.1.4 to 1.2.0 by @dependabot in dexidp#2947
* build(deps): bump github/codeql-action from 2.3.3 to 2.3.5 by @dependabot in dexidp#2970
* build(deps): bump google.golang.org/api from 0.123.0 to 0.124.0 by @dependabot in dexidp#2968
* build(deps): bump github.com/stretchr/testify from 1.8.2 to 1.8.3 by @dependabot in dexidp#2958
* build(deps): bump aquasecurity/trivy-action from 0.10.0 to 0.11.0 by @dependabot in dexidp#2984
* build(deps): bump github/codeql-action from 2.3.5 to 2.3.6 by @dependabot in dexidp#2982
* build(deps): bump actions/dependency-review-action from 3.0.4 to 3.0.6 by @dependabot in dexidp#2978
* build(deps): bump github.com/sirupsen/logrus from 1.9.2 to 1.9.3 by @dependabot in dexidp#2983
* build(deps): bump github.com/mattn/go-sqlite3 from 1.14.16 to 1.14.17 by @dependabot in dexidp#2979
* build(deps): bump google.golang.org/api from 0.124.0 to 0.125.0 by @dependabot in dexidp#2976
* build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4 by @dependabot in dexidp#2977
* build(deps): bump docker/login-action from 2.1.0 to 2.2.0 by @dependabot in dexidp#2987
* build(deps): bump docker/setup-qemu-action from 2.1.0 to 2.2.0 by @dependabot in dexidp#2985
* build(deps): bump docker/metadata-action from 4.4.0 to 4.5.0 by @dependabot in dexidp#2986
* build(deps): bump docker/setup-buildx-action from 2.5.0 to 2.6.0 by @dependabot in dexidp#2988
* build(deps): bump mheap/github-action-required-labels from 4 to 5 by @dependabot in dexidp#2990
* build(deps): bump aquasecurity/trivy-action from 0.11.0 to 0.11.2 by @dependabot in dexidp#2995
* build(deps): bump github/codeql-action from 2.3.6 to 2.20.0 by @dependabot in dexidp#3002
* build(deps): bump google.golang.org/api from 0.125.0 to 0.127.0 by @dependabot in dexidp#2999
* build(deps): bump docker/setup-buildx-action from 2.6.0 to 2.7.0 by @dependabot in dexidp#3001
* build(deps): bump docker/build-push-action from 4.0.0 to 4.1.1 by @dependabot in dexidp#3003
* build(deps): bump actions/checkout from 3.5.2 to 3.5.3 by @dependabot in dexidp#2993
* build(deps): bump github.com/go-ldap/ldap/v3 from 3.4.4 to 3.4.5 by @dependabot in dexidp#2997
* build(deps): bump golang.org/x/net from 0.10.0 to 0.11.0 by @dependabot in dexidp#3004
* build(deps): bump alpine from 3.18.0 to 3.18.2 by @dependabot in dexidp#3008
* build(deps): bump docker/metadata-action from 4.5.0 to 4.6.0 by @dependabot in dexidp#3007
* build(deps): bump golang.org/x/oauth2 from 0.8.0 to 0.9.0 by @dependabot in dexidp#3005
* build(deps): bump google.golang.org/grpc from 1.55.0 to 1.56.0 by @dependabot in dexidp#3009
* build(deps): bump github.com/prometheus/client_golang from 1.15.1 to 1.16.0 by @dependabot in dexidp#3010
* build(deps): bump google.golang.org/grpc from 1.56.0 to 1.56.1 by @dependabot in dexidp#3016
* build(deps): bump github/codeql-action from 2.20.0 to 2.20.1 by @dependabot in dexidp#3015
* build(deps): bump anchore/sbom-action from 0.14.2 to 0.14.3 by @dependabot in dexidp#3014
* build(deps): bump ossf/scorecard-action from 2.1.3 to 2.2.0 by @dependabot in dexidp#3019
* build(deps): bump google.golang.org/api from 0.127.0 to 0.129.0 by @dependabot in dexidp#3022
* build(deps): bump docker/setup-buildx-action from 2.7.0 to 2.8.0 by @dependabot in dexidp#3023

## New Contributors
* @marcofranssen made their first contribution in dexidp#2981
* @vsychov made their first contribution in dexidp#2911

**Full Changelog**: dexidp/dex@v2.36.0...v2.37.0
This was referenced Jul 2, 2023
Merged
Merged
Merged
Merged
palexster pushed a commit to palexster/dex that referenced this pull request Oct 4, 2023
@vsychov
dexidp#2895: Add Support for Multiple Admin Emails to Retrieve Group …
48b298c 
…Lists (dexidp#2911)

Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
michaelliau pushed a commit to FlockFreight/dex that referenced this pull request Oct 4, 2023
@vsychov @michaelliau
dexidp#2895: Add Support for Multiple Admin Emails to Retrieve Group …
cfeaa64 
…Lists (dexidp#2911)

Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
@hawkesn hawkesn mentioned this pull request Nov 20, 2023
Closed
nabokihms added a commit to dexidp/website that referenced this pull request Jan 10, 2024
@vsychov @nabokihms
adjust documentation according to pr's dexidp/dex#2989 and dexidp/dex…
e770b53 
…#2911 (#138)

Signed-off-by: Viacheslav Sychov <viacheslav.sychov@gmail.com>
Signed-off-by: Maksim Nabokikh <maksim.nabokikh@flant.com>
Co-authored-by: Maksim Nabokikh <maksim.nabokikh@flant.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nabokihms nabokihms nabokihms approved these changes

@sagikazarmark sagikazarmark Awaiting requested review from sagikazarmark

Assignees
No one assigned
Labels
kind/enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vsychov @nabokihms