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

Add google_service_account inline field option for Google Workspace/GSuite OIDC #5563

Merged
merged 38 commits into from
Mar 12, 2021
Merged

Add google_service_account inline field option for Google Workspace/GSuite OIDC #5563

merged 38 commits into from
Mar 12, 2021

Commits on Feb 12, 2021

  1. Add google_service_account field to OIDC for specifying google servic… 

    …e account json
    @stevenGravy
    stevenGravy committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    0689666 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    d696f2f View commit details
    Browse the repository at this point in the history

  3. corrected lint issues

    @stevenGravy
    stevenGravy committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    6b24cf1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'stevenGravy/sso/gsuite' of https://github.com/gravitati… 

    …onal/teleport into stevenGravy/sso/gsuite
    @stevenGravy
    stevenGravy committed Feb 12, 2021
    Configuration menu
    Copy the full SHA
    71a6dac View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 15, 2021
    Configuration menu
    Copy the full SHA
    59c37de View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. change comment 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    afe56ab View commit details
    Browse the repository at this point in the history

  2. spacing 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    4f23afd View commit details
    Browse the repository at this point in the history

  3. change comment for googleserviceaccount 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    b4f1194 View commit details
    Browse the repository at this point in the history

  4. correct comment 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    bd93792 View commit details
    Browse the repository at this point in the history

  5. modify comment on GetGoogleServiceAccount 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    7fd9216 View commit details
    Browse the repository at this point in the history

  6. add comment on loading google service account 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    0eda340 View commit details
    Browse the repository at this point in the history

  7. Moved comments to correct line and modified language

    @stevenGravy
    stevenGravy committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    fff0251 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'stevenGravy/sso/gsuite' of https://github.com/gravitati… 

    …onal/teleport into stevenGravy/sso/gsuite
    @stevenGravy
    stevenGravy committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    5a4912b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    4d074ed View commit details
    Browse the repository at this point in the history

  10. lint fix

    @stevenGravy
    stevenGravy committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    46f089f View commit details
    Browse the repository at this point in the history

  11. added credential loading method variable for better error reporting w… 

    …hen using google service account uri or inline.
    @stevenGravy
    stevenGravy committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    6db19d1 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'stevenGravy/sso/gsuite' of https://github.com/gravitati… 

    …onal/teleport into stevenGravy/sso/gsuite
    @stevenGravy
    stevenGravy committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    829f3dc View commit details
    Browse the repository at this point in the history

  13. modified debug message to use variable name while giving google works… 

    …pace context
    @stevenGravy
    stevenGravy committed Feb 16, 2021
    Configuration menu
    Copy the full SHA
    5bced25 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2021

  1. take out unnecessary if check 

    Co-authored-by: Andrew Lytvynov <andrew@goteleport.com>
    @stevenGravy
    stevenGravy and Andrew Lytvynov committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    5bc53c2 View commit details
    Browse the repository at this point in the history

  2. better error message handling 

    Co-authored-by: Andrew Lytvynov <andrew@goteleport.com>
    @stevenGravy
    stevenGravy and Andrew Lytvynov committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    fe84366 View commit details
    Browse the repository at this point in the history

  3. config assignment 

    Co-authored-by: Andrew Lytvynov <andrew@goteleport.com>
    @stevenGravy
    stevenGravy and Andrew Lytvynov committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    8ff3630 View commit details
    Browse the repository at this point in the history

  4. remove unnecessary if check 

    Co-authored-by: Andrew Lytvynov <andrew@goteleport.com>
    @stevenGravy
    stevenGravy and Andrew Lytvynov committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    286e61c View commit details
    Browse the repository at this point in the history

  5. remove unnecessary parenthesis 

    Co-authored-by: Andrew Lytvynov <andrew@goteleport.com>
    @stevenGravy
    stevenGravy and Andrew Lytvynov committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    59f9396 View commit details
    Browse the repository at this point in the history

  6. spacing for variable 

    Co-authored-by: Andrew Lytvynov <andrew@goteleport.com>
    @stevenGravy
    stevenGravy and Andrew Lytvynov committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    2982395 View commit details
    Browse the repository at this point in the history

  7. remove unnecessary if check 

    Co-authored-by: Andrew Lytvynov <andrew@goteleport.com>
    @stevenGravy
    stevenGravy and Andrew Lytvynov committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    df063a6 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    3853f5f View commit details
    Browse the repository at this point in the history

  9. lint fix

    @stevenGravy
    stevenGravy committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    96b20fb View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    6d6b435 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    41e2e16 View commit details
    Browse the repository at this point in the history

  12. Fix language 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    936ce88 View commit details
    Browse the repository at this point in the history

  13. language change 

    Co-authored-by: Gus Luxton <gus@gravitational.com>
    @stevenGravy @webvictim
    stevenGravy and webvictim committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    3d08355 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    842e8b8 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    0434d70 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    c931331 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    248115f View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    c439a9d View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    f72081a View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. Merge branch 'master' into stevenGravy/sso/gsuite

    @stevenGravy
    stevenGravy committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    b8003f8 View commit details
    Browse the repository at this point in the history