Update folder json to match as documented (grafana-tools#105)

* Update folder json to match as documented See https://grafana.com/docs/grafana/latest/http_api/folder/#get-all-folders * fix bug for when dashboards has word "file" in name
Kuper-Tech · Aug 27, 2020 · 68d50b8 · 68d50b8
1 parent e6a8cdd
commit 68d50b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/folder.go b/folder.go
@@ -26,13 +26,13 @@ type Folder struct {
 	UID       string `json:"uid"`
 	Title     string `json:"title"`
 	URL       string `json:"url"`
-	HasAcl    bool   `json:"has_acl"`
-	CanSave   bool   `json:"can_save"`
-	CanEdit   bool   `json:"can_edit"`
-	CanAdmin  bool   `json:"can_admin"`
-	CreatedBy string `json:"created_by"`
+	HasAcl    bool   `json:"hasAcl"`
+	CanSave   bool   `json:"canSave"`
+	CanEdit   bool   `json:"canEdit"`
+	CanAdmin  bool   `json:"canAdmin"`
+	CreatedBy string `json:"createdBy"`
 	Created   string `json:"created"`
-	UpdatedBy string `json:"updated_by"`
+	UpdatedBy string `json:"updatedBy"`
 	Updated   string `json:"updated"`
 	Version   int    `json:"version"`
 	Overwrite bool   `json:"overwrite"`

diff --git a/rest-dashboard.go b/rest-dashboard.go
@@ -414,7 +414,7 @@ func setPrefix(slug string) string {
 	if strings.HasPrefix(slug, "db") {
 		return slug
 	}
-	if strings.HasPrefix(slug, "file") {
+	if strings.HasPrefix(slug, "file/") {
 		return slug
 	}
 	return fmt.Sprintf("db/%s", slug)