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.

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

SSO: Prepare for integrating SAML into grafana_sso_settings resource #1473

Merged
merged 1 commit into from
Apr 9, 2024

Conversation

dmihai
Copy link
Contributor

@dmihai dmihai commented Apr 9, 2024

This PR introduces some changes from the previous behaviour. With the new logic we make sure that settings returned by the read function also exist in the terraform state. We do this because usually terraform manages only a subset from the complete set returned by the SSO settings API.

A special case is when the terraform state is empty for a provider. This happens when importing a provider configuration into terraform. In this case all settings from the API will be returned.

The new behaviour will be covered by tests when adding support for SAML in a followup PR.

@dmihai dmihai requested a review from a team April 9, 2024 09:34
@dmihai dmihai requested a review from a team as a code owner April 9, 2024 09:34
Copy link

github-actions bot commented Apr 9, 2024

In order to lower resource usage and have a faster runtime, PRs will not run Cloud tests automatically.
To do so, a Grafana Labs employee must trigger the cloud acceptance tests workflow manually.

@dmihai dmihai merged commit f3bb045 into main Apr 9, 2024
27 checks passed
@dmihai dmihai deleted the dmihai/fix-sso-read branch April 9, 2024 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants