Bump github.com/grafana/grafana-api-golang-client from 0.9.2 to 0.10.0 (#600)

* Bump github.com/grafana/grafana-api-golang-client from 0.9.2 to 0.10.0

Bumps [github.com/grafana/grafana-api-golang-client](https://github.com/grafana/grafana-api-golang-client) from 0.9.2 to 0.10.0.
- [Release notes](https://github.com/grafana/grafana-api-golang-client/releases)
- [Commits](grafana/grafana-api-golang-client@v0.9.2...v0.10.0)

---
updated-dependencies:
- dependency-name: github.com/grafana/grafana-api-golang-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Use FolderID

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Julien Duchesne <[email protected]>

Author: dependabot[bot]

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/grafana/amixr-api-go-client v0.0.4
-	github.com/grafana/grafana-api-golang-client v0.9.2
+	github.com/grafana/grafana-api-golang-client v0.10.0
 	github.com/grafana/machine-learning-go-client v0.1.1
 	github.com/grafana/synthetic-monitoring-agent v0.9.3
 	github.com/grafana/synthetic-monitoring-api-go-client v0.6.0

go.sum

@@ -114,8 +114,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grafana/amixr-api-go-client v0.0.4 h1:GD36YNbfZnyJlpfCS4DfvKv2H1oAHDcWL0ujW0rMzOE=
 github.com/grafana/amixr-api-go-client v0.0.4/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
-github.com/grafana/grafana-api-golang-client v0.9.2 h1:13Zcl+5tnTgT1pJlYPmveN0s2oUEyBsyAlcGp/n2S/4=
-github.com/grafana/grafana-api-golang-client v0.9.2/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
+github.com/grafana/grafana-api-golang-client v0.10.0 h1:R/dgpQOFynP/3Ivoh5SvEPKh4u9YoWuvoOKNe80wkH8=
+github.com/grafana/grafana-api-golang-client v0.10.0/go.mod h1:24W29gPe9yl0/3A9X624TPkAOR8DpHno490cPwnkv8E=
 github.com/grafana/machine-learning-go-client v0.1.1 h1:Gw6cX8xAd6IVF2LApkXOIdBK8Gzz07B3jQPukecw7fc=
 github.com/grafana/machine-learning-go-client v0.1.1/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
 github.com/grafana/synthetic-monitoring-agent v0.9.3 h1:1GAjyUMWPYndRF6tux8NWgk97bRFx9RVYMkEMerPNKU=

grafana/data_source_dashboard.go

@@ -125,7 +125,7 @@ func dataSourceDashboardRead(ctx context.Context, d *schema.ResourceData, meta i
 	d.Set("config_json", string(configJSONBytes))
 	d.Set("version", int64(dashboard.Model["version"].(float64)))
 	d.Set("title", dashboard.Model["title"].(string))
-	d.Set("folder", dashboard.Folder)
+	d.Set("folder", dashboard.FolderID)
 	d.Set("is_starred", dashboard.Meta.IsStarred)
 	d.Set("slug", dashboard.Meta.Slug)
 	d.Set("url", strings.TrimRight(gapiURL, "/")+dashboard.Meta.URL)

grafana/resource_dashboard.go

@@ -139,9 +139,9 @@ func resourceDashboardV0() *schema.Resource {
 
 // resourceDashboardStateUpgradeV0 migrates from version 0 of this resource's
 // schema to version 1.
-// * Use UID instead of slug. Slug was deprecated in Grafana 5 in favor of UID.
-//   Slug API endpoints were removed in Grafana 8.
-// * Version field added to schema.
+//   - Use UID instead of slug. Slug was deprecated in Grafana 5 in favor of UID.
+//     Slug API endpoints were removed in Grafana 8.
+//   - Version field added to schema.
 func resourceDashboardStateUpgradeV0(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
 	client := meta.(*client).gapi
 	dashboardID := int64(rawState["dashboard_id"].(float64))
@@ -216,8 +216,8 @@ func ReadDashboard(ctx context.Context, d *schema.ResourceData, meta interface{}
 	d.Set("dashboard_id", int64(dashboard.Model["id"].(float64)))
 	d.Set("version", int64(dashboard.Model["version"].(float64)))
 	d.Set("url", strings.TrimRight(gapiURL, "/")+dashboard.Meta.URL)
-	if dashboard.Folder > 0 {
-		d.Set("folder", strconv.FormatInt(dashboard.Folder, 10))
+	if dashboard.FolderID > 0 {
+		d.Set("folder", strconv.FormatInt(dashboard.FolderID, 10))
 	} else {
 		d.Set("folder", "")
 	}
@@ -293,7 +293,7 @@ func makeDashboard(d *schema.ResourceData) (gapi.Dashboard, error) {
 	}
 
 	dashboard := gapi.Dashboard{
-		Folder:    parsedFolder,
+		FolderID:  parsedFolder,
 		Overwrite: d.Get("overwrite").(bool),
 		Message:   d.Get("message").(string),
 	}
@@ -335,10 +335,10 @@ func validateDashboardConfigJSON(config interface{}, k string) ([]string, []erro
 //
 // It removes the following fields:
 //
-// * `id`:      an auto-incrementing ID Grafana assigns to dashboards upon
-//              creation. We cannot know this before creation and therefore it cannot
-//              be managed in code.
-// * `version`: is incremented by Grafana each time a dashboard changes.
+//   - `id`:      an auto-incrementing ID Grafana assigns to dashboards upon
+//     creation. We cannot know this before creation and therefore it cannot
+//     be managed in code.
+//   - `version`: is incremented by Grafana each time a dashboard changes.
 func normalizeDashboardConfigJSON(config interface{}) string {
 	var dashboardJSON map[string]interface{}
 	switch c := config.(type) {

grafana/resource_dashboard_test.go

@@ -201,8 +201,8 @@ func testAccDashboardCheckExists(rn string, dashboard *gapi.Dashboard) resource.
 
 func testAccDashboardCheckExistsInFolder(dashboard *gapi.Dashboard, folder *gapi.Folder) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		if dashboard.Folder != folder.ID && folder.ID != 0 {
-			return fmt.Errorf("dashboard.Folder(%d) does not match folder.ID(%d)", dashboard.Folder, folder.ID)
+		if dashboard.FolderID != folder.ID && folder.ID != 0 {
+			return fmt.Errorf("dashboard.Folder(%d) does not match folder.ID(%d)", dashboard.FolderID, folder.ID)
 		}
 		return nil
 	}