[v10.4.x] SSO: fix mergeSettings() in case the DB contains empty URLs #84344
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
![grafana-delivery-bot[bot]](https://avatars.githubusercontent.com/in/329617?s=60&v=4){kind=small}
* fix mergeSettings() in case the db contains empty strings * use correct github urls in test * overwrite only urls * update comment for mergeSettings() (cherry picked from commit 2acd48d)
grafana-delivery-bot
bot
added
area/backend
backport
dmihai
approved these changes
Mar 13, 2024
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.
Backport 2acd48d from #84290
What is this feature?
Previously, the empty URLs from the DB settings were not replaced by the URLs defined in the system settings. This was an issue for providers that require clients to send empty values for auth_url, token_url and api_url. The expectation in that case was that the auth_url, token_url and api_url would get their values from the system settings but that didn't happen if clients sent empty values for those settings. It worked only if clients didn't send them at all.
Why do we need this feature?
This is a fix for the escalation https://github.com/grafana/support-escalations/issues/9668.
Who is this feature for?
For everybody using SSO Settings API.
Which issue(s) does this PR fix?:
Fixes #
Special notes for your reviewer:
Please check that: