Add expiration date for gitlab_project_membership

Author: bertrandpgn

docs/resources/project_membership.md

@@ -29,6 +29,7 @@ resource "gitlab_project_membership" "example" {
   project_id   = "67890"
   user_id      = 1234
   access_level = "guest"
+  expires_at   = "2022-12-31"
 }
 ```
 
@@ -41,6 +42,10 @@ resource "gitlab_project_membership" "example" {
 - `project_id` (String) The id of the project.
 - `user_id` (Number) The id of the user.
 
+### Optional
+
+- `expires_at` (String) Expiration date for the project membership. Format: `YYYY-MM-DD`
+
 ### Read-Only
 
 - `id` (String) The ID of this resource.

examples/resources/gitlab_project_membership/resource.tf

@@ -8,4 +8,5 @@ resource "gitlab_project_membership" "example" {
   project_id   = "67890"
   user_id      = 1234
   access_level = "guest"
+  expires_at   = "2022-12-31"
 }

internal/provider/resource_gitlab_project_membership.go

@@ -48,6 +48,12 @@ var _ = registerResource("gitlab_project_membership", func() *schema.Resource {
 				ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice(validProjectAccessLevelNames, false)),
 				Required:         true,
 			},
+			"expires_at": {
+				Description:  "Expiration date for the project membership. Format: `YYYY-MM-DD`",
+				Type:         schema.TypeString,
+				ValidateFunc: validateDateFunc,
+				Optional:     true,
+			},
 		},
 	}
 })
@@ -57,11 +63,13 @@ func resourceGitlabProjectMembershipCreate(ctx context.Context, d *schema.Resour
 
 	userId := d.Get("user_id").(int)
 	projectId := d.Get("project_id").(string)
+	expiresAt := d.Get("expires_at").(string)
 	accessLevelId := accessLevelNameToValue[d.Get("access_level").(string)]
 
 	options := &gitlab.AddProjectMemberOptions{
 		UserID:      &userId,
 		AccessLevel: &accessLevelId,
+		ExpiresAt:   &expiresAt,
 	}
 	log.Printf("[DEBUG] create gitlab project membership for %d in %s", options.UserID, projectId)
 
@@ -115,10 +123,12 @@ func resourceGitlabProjectMembershipUpdate(ctx context.Context, d *schema.Resour
 
 	userId := d.Get("user_id").(int)
 	projectId := d.Get("project_id").(string)
+	expiresAt := d.Get("expires_at").(string)
 	accessLevelId := accessLevelNameToValue[strings.ToLower(d.Get("access_level").(string))]
 
 	options := gitlab.EditProjectMemberOptions{
 		AccessLevel: &accessLevelId,
+		ExpiresAt:   &expiresAt,
 	}
 	log.Printf("[DEBUG] update gitlab project membership %v for %s", userId, projectId)
 
@@ -153,7 +163,11 @@ func resourceGitlabProjectMembershipSetToState(d *schema.ResourceData, projectMe
 	d.Set("project_id", projectId)
 	d.Set("user_id", projectMember.ID)
 	d.Set("access_level", accessLevelValueToName[projectMember.AccessLevel])
-
+	if projectMember.ExpiresAt != nil {
+		d.Set("expires_at", projectMember.ExpiresAt.String())
+	} else {
+		d.Set("expires_at", "")
+	}
 	userId := strconv.Itoa(projectMember.ID)
 	d.SetId(buildTwoPartID(projectId, &userId))
 }

internal/provider/resource_gitlab_project_membership_test.go

@@ -35,7 +35,8 @@ func TestAccGitlabProjectMembership_basic(t *testing.T) {
 			{
 				Config: testAccGitlabProjectMembershipUpdateConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(testAccCheckGitlabProjectMembershipExists("gitlab_project_membership.foo", &membership), testAccCheckGitlabProjectMembershipAttributes(&membership, &testAccGitlabProjectMembershipExpectedAttributes{
-					access_level: fmt.Sprintf("guest"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+					access_level: "guest",
+					expiresAt:    "2099-01-01",
 				})),
 			},
 
@@ -80,6 +81,7 @@ func testAccCheckGitlabProjectMembershipExists(n string, membership *gitlab.Proj
 
 type testAccGitlabProjectMembershipExpectedAttributes struct {
 	access_level string
+	expiresAt    string
 }
 
 func testAccCheckGitlabProjectMembershipAttributes(membership *gitlab.ProjectMember, want *testAccGitlabProjectMembershipExpectedAttributes) resource.TestCheckFunc {
@@ -151,6 +153,7 @@ func testAccGitlabProjectMembershipUpdateConfig(rInt int) string {
 resource "gitlab_project_membership" "foo" {
   project_id = "${gitlab_project.foo.id}"
   user_id = "${gitlab_user.test.id}"
+  expires_at = "2099-01-01"
   access_level = "guest"
 }