Merge branch 'master' into master

Author: medains

grafana/provider.go

@@ -44,6 +44,7 @@ func Provider() terraform.ResourceProvider {
 			"grafana_folder_permission":  ResourceFolderPermission(),
 			"grafana_organization":       ResourceOrganization(),
 			"grafana_team":               ResourceTeam(),
+			"grafana_team_preferences":   ResourceTeamPreferences(),
 			"grafana_user":               ResourceUser(),
 		},
 

grafana/resource_dashboard.go

@@ -27,6 +27,11 @@ func ResourceDashboard() *schema.Resource {
 				Computed: true,
 			},
 
+			"dashboard_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+
 			"folder": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -89,6 +94,7 @@ func ReadDashboard(d *schema.ResourceData, meta interface{}) error {
 	d.Set("slug", dashboard.Meta.Slug)
 	d.Set("config_json", configJSON)
 	d.Set("folder", dashboard.Folder)
+	d.Set("dashboard_id", int64(dashboard.Model["id"].(float64)))
 
 	return nil
 }

grafana/resource_team_preferences.go

@@ -0,0 +1,104 @@
+package grafana
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
+
+	gapi "github.com/grafana/grafana-api-golang-client"
+)
+
+func ResourceTeamPreferences() *schema.Resource {
+	return &schema.Resource{
+		Create: UpdateTeamPreferences,
+		Read:   ReadTeamPreferences,
+		Update: UpdateTeamPreferences,
+		Delete: DeleteTeamPreferences,
+
+		Schema: map[string]*schema.Schema{
+			"team_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				ForceNew: true,
+			},
+			"theme": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice([]string{"light", "dark", ""}, false),
+			},
+			"home_dashboard_id": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
+			"timezone": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice([]string{"utc", "browser", ""}, false),
+			},
+		},
+	}
+}
+
+func UpdateTeamPreferences(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gapi.Client)
+
+	teamID := int64(d.Get("team_id").(int))
+	theme := d.Get("theme").(string)
+	homeDashboardID := int64(d.Get("home_dashboard_id").(int))
+	timezone := d.Get("timezone").(string)
+
+	preferences := gapi.Preferences{
+		Theme:           theme,
+		HomeDashboardID: homeDashboardID,
+		Timezone:        timezone,
+	}
+
+	err := client.UpdateTeamPreferences(teamID, preferences)
+	if err != nil {
+		return err
+	}
+
+	return ReadTeamPreferences(d, meta)
+}
+
+func ReadTeamPreferences(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gapi.Client)
+
+	teamID := int64(d.Get("team_id").(int))
+
+	preferences, err := client.TeamPreferences(teamID)
+	if err != nil {
+		return err
+	}
+
+	d.SetId(strconv.FormatInt(teamID, 10))
+	d.Set("theme", preferences.Theme)
+	d.Set("home_dashboard_id", preferences.HomeDashboardID)
+	d.Set("timezone", preferences.Timezone)
+
+	return nil
+}
+
+func DeleteTeamPreferences(d *schema.ResourceData, meta interface{}) error {
+	//there is no delete call for team preferences. instead we will just remove
+	//the specified preferences and go back to the default values. note: if the
+	//call fails because the team no longer exists - we'll just ignore the error
+
+	client := meta.(*gapi.Client)
+
+	teamID := int64(d.Get("team_id").(int))
+	defaultPreferences := gapi.Preferences{}
+
+	err := client.UpdateTeamPreferences(teamID, defaultPreferences)
+	if err != nil {
+		if strings.HasPrefix(err.Error(), "status: 404") {
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
+	return nil
+}

grafana/resource_team_preferences_test.go

@@ -0,0 +1,84 @@
+package grafana
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccTeamPreferences_basic(t *testing.T) {
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccTeamPreferencesCheckDestroy(),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccTeamPreferencesConfig_Basic,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("grafana_team_preferences.testTeamPreferences", "theme", "dark"),
+					resource.TestCheckResourceAttr("grafana_team_preferences.testTeamPreferences", "timezone", "utc"),
+				),
+			},
+			{
+				Config: testAccTeamPreferencesConfig_Update,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr("grafana_team_preferences.testTeamPreferences", "theme", "light"),
+					resource.TestCheckResourceAttr("grafana_team_preferences.testTeamPreferences", "timezone", "browser"),
+				),
+			},
+		},
+	})
+}
+
+func testAccTeamPreferencesCheckDestroy() resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		//you can't really destroy team preferences so nothing to check for
+		return nil
+	}
+}
+
+const testAccTeamPreferencesConfig_Basic = `
+resource "grafana_team" "testTeam" {
+  name = "terraform-test-team-preferences"
+}
+
+resource "grafana_dashboard" "test" {
+  config_json = <<EOT
+{
+  "title": "Terraform Team Preferences Acceptance Test",
+  "id": 13,
+  "version": "43"
+}
+EOT
+}
+  
+resource "grafana_team_preferences" "testTeamPreferences" {
+  team_id           = grafana_team.testTeam.id
+  theme             = "dark"
+  home_dashboard_id = grafana_dashboard.test.dashboard_id
+  timezone          = "utc"
+}
+`
+const testAccTeamPreferencesConfig_Update = `
+resource "grafana_team" "testTeam" {
+  name = "terraform-test-team-preferences"
+}
+
+resource "grafana_dashboard" "test" {
+  config_json = <<EOT
+{
+  "title": "Terraform Team Preferences Acceptance Test",
+  "id": 13,
+  "version": "43"
+}
+EOT
+}
+resource "grafana_team_preferences" "testTeamPreferences" {
+  team_id           = grafana_team.testTeam.id
+  theme             = "light"
+  home_dashboard_id = grafana_dashboard.test.dashboard_id
+  timezone          = "browser"
+}
+`

vendor/github.com/grafana/grafana-api-golang-client/.drone.jsonnet

@@ -74,7 +74,7 @@ github.com/google/go-cmp/cmp/internal/function
 github.com/google/go-cmp/cmp/internal/value
 # github.com/googleapis/gax-go/v2 v2.0.3
 github.com/googleapis/gax-go/v2
-# github.com/grafana/grafana-api-golang-client v0.0.0-20201019145005-e01a63d40166
+# github.com/grafana/grafana-api-golang-client v0.0.0-20201026050958-d171908f4835
 ## explicit
 github.com/grafana/grafana-api-golang-client
 # github.com/hashicorp/errwrap v1.0.0

vendor/github.com/grafana/grafana-api-golang-client/team.go

@@ -47,6 +47,7 @@ In addition to all arguments above, the following attributes are exported:
 * `slug` - A URL "slug" for this dashboard, generated by Grafana by removing
   certain characters from the dashboard name given as part of the `config_json`
   argument. This can be used to generate the URL for a dashboard.
+* `dashboard_id` - The numeric ID of the dashboard computed by Grafana.
 
 ## Import
 

vendor/modules.txt

@@ -0,0 +1,45 @@
+---
+layout: "grafana"
+page_title: "Grafana: grafana_team_preferences"
+sidebar_current: "docs-grafana-resource-team-preferences"
+description: |-
+  The grafana_team_preferences resource allows Team Preferences to be maintained. 
+---
+
+# grafana\_team\_preferences
+
+The team preferences resource allows for team preferences to be set once a team 
+has been created. Available preferences are a light or dark theme, the default
+timezone to be used, and the dashboard to be displayed upon login. 
+
+## Example Usage
+
+```hcl
+resource "grafana_dashboard" "metrics" {
+  config_json = file("grafana-dashboard.json")
+}
+
+resource "grafana_team" "team" {
+  name = "Team Name"
+}
+
+resource "grafana_team_preferences" "team_preferences" {
+  team_id           = grafana_team.team.id
+  theme             = "dark"
+  timezone          = "browser"
+  home_dashboard_id = grafana_dashboard.metrics.dashboard_id
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `team_id` - (Required) The numeric team ID.
+* `theme` - (Optional) The theme for the specified team. Available themes are `light`, `dark`, or an empty string for the default theme. 
+* `timezone` - (Optional) The timezone for the specified team. Available values are `utc`, `browser`, or an empty string for the default. 
+* `home_dashboard_id` - (Optional) The numeric ID of the dashboard to display when a team member logs in.
+
+## Import
+
+Team preferences cannot be imported.

website/docs/r/dashboard.html.md

@@ -34,6 +34,9 @@
             <li<%= sidebar_current("docs-grafana-resource-team") %>>
               <a href="/docs/providers/grafana/r/team.html">grafana_team</a>
             </li>
+            <li<%= sidebar_current("docs-grafana-resource-team-preferences") %>>
+            <a href="/docs/providers/grafana/r/team_preferences.html">grafana_team_preferences</a>
+          </li>
           </ul>
         </li>
       </ul>