Add import_url attribute to project resource

This allows importing a repository from a url

Add test for project: import_url

Wait for import to complete before read

Author: joepvd

gitlab/resource_gitlab_project.go

@@ -113,6 +113,10 @@ var resourceGitLabProjectSchema = map[string]*schema.Schema{
 		ValidateFunc: validation.StringInSlice([]string{"private", "internal", "public"}, true),
 		Default:      "private",
 	},
+	"import_url": {
+		Type:     schema.TypeString,
+		Optional: true,
+	},
 	"merge_method": {
 		Type:         schema.TypeString,
 		Optional:     true,
@@ -309,6 +313,10 @@ func resourceGitlabProjectCreate(d *schema.ResourceData, meta interface{}) error
 		setProperties = append(setProperties, "initialize_with_readme")
 	}
 
+	if v, ok := d.GetOk("import_url"); ok {
+		options.ImportURL = gitlab.String(v.(string))
+	}
+
 	log.Printf("[DEBUG] create gitlab project %q", *options.Name)
 
 	project, _, err := client.Projects.CreateProject(options)
@@ -352,6 +360,7 @@ func resourceGitlabProjectCreate(d *schema.ResourceData, meta interface{}) error
 }
 
 func resourceGitlabProjectRead(d *schema.ResourceData, meta interface{}) error {
+	var project *gitlab.Project
 	client := meta.(*gitlab.Client)
 	log.Printf("[DEBUG] read gitlab project %s", d.Id())
 
@@ -365,6 +374,13 @@ func resourceGitlabProjectRead(d *schema.ResourceData, meta interface{}) error {
 		return nil
 	}
 
+	for project.ImportStatus == "started" {
+		project, _, err = client.Projects.GetProject(d.Id(), nil)
+		if err != nil {
+			return err
+		}
+	}
+
 	resourceGitlabProjectSetToState(d, project)
 	return nil
 }

gitlab/resource_gitlab_project_test.go

@@ -352,6 +352,24 @@ func TestAccGitlabProject_transfer(t *testing.T) {
 	})
 }
 
+func TestAccImportURL(t *testing.T) {
+	var received gitlab.Project
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckGitlabProjectDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testImportURLOptions(),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGitlabProjectExists("gitlab_project.import_url", &received),
+					testAccCheckImportURL("gitlab/resource_gitlab_project.go", &received),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckGitlabProjectExists(n string, project *gitlab.Project) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		var err error
@@ -667,3 +685,49 @@ resource "gitlab_project" "foo" {
 }
 	`, rInt, rInt)
 }
+
+func testImportURLOptions() string {
+	return fmt.Sprintf(`
+resource "gitlab_project" "import_url" {
+  name = "import"
+  path = "import"
+  description = "Terraform Import URL Acceptance test"
+
+  # So that acceptance tests can be run in a gitlab organization
+  # with no billing
+  visibility_level = "public"
+  merge_method = "ff"
+  only_allow_merge_if_pipeline_succeeds = true
+  only_allow_merge_if_all_discussions_are_resolved = true
+
+  issues_enabled = false
+  merge_requests_enabled = false
+  approvals_before_merge = 0
+  wiki_enabled = false
+  snippets_enabled = false
+  container_registry_enabled = false
+  shared_runners_enabled = false
+  archived = false
+  import_url = "https://github.com/terraform-providers/terraform-provider-gitlab.git"
+  default_branch = "master"
+}
+	`)
+}
+
+func testAccCheckImportURL(fp string, project *gitlab.Project) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		conn := testAccProvider.Meta().(*gitlab.Client)
+		ref := &gitlab.GetFileOptions{
+			Ref: gitlab.String("master"),
+		}
+		f, _, err := conn.RepositoryFiles.GetFile(project.ID, fp, ref, nil)
+		if err != nil {
+			return fmt.Errorf("Cannot find file %s, error %s\n", fp, err)
+		}
+		if f == nil {
+			return fmt.Errorf("Did not find file\n")
+		}
+
+		return nil
+	}
+}