SSO: add saml support for the sso settings resource #1474
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
In order to lower resource usage and have a faster runtime, PRs will not run Cloud tests automatically. |
# Conflicts: # internal/resources/grafana/resource_sso_settings.go
julienduchesne
approved these changes
Apr 10, 2024
| MinItems: 1, | ||
| Description: "The SSO settings set.", | ||
| MinItems: 0, | ||
| Description: "The OAuth2 settings set. Required for github, gitlab, google, azuread, okta, generic_oauth providers.", | ||
| Elem: oauth2SettingsSchema, |
There was a problem hiding this comment.
Needs a ConflictsWith: []string{samlSettingsKey}
There was a problem hiding this comment.
Good catch, I added ConflictsWith for saml as well.
| @@ -63,6 +63,54 @@ func TestSSOSettings_basic(t *testing.T) { | |||
| } | |||
| } | |||
|
|
|||
| func TestSSOSettings_basic_saml(t *testing.T) { | |||
There was a problem hiding this comment.
Did you run this manually? v11.1 won't be released for a while
There was a problem hiding this comment.
Yes, I manually ran this test locally against the main branch. I'm not sure how to make it run in CI at the moment because it requires enterprise and some flags to be enabled.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for SAML to the
grafana_sso_settingsresource.Solves https://github.com/grafana/identity-access-team/issues/593.