Add folder resource import

Author: zombispormedio

.gitignore

@@ -29,3 +29,5 @@ website/vendor
 # Test exclusions
 !command/test-fixtures/**/*.tfstate
 !command/test-fixtures/**/.terraform/
+
+terraform-provider-grafana

grafana/resource_folder.go

@@ -17,6 +17,9 @@ func ResourceFolder() *schema.Resource {
 		Create: CreateFolder,
 		Delete: DeleteFolder,
 		Read:   ReadFolder,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"uid": {
@@ -72,6 +75,7 @@ func ReadFolder(d *schema.ResourceData, meta interface{}) error {
 
 	d.SetId(strconv.FormatInt(folder.ID, 10))
 	d.Set("title", folder.Title)
+	d.Set("uid", folder.UID)
 
 	return nil
 }

grafana/resource_folder_test.go

@@ -32,6 +32,11 @@ func TestAccFolder_basic(t *testing.T) {
 					),
 				),
 			},
+			{
+				ResourceName:      "grafana_folder.test_folder",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

website/docs/r/folder.html.md

@@ -6,7 +6,7 @@ description: |-
   The grafana_folder resource allows a Grafana folder to be created.
 ---
 
-# grafana\_folder
+# grafana_folder
 
 The folder resource allows a folder to be created on a Grafana server.
 
@@ -27,18 +27,23 @@ resource "grafana_dashboard" "dashboard_in_folder" {
 
 The following arguments are supported:
 
-* `title` - (Required) The title of the folder.
+- `title` - (Required) The title of the folder.
 
 ## Attributes Reference
 
 The resource exports the following attributes:
 
-* `id` - The internal id of the folder in Grafana (only guaranteed to be unique
+- `id` - The internal id of the folder in Grafana (only guaranteed to be unique
   within this Grafana instance). The `id` is used by the `grafana_dashboard` resource
   to place a dashboard within a folder.
-* `uid` - An external id of the folder in Grafana (stable when folders are migrated
+- `uid` - An external id of the folder in Grafana (stable when folders are migrated
   between Grafana instances). The `uid` is required by several Grafana Folder APIs.
 
 ## Import
 
-Folders cannot be imported.
+Existing folders can be imported using the folder "id" which can be
+obtained from Grafana database or inspecting requests in folder (e.g. `https://grafana.mydomain.com/f/abcdef-gh/folder-title`)
+
+```
+$ terraform import grafana_folder.folder_name {folder_id}
+```