Merge pull request #1078 from gro-gg/main

Moving a subgroup does not force a recreation of the group and no longer deletes the underlying projects

Author: timofurrer

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.15.0
 	github.com/mitchellh/hashstructure v1.1.0
 	github.com/onsi/gomega v1.19.0
-	github.com/xanzy/go-gitlab v0.64.0
+	github.com/xanzy/go-gitlab v0.65.0
 )
 
 require (

go.sum

@@ -311,8 +311,8 @@ github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvC
 github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=
 github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY=
 github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
-github.com/xanzy/go-gitlab v0.64.0 h1:rMgQdW9S1w3qvNAH2LYpFd2xh7KNLk+JWJd7sorNuTc=
-github.com/xanzy/go-gitlab v0.64.0/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
+github.com/xanzy/go-gitlab v0.65.0 h1:9xSA9cRVhz3Z54JacIHdvWnNmNAoSz/BDnyMGOf3yIg=
+github.com/xanzy/go-gitlab v0.65.0/go.mod h1:F0QEXwmqiBUxCgJm8fE9S+1veX4XC9Z4cfaAbqwk4YM=
 github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
 github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

internal/provider/resource_gitlab_group.go

@@ -141,7 +141,6 @@ var _ = registerResource("gitlab_group", func() *schema.Resource {
 				Description: "Id of the parent group (creates a nested group).",
 				Type:        schema.TypeInt,
 				Optional:    true,
-				ForceNew:    true,
 				Default:     0,
 			},
 			"runners_token": {
@@ -369,9 +368,39 @@ func resourceGitlabGroupUpdate(ctx context.Context, d *schema.ResourceData, meta
 		return diag.FromErr(err)
 	}
 
+	if d.HasChange("parent_id") {
+		err = transferSubGroup(ctx, d, client)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	return resourceGitlabGroupRead(ctx, d, meta)
 }
 
+func transferSubGroup(ctx context.Context, d *schema.ResourceData, client *gitlab.Client) error {
+	o, n := d.GetChange("parent_id")
+	parentId, ok := n.(int)
+	if !ok {
+		return fmt.Errorf("error converting parent_id %v into an int", n)
+	}
+
+	opt := &gitlab.TransferSubGroupOptions{}
+	if parentId != 0 {
+		log.Printf("[DEBUG] transfer gitlab group %s from %v to new parent group %v", d.Id(), o, n)
+		opt.GroupID = gitlab.Int(parentId)
+	} else {
+		log.Printf("[DEBUG] turn gitlab group %s from %v to a new top-level group", d.Id(), o)
+	}
+
+	_, _, err := client.Groups.TransferSubGroup(d.Id(), opt, gitlab.WithContext(ctx))
+	if err != nil {
+		return fmt.Errorf("error transfering group %s to new parent group %v: %s", d.Id(), parentId, err)
+	}
+
+	return nil
+}
+
 func resourceGitlabGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*gitlab.Client)
 	log.Printf("[DEBUG] Delete gitlab group %s", d.Id())

internal/provider/resource_gitlab_group_test.go

@@ -134,6 +134,16 @@ func TestAccGitlabGroup_nested(t *testing.T) {
 	var group gitlab.Group
 	var group2 gitlab.Group
 	var nestedGroup gitlab.Group
+	var lastGid int
+	testGidNotChanged := func(s *terraform.State) error {
+		if lastGid == 0 {
+			lastGid = nestedGroup.ID
+		}
+		if lastGid != nestedGroup.ID {
+			return fmt.Errorf("group id changed")
+		}
+		return nil
+	}
 	rInt := acctest.RandInt()
 
 	resource.Test(t, resource.TestCase{
@@ -158,6 +168,7 @@ func TestAccGitlabGroup_nested(t *testing.T) {
 						DefaultBranchProtection: 2,            // default value
 						Parent:                  &group,
 					}),
+					testGidNotChanged,
 				),
 			},
 			{
@@ -178,6 +189,7 @@ func TestAccGitlabGroup_nested(t *testing.T) {
 						DefaultBranchProtection: 2,            // default value
 						Parent:                  &group2,
 					}),
+					testGidNotChanged,
 				),
 			},
 			{
@@ -197,29 +209,30 @@ func TestAccGitlabGroup_nested(t *testing.T) {
 						TwoFactorGracePeriod:    48,           // default value
 						DefaultBranchProtection: 2,            // default value
 					}),
+					testGidNotChanged,
+				),
+			},
+			{
+				Config: testAccGitlabNestedGroupConfig(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGitlabGroupExists("gitlab_group.foo", &group),
+					testAccCheckGitlabGroupExists("gitlab_group.foo2", &group2),
+					testAccCheckGitlabGroupExists("gitlab_group.nested_foo", &nestedGroup),
+					testAccCheckGitlabGroupAttributes(&nestedGroup, &testAccGitlabGroupExpectedAttributes{
+						Name:                    fmt.Sprintf("nfoo-name-%d", rInt),
+						Path:                    fmt.Sprintf("nfoo-path-%d", rInt),
+						Description:             "Terraform acceptance tests",
+						LFSEnabled:              true,
+						Visibility:              "public",     // default value
+						ProjectCreationLevel:    "maintainer", // default value
+						SubGroupCreationLevel:   "owner",      // default value
+						TwoFactorGracePeriod:    48,           // default value
+						DefaultBranchProtection: 2,            // default value
+						Parent:                  &group,
+					}),
+					testGidNotChanged,
 				),
 			},
-			// TODO In EE version, re-creating on the same path where a previous group was soft-deleted doesn't work.
-			// {
-			// 	Config: testAccGitlabNestedGroupConfig(rInt),
-			// 	Check: resource.ComposeTestCheckFunc(
-			// 		testAccCheckGitlabGroupExists("gitlab_group.foo", &group),
-			// 		testAccCheckGitlabGroupExists("gitlab_group.foo2", &group2),
-			// 		testAccCheckGitlabGroupExists("gitlab_group.nested_foo", &nestedGroup),
-			// 		testAccCheckGitlabGroupAttributes(&nestedGroup, &testAccGitlabGroupExpectedAttributes{
-			// 			Name:        fmt.Sprintf("nfoo-name-%d", rInt),
-			// 			Path:        fmt.Sprintf("nfoo-path-%d", rInt),
-			// 			Description: "Terraform acceptance tests",
-			// 			LFSEnabled:  true,
-			//			Visibility:            "public",     // default value
-			//			ProjectCreationLevel:  "maintainer", // default value
-			//			SubGroupCreationLevel: "owner",      // default value
-			//			TwoFactorGracePeriod:  48,           // default value
-			//			DefaultBranchProtection: 2,          // default value
-			// 			Parent:      &group,
-			// 		}),
-			// 	),
-			// },
 		},
 	})
 }