Config Generation: More resources! (#1591)

Author: julienduchesne

internal/resources/grafana/resource_annotation.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 	"time"
 
+	goapi "github.com/grafana/grafana-openapi-client-go/client"
 	"github.com/grafana/grafana-openapi-client-go/client/annotations"
 	"github.com/grafana/grafana-openapi-client-go/models"
 	"github.com/grafana/terraform-provider-grafana/v3/internal/common"
@@ -82,7 +83,30 @@ func resourceAnnotation() *common.Resource {
 		"grafana_annotation",
 		orgResourceIDInt("id"),
 		schema,
-	)
+	).WithLister(listerFunction(listAnnotations))
+}
+
+func listAnnotations(ctx context.Context, client *goapi.GrafanaHTTPAPI, data *ListerData) ([]string, error) {
+	orgIDs, err := data.OrgIDs(client)
+	if err != nil {
+		return nil, err
+	}
+
+	var ids []string
+	for _, orgID := range orgIDs {
+		client = client.Clone().WithOrgID(orgID)
+
+		resp, err := client.Annotations.GetAnnotations(annotations.NewGetAnnotationsParams())
+		if err != nil {
+			return nil, err
+		}
+
+		for _, annotation := range resp.Payload {
+			ids = append(ids, MakeOrgResourceID(orgID, annotation.ID))
+		}
+	}
+
+	return ids, nil
 }
 
 func CreateAnnotation(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

internal/resources/grafana/resource_library_panel.go

@@ -8,10 +8,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
+	goapi "github.com/grafana/grafana-openapi-client-go/client"
+	"github.com/grafana/grafana-openapi-client-go/client/library_elements"
 	"github.com/grafana/grafana-openapi-client-go/models"
 	"github.com/grafana/terraform-provider-grafana/v3/internal/common"
 )
 
+const libraryPanelKind int64 = 1
+
 func resourceLibraryPanel() *common.Resource {
 	schema := &schema.Resource{
 
@@ -111,7 +115,31 @@ Manages Grafana library panels.
 		"grafana_library_panel",
 		orgResourceIDString("uid"),
 		schema,
-	)
+	).WithLister(listerFunction(listLibraryPanels))
+}
+
+func listLibraryPanels(ctx context.Context, client *goapi.GrafanaHTTPAPI, data *ListerData) ([]string, error) {
+	orgIDs, err := data.OrgIDs(client)
+	if err != nil {
+		return nil, err
+	}
+
+	var ids []string
+	for _, orgID := range orgIDs {
+		client = client.Clone().WithOrgID(orgID)
+
+		params := library_elements.NewGetLibraryElementsParams().WithKind(common.Ref(libraryPanelKind))
+		resp, err := client.LibraryElements.GetLibraryElements(params)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, panel := range resp.Payload.Result.Elements {
+			ids = append(ids, MakeOrgResourceID(orgID, panel.UID))
+		}
+	}
+
+	return ids, nil
 }
 
 func createLibraryPanel(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -184,7 +212,7 @@ func updateLibraryPanel(ctx context.Context, d *schema.ResourceData, meta interf
 	body := models.PatchLibraryElementCommand{
 		Name:    d.Get("name").(string),
 		Model:   panelJSON,
-		Kind:    1,
+		Kind:    libraryPanelKind,
 		Version: int64(d.Get("version").(int)),
 	}
 	_, body.FolderUID = SplitOrgResourceID(d.Get("folder_uid").(string))
@@ -213,7 +241,7 @@ func makeLibraryPanel(d *schema.ResourceData) models.CreateLibraryElementCommand
 		UID:   d.Get("uid").(string),
 		Name:  d.Get("name").(string),
 		Model: panelJSON,
-		Kind:  1,
+		Kind:  libraryPanelKind,
 	}
 	_, panel.FolderUID = SplitOrgResourceID(d.Get("folder_uid").(string))
 

internal/resources/grafana/resource_organization_preferences.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"strconv"
 
+	goapi "github.com/grafana/grafana-openapi-client-go/client"
 	"github.com/grafana/grafana-openapi-client-go/models"
 	"github.com/grafana/terraform-provider-grafana/v3/internal/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -60,7 +61,13 @@ func resourceOrganizationPreferences() *common.Resource {
 		"grafana_organization_preferences",
 		common.NewResourceID(common.IntIDField("orgID")),
 		schema,
-	)
+	).WithLister(listerFunction(listOrganizationPreferences))
+}
+
+func listOrganizationPreferences(ctx context.Context, client *goapi.GrafanaHTTPAPI, data *ListerData) ([]string, error) {
+	orgIDs, err := listOrganizations(ctx, client, data)
+	orgIDs = append(orgIDs, "1") // Default org. We can set preferences for it even if it can't be managed otherwise.
+	return orgIDs, err
 }
 
 func CreateOrganizationPreferences(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

internal/resources/grafana/resource_playlist.go

@@ -6,6 +6,8 @@ import (
 	"sort"
 	"strconv"
 
+	goapi "github.com/grafana/grafana-openapi-client-go/client"
+	"github.com/grafana/grafana-openapi-client-go/client/playlists"
 	"github.com/grafana/grafana-openapi-client-go/models"
 	"github.com/grafana/terraform-provider-grafana/v3/internal/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -74,7 +76,30 @@ func resourcePlaylist() *common.Resource {
 		"grafana_playlist",
 		orgResourceIDString("uid"),
 		schema,
-	)
+	).WithLister(listerFunction(listPlaylists))
+}
+
+func listPlaylists(ctx context.Context, client *goapi.GrafanaHTTPAPI, data *ListerData) ([]string, error) {
+	orgIDs, err := data.OrgIDs(client)
+	if err != nil {
+		return nil, err
+	}
+
+	var ids []string
+	for _, orgID := range orgIDs {
+		client = client.Clone().WithOrgID(orgID)
+
+		resp, err := client.Playlists.SearchPlaylists(playlists.NewSearchPlaylistsParams())
+		if err != nil {
+			return nil, err
+		}
+
+		for _, playlist := range resp.Payload {
+			ids = append(ids, MakeOrgResourceID(orgID, playlist.UID))
+		}
+	}
+
+	return ids, nil
 }
 
 func CreatePlaylist(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

internal/resources/grafana/resource_report.go

@@ -11,6 +11,7 @@ import (
 	_ "time/tzdata"
 
 	"github.com/go-openapi/strfmt"
+	goapi "github.com/grafana/grafana-openapi-client-go/client"
 	"github.com/grafana/grafana-openapi-client-go/models"
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -247,7 +248,33 @@ func resourceReport() *common.Resource {
 		"grafana_report",
 		orgResourceIDInt("id"),
 		schema,
-	)
+	).WithLister(listerFunction(listReports))
+}
+
+func listReports(ctx context.Context, client *goapi.GrafanaHTTPAPI, data *ListerData) ([]string, error) {
+	orgIDs, err := data.OrgIDs(client)
+	if err != nil {
+		return nil, err
+	}
+
+	var ids []string
+	for _, orgID := range orgIDs {
+		client = client.Clone().WithOrgID(orgID)
+
+		resp, err := client.Reports.GetReports()
+		if common.IsNotFoundError(err) {
+			return nil, nil // Reports are not available in the current Grafana version (Probably OSS)
+		}
+		if err != nil {
+			return nil, err
+		}
+
+		for _, report := range resp.Payload {
+			ids = append(ids, MakeOrgResourceID(orgID, report.ID))
+		}
+	}
+
+	return ids, nil
 }
 
 func CreateReport(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

pkg/generate/testdata/generate/dashboard-expected/imports.tf

@@ -12,3 +12,8 @@ import {
   to = grafana_notification_policy._1_policy
   id = "1:policy"
 }
+
+import {
+  to = grafana_organization_preferences._1
+  id = "1"
+}

pkg/generate/testdata/generate/dashboard-expected/resources.tf

@@ -22,3 +22,7 @@ resource "grafana_notification_policy" "_1_policy" {
   disable_provenance = true
   group_by           = ["grafana_folder", "alertname"]
 }
+
+# __generated__ by Terraform from "1"
+resource "grafana_organization_preferences" "_1" {
+}