Merge branch 'K-Phoen:master' into master

folders.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"net/url"
 	"strings"
 )
 
@@ -15,9 +16,10 @@ var ErrFolderNotFound = errors.New("folder not found")
 // Folder represents a dashboard folder.
 // See https://grafana.com/docs/grafana/latest/reference/dashboard_folders/
 type Folder struct {
-	ID    uint   `json:"id"`
-	UID   string `json:"uid"`
-	Title string `json:"title"`
+	ID        uint   `json:"id"`
+	UID       string `json:"uid"`
+	ParentUID string `json:"parentUid"`
+	Title     string `json:"title"`
 }
 
 // FindOrCreateFolder returns the folder by its name or creates it if it doesn't exist.
@@ -69,7 +71,7 @@ func (client *Client) CreateFolder(ctx context.Context, name string) (*Folder, e
 
 // GetFolderByTitle finds a folder, given its title.
 func (client *Client) GetFolderByTitle(ctx context.Context, title string) (*Folder, error) {
-	resp, err := client.get(ctx, "/api/folders?limit=1000")
+	resp, err := client.get(ctx, fmt.Sprintf("/api/search?type=dash-folder&query=%s", url.QueryEscape(title)))
 	if err != nil {
 		return nil, err
 	}