Merge pull request #247 from ringods/transfer-project

When changing the namespace_id, transfer project from old to new namespace

Author: Julien Pivotto

gitlab/resource_gitlab_project.go

@@ -29,7 +29,6 @@ var resourceGitLabProjectSchema = map[string]*schema.Schema{
 	"namespace_id": {
 		Type:     schema.TypeInt,
 		Optional: true,
-		ForceNew: true,
 		Computed: true,
 	},
 	"description": {
@@ -362,6 +361,7 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error
 	client := meta.(*gitlab.Client)
 
 	options := &gitlab.EditProjectOptions{}
+	transferOptions := &gitlab.TransferProjectOptions{}
 
 	// need to manage partial state since project archiving requires
 	// a separate API call which could fail
@@ -378,6 +378,11 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error
 		updatedProperties = append(updatedProperties, "path")
 	}
 
+	if d.HasChange("namespace_id") {
+		transferOptions.Namespace = gitlab.Int(d.Get("namespace_id").(int))
+		updatedProperties = append(updatedProperties, "namespace_id")
+	}
+
 	if d.HasChange("description") {
 		options.Description = gitlab.String(d.Get("description").(string))
 		updatedProperties = append(updatedProperties, "description")
@@ -475,6 +480,16 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 
+	if *transferOptions != (gitlab.TransferProjectOptions{}) {
+		log.Printf("[DEBUG] transferring project %s to namespace %d", d.Id(), transferOptions.Namespace)
+		_, _, err := client.Projects.TransferProject(d.Id(), transferOptions)
+		if err != nil {
+			return err
+		}
+		log.Printf("[DEBUG] partial gitlab project %s update of property namespace_id", d.Id())
+		d.SetPartial("namespace_id")
+	}
+
 	if d.HasChange("shared_with_groups") {
 		err := updateSharedWithGroups(d, meta)
 		// TODO: check if handling partial state update in this simplistic

gitlab/resource_gitlab_project_test.go

@@ -302,6 +302,56 @@ func TestAccGitlabProject_nestedImport(t *testing.T) {
 	})
 }
 
+func TestAccGitlabProject_transfer(t *testing.T) {
+	var transferred, received gitlab.Project
+	rInt := acctest.RandInt()
+
+	transferred = gitlab.Project{
+		Namespace:                        &gitlab.ProjectNamespace{Name: fmt.Sprintf("foo2group-%d", rInt)},
+		Name:                             fmt.Sprintf("foo-%d", rInt),
+		Path:                             fmt.Sprintf("foo-%d", rInt),
+		Description:                      "Terraform acceptance tests",
+		TagList:                          []string{},
+		RequestAccessEnabled:             true,
+		IssuesEnabled:                    true,
+		MergeRequestsEnabled:             true,
+		JobsEnabled:                      true,
+		ApprovalsBeforeMerge:             0,
+		WikiEnabled:                      true,
+		SnippetsEnabled:                  true,
+		ContainerRegistryEnabled:         true,
+		LFSEnabled:                       true,
+		SharedRunnersEnabled:             true,
+		Visibility:                       gitlab.PublicVisibility,
+		MergeMethod:                      gitlab.NoFastForwardMerge,
+		OnlyAllowMergeIfPipelineSucceeds: false,
+		OnlyAllowMergeIfAllDiscussionsAreResolved: false,
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckGitlabProjectDestroy,
+		Steps: []resource.TestStep{
+			// Create a project in a group
+			{
+				Config: testAccGitlabProjectInGroupConfig(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGitlabProjectExists("gitlab_project.foo", &received),
+				),
+			},
+			// Create a second group and set the transfer the project to this group
+			{
+				Config: testAccGitlabProjectTransferBetweenGroups(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGitlabProjectExists("gitlab_project.foo", &received),
+					testAccCheckAggregateGitlabProject(&transferred, &received),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckGitlabProjectExists(n string, project *gitlab.Project) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		var err error
@@ -431,6 +481,32 @@ resource "gitlab_project" "foo" {
 	`, rInt, rInt, rInt)
 }
 
+func testAccGitlabProjectTransferBetweenGroups(rInt int) string {
+	return fmt.Sprintf(`
+resource "gitlab_group" "foo" {
+  name = "foogroup-%d"
+  path = "foogroup-%d"
+  visibility_level = "public"
+}
+
+resource "gitlab_group" "foo2" {
+  name = "foo2group-%d"
+  path = "foo2group-%d"
+  visibility_level = "public"
+}
+
+resource "gitlab_project" "foo" {
+  name = "foo-%d"
+  description = "Terraform acceptance tests"
+  namespace_id = "${gitlab_group.foo2.id}"
+
+  # So that acceptance tests can be run in a gitlab organization
+  # with no billing
+  visibility_level = "public"
+}
+	`, rInt, rInt, rInt, rInt, rInt)
+}
+
 func testAccGitlabProjectConfigDefaultBranch(rInt int, defaultBranch string) string {
 	defaultBranchStatement := ""