data_source_folder: Use OpenAPI client (#1134)

Use https://github.com/grafana/grafana-openapi-client-go instead of the manually generated client

docs/data-sources/folder.md

@@ -31,6 +31,10 @@ data "grafana_folder" "from_title" {
 
 - `title` (String) The name of the Grafana folder.
 
+### Optional
+
+- `org_id` (String) The Organization ID. If not set, the Org ID defined in the provider block will be used.
+
 ### Read-Only
 
 - `id` (Number) The numerical ID of the Grafana folder.

internal/resources/grafana/data_source_folder.go

@@ -5,7 +5,9 @@ import (
 	"fmt"
 	"strconv"
 
-	gapi "github.com/grafana/grafana-api-golang-client"
+	goapi "github.com/grafana/grafana-openapi-client-go/client"
+	"github.com/grafana/grafana-openapi-client-go/client/folders"
+	"github.com/grafana/grafana-openapi-client-go/models"
 	"github.com/grafana/terraform-provider-grafana/internal/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -19,6 +21,7 @@ func DatasourceFolder() *schema.Resource {
 `,
 		ReadContext: dataSourceFolderRead,
 		Schema: map[string]*schema.Schema{
+			"org_id": orgIDAttribute(),
 			"title": {
 				Type:        schema.TypeString,
 				Required:    true,
@@ -43,34 +46,46 @@ func DatasourceFolder() *schema.Resource {
 	}
 }
 
-func findFolderWithTitle(client *gapi.Client, title string) (*gapi.Folder, error) {
-	folders, err := client.Folders()
-	if err != nil {
-		return nil, err
-	}
+func findFolderWithTitle(client *goapi.GrafanaHTTPAPI, title string) (*models.Folder, error) {
+	var page int64 = 1
 
-	for _, f := range folders {
-		if f.Title == title {
-			// Query the folder by UID, that API has additional information
-			return client.FolderByUID(f.UID)
+	for {
+		params := folders.NewGetFoldersParams().WithPage(&page)
+		resp, err := client.Folders.GetFolders(params, nil)
+		if err != nil {
+			return nil, err
+		}
+
+		if len(resp.Payload) == 0 {
+			return nil, fmt.Errorf("folder with title %s not found", title)
+		}
+
+		for _, folder := range resp.Payload {
+			if folder.Title == title {
+				getParams := folders.NewGetFolderByUIDParams().WithFolderUID(folder.UID)
+				resp, err := client.Folders.GetFolderByUID(getParams, nil)
+				if err != nil {
+					return nil, err
+				}
+				return resp.Payload, nil
+			}
 		}
-	}
 
-	return nil, fmt.Errorf("no folder with title %q", title)
+		page++
+	}
 }
 
 func dataSourceFolderRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	metaClient := meta.(*common.Client)
-	client := meta.(*common.Client).GrafanaAPI
-	title := d.Get("title").(string)
-	folder, err := findFolderWithTitle(client, title)
+	client, orgID := OAPIClientFromNewOrgResource(meta, d)
 
+	folder, err := findFolderWithTitle(client, d.Get("title").(string))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
-	id := strconv.FormatInt(folder.ID, 10)
-	d.SetId(id)
+	d.SetId(strconv.FormatInt(folder.ID, 10))
+	d.Set("org_id", strconv.FormatInt(orgID, 10))
 	d.Set("uid", folder.UID)
 	d.Set("title", folder.Title)
 	d.Set("url", metaClient.GrafanaSubpath(folder.URL))