Merge pull request #21 from roidelapluie/v4-parent

gitlab_project: Add support for the path field

Author: richardc

gitlab/resource_gitlab_project.go

@@ -23,6 +23,16 @@ func resourceGitlabProject() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"path": {
+				Type:     schema.TypeString,
+				Optional: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if new == "" {
+						return true
+					}
+					return old == new
+				},
+			},
 			"namespace_id": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -80,6 +90,7 @@ func resourceGitlabProject() *schema.Resource {
 
 func resourceGitlabProjectSetToState(d *schema.ResourceData, project *gitlab.Project) {
 	d.Set("name", project.Name)
+	d.Set("path", project.Path)
 	d.Set("description", project.Description)
 	d.Set("default_branch", project.DefaultBranch)
 	d.Set("issues_enabled", project.IssuesEnabled)
@@ -104,6 +115,10 @@ func resourceGitlabProjectCreate(d *schema.ResourceData, meta interface{}) error
 		Visibility:           stringToVisibilityLevel(d.Get("visibility_level").(string)),
 	}
 
+	if v, ok := d.GetOk("path"); ok {
+		options.Path = gitlab.String(v.(string))
+	}
+
 	if v, ok := d.GetOk("namespace_id"); ok {
 		options.NamespaceID = gitlab.Int(v.(int))
 	}
@@ -152,6 +167,10 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error
 		options.Name = gitlab.String(d.Get("name").(string))
 	}
 
+	if d.HasChange("path") && (d.Get("path").(string) != "") {
+		options.Path = gitlab.String(d.Get("path").(string))
+	}
+
 	if d.HasChange("description") {
 		options.Description = gitlab.String(d.Get("description").(string))
 	}

gitlab/resource_gitlab_project_test.go

@@ -26,6 +26,7 @@ func TestAccGitlabProject_basic(t *testing.T) {
 					testAccCheckGitlabProjectExists("gitlab_project.foo", &project),
 					testAccCheckGitlabProjectAttributes(&project, &testAccGitlabProjectExpectedAttributes{
 						Name:                 fmt.Sprintf("foo-%d", rInt),
+						Path:                 fmt.Sprintf("foo.%d", rInt),
 						Description:          "Terraform acceptance tests",
 						IssuesEnabled:        true,
 						MergeRequestsEnabled: true,
@@ -42,6 +43,7 @@ func TestAccGitlabProject_basic(t *testing.T) {
 					testAccCheckGitlabProjectExists("gitlab_project.foo", &project),
 					testAccCheckGitlabProjectAttributes(&project, &testAccGitlabProjectExpectedAttributes{
 						Name:        fmt.Sprintf("foo-%d", rInt),
+						Path:        fmt.Sprintf("foo.%d", rInt),
 						Description: "Terraform acceptance tests!",
 						Visibility:  gitlab.PublicVisibility,
 					}),
@@ -54,6 +56,7 @@ func TestAccGitlabProject_basic(t *testing.T) {
 					testAccCheckGitlabProjectExists("gitlab_project.foo", &project),
 					testAccCheckGitlabProjectAttributes(&project, &testAccGitlabProjectExpectedAttributes{
 						Name:                 fmt.Sprintf("foo-%d", rInt),
+						Path:                 fmt.Sprintf("foo.%d", rInt),
 						Description:          "Terraform acceptance tests",
 						IssuesEnabled:        true,
 						MergeRequestsEnabled: true,
@@ -91,6 +94,7 @@ func testAccCheckGitlabProjectExists(n string, project *gitlab.Project) resource
 
 type testAccGitlabProjectExpectedAttributes struct {
 	Name                 string
+	Path                 string
 	Description          string
 	DefaultBranch        string
 	IssuesEnabled        bool
@@ -105,6 +109,9 @@ func testAccCheckGitlabProjectAttributes(project *gitlab.Project, want *testAccG
 		if project.Name != want.Name {
 			return fmt.Errorf("got repo %q; want %q", project.Name, want.Name)
 		}
+		if project.Path != want.Path {
+			return fmt.Errorf("got repo %q; want %q", project.Path, want.Path)
+		}
 		if project.Description != want.Description {
 			return fmt.Errorf("got description %q; want %q", project.Description, want.Description)
 		}
@@ -163,19 +170,21 @@ func testAccGitlabProjectConfig(rInt int) string {
 	return fmt.Sprintf(`
 resource "gitlab_project" "foo" {
   name = "foo-%d"
+  path = "foo.%d"
   description = "Terraform acceptance tests"
 
   # So that acceptance tests can be run in a gitlab organization
   # with no billing
   visibility_level = "public"
 }
-	`, rInt)
+	`, rInt, rInt)
 }
 
 func testAccGitlabProjectUpdateConfig(rInt int) string {
 	return fmt.Sprintf(`
 resource "gitlab_project" "foo" {
   name = "foo-%d"
+  path = "foo.%d"
   description = "Terraform acceptance tests!"
 
   # So that acceptance tests can be run in a gitlab organization
@@ -187,5 +196,5 @@ resource "gitlab_project" "foo" {
   wiki_enabled = false
   snippets_enabled = false
 }
-	`, rInt)
+	`, rInt, rInt)
 }

website/docs/r/project.html.markdown

@@ -29,6 +29,8 @@ The following arguments are supported:
 
 * `name` - (Required) The name of the project.
 
+* `path` - (Optional) The path of the repository.
+
 * `namespace_id` - (Optional) The namespace (group or user) of the project. Defaults to your user.
   See [`gitlab_group`](group.html) for an example.