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

[v11.0.x] SSO: fix reloading settings when a provider contains empty settings #86142

Merged
merged 1 commit into from Apr 15, 2024
Merged

[v11.0.x] SSO: fix reloading settings when a provider contains empty settings #86142

merged 1 commit into from Apr 15, 2024

Conversation

grafana-delivery-bot[bot]
Copy link
Contributor

Backport fad6dc4 from #85102

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:

err = connector.Reload(ctx, *settings)

Who is this feature for?

everybody

Which issue(s) does this PR fix?:

Fixes #

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@dmihai @grafana-delivery-bot
SSO: fix reloading settings when a provider contains empty settings (#…
6e0cf88 
…85102)

* fix reloading settings when a provider contains empty settings

* do not increment reloadFailures if settings are empty

(cherry picked from commit fad6dc4)
@grafana-delivery-bot grafana-delivery-bot bot requested a review from a team as a code owner April 15, 2024 13:18
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.0.x milestone Apr 15, 2024
@grafana-delivery-bot grafana-delivery-bot bot added area/backend backport A backport PR no-changelog Skip including change in changelog/release notes product-approved Pull requests that are approved by product/managers and are allowed to be backported labels Apr 15, 2024
@ashharrison90 ashharrison90 merged commit 2cf7301 into v11.0.x Apr 15, 2024
21 checks passed
@ashharrison90 ashharrison90 deleted the backport-85102-to-v11.0.x branch April 15, 2024 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmihai dmihai dmihai approved these changes

Assignees
No one assigned
Labels
area/backend backport A backport PR no-changelog Skip including change in changelog/release notes product-approved Pull requests that are approved by product/managers and are allowed to be backported
Projects
None yet
Milestone
11.0.x
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dmihai @ashharrison90