Fixing team preferences test

Author: jonathan-dorsey

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"