Merge pull request #1159 from bbr32/clean-up-date-comment-and-sprintf

Clean up: date comment & fmt.Sprintf

Author: timofurrer

internal/provider/resource_gitlab_group_ldap_link_test.go

@@ -37,7 +37,7 @@ func TestAccGitlabGroupLdapLink_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabGroupLdapLinkExists(resourceName, &ldapLink),
 					testAccCheckGitlabGroupLdapLinkAttributes(&ldapLink, &testAccGitlabGroupLdapLinkExpectedAttributes{
-						accessLevel: fmt.Sprintf("developer"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+						accessLevel: "developer",
 					})),
 			},
 
@@ -57,7 +57,7 @@ func TestAccGitlabGroupLdapLink_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabGroupLdapLinkExists(resourceName, &ldapLink),
 					testAccCheckGitlabGroupLdapLinkAttributes(&ldapLink, &testAccGitlabGroupLdapLinkExpectedAttributes{
-						accessLevel: fmt.Sprintf("maintainer"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+						accessLevel: "maintainer",
 					})),
 			},
 		},

internal/provider/resource_gitlab_group_membership.go

@@ -50,7 +50,7 @@ var _ = registerResource("gitlab_group_membership", func() *schema.Resource {
 			},
 			"expires_at": {
 				Description:  "Expiration date for the group membership. Format: `YYYY-MM-DD`",
-				Type:         schema.TypeString, // Format YYYY-MM-DD
+				Type:         schema.TypeString,
 				ValidateFunc: validateDateFunc,
 				Optional:     true,
 			},
@@ -166,6 +166,8 @@ func resourceGitlabGroupMembershipSetToState(d *schema.ResourceData, groupMember
 	d.Set("access_level", accessLevelValueToName[groupMember.AccessLevel])
 	if groupMember.ExpiresAt != nil {
 		d.Set("expires_at", groupMember.ExpiresAt.String())
+	} else {
+		d.Set("expires_at", "")
 	}
 	userId := strconv.Itoa(groupMember.ID)
 	d.SetId(buildTwoPartID(groupId, &userId))

internal/provider/resource_gitlab_group_membership_test.go

@@ -27,24 +27,24 @@ func TestAccGitlabGroupMembership_basic(t *testing.T) {
 			{
 				Config: testAccGitlabGroupMembershipConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(testAccCheckGitlabGroupMembershipExists("gitlab_group_membership.foo", &groupMember), testAccCheckGitlabGroupMembershipAttributes(&groupMember, &testAccGitlabGroupMembershipExpectedAttributes{
-					accessLevel: fmt.Sprintf("developer"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+					accessLevel: "developer",
 				})),
 			},
 
 			//Update the group member to change the access level (use testAccGitlabGroupMembershipUpdateConfig for Config)
 			{
 				Config: testAccGitlabGroupMembershipUpdateConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(testAccCheckGitlabGroupMembershipExists("gitlab_group_membership.foo", &groupMember), testAccCheckGitlabGroupMembershipAttributes(&groupMember, &testAccGitlabGroupMembershipExpectedAttributes{
-					accessLevel: fmt.Sprintf("guest"),      // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
-					expiresAt:   fmt.Sprintf("2099-01-01"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+					accessLevel: "guest",
+					expiresAt:   "2099-01-01",
 				})),
 			},
 
 			// Update the group member to change the access level back
 			{
 				Config: testAccGitlabGroupMembershipConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(testAccCheckGitlabGroupMembershipExists("gitlab_group_membership.foo", &groupMember), testAccCheckGitlabGroupMembershipAttributes(&groupMember, &testAccGitlabGroupMembershipExpectedAttributes{
-					accessLevel: fmt.Sprintf("developer"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+					accessLevel: "developer",
 				})),
 			},
 		},

internal/provider/resource_gitlab_group_share_group.go

@@ -48,7 +48,7 @@ var _ = registerResource("gitlab_group_share_group", func() *schema.Resource {
 			},
 			"expires_at": {
 				Description:  "Share expiration date. Format: `YYYY-MM-DD`",
-				Type:         schema.TypeString, // Format YYYY-MM-DD
+				Type:         schema.TypeString,
 				ValidateFunc: validateDateFunc,
 				ForceNew:     true,
 				Optional:     true,

internal/provider/resource_gitlab_project_membership_test.go

@@ -27,7 +27,7 @@ func TestAccGitlabProjectMembership_basic(t *testing.T) {
 			{
 				Config: testAccGitlabProjectMembershipConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(testAccCheckGitlabProjectMembershipExists("gitlab_project_membership.foo", &membership), testAccCheckGitlabProjectMembershipAttributes(&membership, &testAccGitlabProjectMembershipExpectedAttributes{
-					access_level: fmt.Sprintf("developer"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+					access_level: "developer",
 				})),
 			},
 
@@ -44,7 +44,7 @@ func TestAccGitlabProjectMembership_basic(t *testing.T) {
 			{
 				Config: testAccGitlabProjectMembershipConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(testAccCheckGitlabProjectMembershipExists("gitlab_project_membership.foo", &membership), testAccCheckGitlabProjectMembershipAttributes(&membership, &testAccGitlabProjectMembershipExpectedAttributes{
-					access_level: fmt.Sprintf("developer"), // nolint // TODO: Resolve this golangci-lint issue: S1039: unnecessary use of fmt.Sprintf (gosimple)
+					access_level: "developer",
 				})),
 			},
 		},