SSO: fix reloading settings when a provider contains empty settings #85102
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
dmihai
commented
Mar 25, 2024
| @@ -365,9 +365,15 @@ func (s *Service) doReload(ctx context.Context) { | |||
| } | |||
|
|
|||
| for provider, connector := range s.reloadables { | |||
| setting := getSettingByProvider(provider, settingsList) | |||
| settings := getSettingByProvider(provider, settingsList) | |||
There was a problem hiding this comment.
I replaced setting with settings because we had a name collision with the package setting.
mgyongyosi
reviewed
Mar 25, 2024
mgyongyosi
approved these changes
Mar 25, 2024
ashharrison90
added
product-approved
3 tasks
ashharrison90
pushed a commit
that referenced
this pull request
Apr 15, 2024
…settings (#86142) SSO: fix reloading settings when a provider contains empty settings (#85102) * fix reloading settings when a provider contains empty settings * do not increment reloadFailures if settings are empty (cherry picked from commit fad6dc4) Co-authored-by: Mihai Doarna <mihai.doarna@grafana.com>
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.
What is this feature?
Prevents reloading of SSO settings for providers that have empty settings.
Why do we need this feature?
If a providers has empty settings then Grafana will panic because it tries to dereference a nil settings pointer at this line from the
doReload()function:Who is this feature for?
everybody
Which issue(s) does this PR fix?:
Fixes #
Special notes for your reviewer:
Please check that: