Merge pull request #2 from jonathan-dorsey/teamPreferences

Team preferences

Author: jonathan-dorsey

go.mod

@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-grafana
 go 1.14
 
 require (
-	github.com/grafana/grafana-api-golang-client v0.0.0-20201019145005-e01a63d40166
+	github.com/grafana/grafana-api-golang-client v0.0.0-20201026050958-d171908f4835
 	github.com/hashicorp/go-cleanhttp v0.5.1
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/terraform v0.12.2

go.sum

@@ -141,6 +141,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/grafana/grafana-api-golang-client v0.0.0-20201019145005-e01a63d40166 h1:Kl177VV8TQuyCQVYPF3grDYdRcINbSGP2aIuRqM7VZI=
 github.com/grafana/grafana-api-golang-client v0.0.0-20201019145005-e01a63d40166/go.mod h1:jFjwT3lvwl4JKqCw3guRJvlQ1/fmhER1h3Zgix3z7jw=
+github.com/grafana/grafana-api-golang-client v0.0.0-20201026050958-d171908f4835 h1:IdYj5SLuW3BuQfw3eyIlpB+IKeEgKa1Mmen9Hr521Sk=
+github.com/grafana/grafana-api-golang-client v0.0.0-20201026050958-d171908f4835/go.mod h1:jFjwT3lvwl4JKqCw3guRJvlQ1/fmhER1h3Zgix3z7jw=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=

grafana/resource_dashboard.go

@@ -91,10 +91,10 @@ func ReadDashboard(d *schema.ResourceData, meta interface{}) error {
 	configJSON := NormalizeDashboardConfigJSON(string(configJSONBytes))
 
 	d.SetId(dashboard.Meta.Slug)
-	d.Set("dashboard_id", dashboard.Id)
 	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

@@ -46,12 +46,12 @@ func UpdateTeamPreferences(d *schema.ResourceData, meta interface{}) error {
 
 	teamID := int64(d.Get("team_id").(int))
 	theme := d.Get("theme").(string)
-	homeDashboardId := int64(d.Get("home_dashboard_id").(int))
+	homeDashboardID := int64(d.Get("home_dashboard_id").(int))
 	timezone := d.Get("timezone").(string)
 
 	preferences := gapi.Preferences{
 		Theme:           theme,
-		HomeDashboardId: homeDashboardId,
+		HomeDashboardID: homeDashboardID,
 		Timezone:        timezone,
 	}
 
@@ -75,7 +75,7 @@ func ReadTeamPreferences(d *schema.ResourceData, meta interface{}) error {
 
 	d.SetId(strconv.FormatInt(teamID, 10))
 	d.Set("theme", preferences.Theme)
-	d.Set("home_dashboard_id", preferences.HomeDashboardId)
+	d.Set("home_dashboard_id", preferences.HomeDashboardID)
 	d.Set("timezone", preferences.Timezone)
 
 	return nil
@@ -91,7 +91,7 @@ func DeleteTeamPreferences(d *schema.ResourceData, meta interface{}) error {
 	teamID := int64(d.Get("team_id").(int))
 	defaultPreferences := gapi.Preferences{}
 
-	err := client.UpdateTeamPreferences(teamID, &defaultPreferences)
+	err := client.UpdateTeamPreferences(teamID, defaultPreferences)
 	if err != nil {
 		if strings.HasPrefix(err.Error(), "status: 404") {
 			d.SetId("")

grafana/resource_team_preferences_test.go

@@ -45,7 +45,6 @@ resource "grafana_team" "testTeam" {
 }
 
 resource "grafana_dashboard" "test" {
-  dashboard_id = 13
   config_json = <<EOT
 {
   "title": "Terraform Team Preferences Acceptance Test",
@@ -63,6 +62,19 @@ resource "grafana_team_preferences" "testTeamPreferences" {
 }
 `
 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"

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

@@ -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/modules.txt

@@ -9,7 +9,8 @@ description: |-
 # grafana\_team\_preferences
 
 The team preferences resource allows for team preferences to be set once a team 
-has been created. 
+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