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

Add/Upgrade weekStart preference for Teams and Organizations #1237

Merged
merged 6 commits into from
Jan 11, 2024

Conversation

Cleymax
Copy link
Contributor

@Cleymax Cleymax commented Dec 17, 2023

  • Add validation, default for Organization weekStart preference
  • Add weekStart preference for Team

Valid days are the same as those in the web UI.

Reference:

* Add validation, default for Organization weekStart preference
* Add weekStart preference for Team
Copy link

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.

@Cleymax Cleymax marked this pull request as ready for review December 17, 2023 21:50
@Cleymax Cleymax requested a review from a team as a code owner December 17, 2023 21:50
@julienduchesne
Copy link
Member

Before this can be merged, the tests will have to be fixed:

=== CONT  TestAccResourceOrganizationPreferences_WithDashboardID
    resource_organization_preferences_test.go:20: Step 1/5 error: Error running pre-apply refresh: exit status 1
        
        Error: expected week_start to be one of ["sunday" "monday" "saturday" ""], got Monday
        
          with grafana_organization_preferences.test,
          on terraform_plugin_test.tf line 18, in resource "grafana_organization_preferences" "test":
          18:   week_start = "Monday"

Copy link
Member

@julienduchesne julienduchesne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks

@julienduchesne julienduchesne merged commit 0a2114f into grafana:master Jan 11, 2024
22 of 24 checks passed
@Cleymax Cleymax deleted the team-org-pref-week_start branch January 11, 2024 16:19
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.

2 participants