feat: allow folders to be moved to nested folders and back (#2279)

* create test to check of a folders parent can be be changed

Refs: #2278

Signed-off-by: patst <[email protected]>

Author: patst

internal/resources/grafana/resource_folder.go

@@ -66,7 +66,6 @@ func resourceFolder() *common.Resource {
 			"parent_folder_uid": {
 				Type:     schema.TypeString,
 				Optional: true,
-				ForceNew: true,
 				Description: "The uid of the parent folder. " +
 					"If set, the folder will be nested. " +
 					"If not set, the folder will be created in the root folder. " +
@@ -134,6 +133,33 @@ func UpdateFolder(ctx context.Context, d *schema.ResourceData, meta interface{})
 		return diag.Errorf("failed to get folder %s: %s", idStr, err)
 	}
 
+	if d.HasChange("parent_folder_uid") {
+		parentUID, ok := d.GetOk("parent_folder_uid")
+		if !ok {
+			// If the parent folder UID is not set, we can just clear it
+			folder.ParentUID = ""
+		} else {
+			err := retry.RetryContext(ctx, 2*time.Minute, func() *retry.RetryError {
+				parentFolder, err := GetFolderByIDorUID(client.Folders, parentUID.(string))
+				if err != nil {
+					return retry.RetryableError(err)
+				}
+				folder.ParentUID = parentFolder.UID
+				return nil
+			})
+
+			if err != nil {
+				return diag.Errorf("failed to find parent folder '%s': %s", parentUID, err)
+			}
+		}
+		body := models.MoveFolderCommand{
+			ParentUID: folder.ParentUID,
+		}
+		if _, err := client.Folders.MoveFolder(folder.UID, &body); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	body := models.UpdateFolderCommand{
 		Overwrite: true,
 		Title:     d.Get("title").(string),

internal/resources/grafana/resource_folder_test.go

@@ -171,6 +171,106 @@ resource grafana_folder child2 {
 	})
 }
 
+func TestAccFolder_ChangeParent(t *testing.T) {
+	testutils.CheckOSSTestsEnabled(t, ">=10.3.0")
+
+	var parentFolder models.Folder
+	var childFolder1 models.Folder
+	name := acctest.RandStringFromCharSet(10, acctest.CharSetAlpha)
+
+	resource.ParallelTest(t, resource.TestCase{
+		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			folderCheckExists.destroyed(&parentFolder, nil),
+			folderCheckExists.destroyed(&childFolder1, nil),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+resource grafana_folder parent {
+	title = "Nested Test: Parent %[1]s"
+}
+
+resource grafana_folder child1 {
+	title = "Nested Test: Child 1 %[1]s"
+	uid = "%[1]s-child1"
+}
+`, name),
+				Check: resource.ComposeTestCheckFunc(
+					folderCheckExists.exists("grafana_folder.parent", &parentFolder),
+					resource.TestMatchResourceAttr("grafana_folder.parent", "id", defaultOrgIDRegexp),
+					resource.TestCheckResourceAttr("grafana_folder.parent", "title", "Nested Test: Parent "+name),
+					resource.TestCheckResourceAttr("grafana_folder.parent", "parent_folder_uid", ""),
+
+					folderCheckExists.exists("grafana_folder.child1", &childFolder1),
+					resource.TestMatchResourceAttr("grafana_folder.child1", "id", defaultOrgIDRegexp),
+					resource.TestCheckResourceAttr("grafana_folder.child1", "title", "Nested Test: Child 1 "+name),
+					resource.TestCheckResourceAttr("grafana_folder.child1", "parent_folder_uid", ""),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+resource grafana_folder parent {
+	title = "Nested Test: Parent %[1]s"
+}
+
+resource grafana_folder child1 {
+	title = "Nested Test: Child 1 %[1]s"
+	uid = "%[1]s-child1"
+	parent_folder_uid = grafana_folder.parent.uid
+}
+`, name),
+				Check: resource.ComposeTestCheckFunc(
+					folderCheckExists.exists("grafana_folder.parent", &parentFolder),
+					resource.TestMatchResourceAttr("grafana_folder.parent", "id", defaultOrgIDRegexp),
+					resource.TestCheckResourceAttr("grafana_folder.parent", "title", "Nested Test: Parent "+name),
+					resource.TestCheckResourceAttr("grafana_folder.parent", "parent_folder_uid", ""),
+
+					folderCheckExists.exists("grafana_folder.child1", &childFolder1),
+					resource.TestMatchResourceAttr("grafana_folder.child1", "id", defaultOrgIDRegexp),
+					resource.TestCheckResourceAttr("grafana_folder.child1", "title", "Nested Test: Child 1 "+name),
+					resource.TestCheckResourceAttrSet("grafana_folder.child1", "parent_folder_uid"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+resource grafana_folder parent {
+	title = "Nested Test: Parent %[1]s"
+}
+
+resource grafana_folder child1 {
+	title = "Nested Test: Child 1 %[1]s"
+	uid = "%[1]s-child1"
+}
+`, name),
+				Check: resource.ComposeTestCheckFunc(
+					folderCheckExists.exists("grafana_folder.parent", &parentFolder),
+					resource.TestMatchResourceAttr("grafana_folder.parent", "id", defaultOrgIDRegexp),
+					resource.TestCheckResourceAttr("grafana_folder.parent", "title", "Nested Test: Parent "+name),
+					resource.TestCheckResourceAttr("grafana_folder.parent", "parent_folder_uid", ""),
+
+					folderCheckExists.exists("grafana_folder.child1", &childFolder1),
+					resource.TestMatchResourceAttr("grafana_folder.child1", "id", defaultOrgIDRegexp),
+					resource.TestCheckResourceAttr("grafana_folder.child1", "title", "Nested Test: Child 1 "+name),
+					resource.TestCheckResourceAttr("grafana_folder.child1", "parent_folder_uid", ""),
+				),
+			},
+			{
+				ResourceName:            "grafana_folder.parent",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"prevent_destroy_if_not_empty"},
+			},
+			{
+				ResourceName:            "grafana_folder.child1",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"prevent_destroy_if_not_empty"},
+			},
+		},
+	})
+}
+
 func TestAccFolder_PreventDeletion(t *testing.T) {
 	testutils.CheckOSSTestsEnabled(t, ">=10.2.0") // Searching by folder UID was added in 10.2.0