Use new test helper instead of custom one

Author: timofurrer

internal/provider/helper_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/onsi/gomega"
 	"github.com/xanzy/go-gitlab"
 )
@@ -455,14 +454,6 @@ func testAccGitlabProjectStart(t *testing.T) testAccGitlabProjectContext {
 	}
 }
 
-// testCheckResourceAttrLazy works like resource.TestCheckResourceAttr, but lazy evaluates the value parameter.
-// See also: resource.TestCheckResourceAttrPtr.
-func testCheckResourceAttrLazy(name string, key string, value func() string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		return resource.TestCheckResourceAttr(name, key, value())(s)
-	}
-}
-
 func copyFile(src, dst string) error {
 	in, err := os.Open(src)
 	if err != nil {

internal/provider/resource_gitlab_project_environment_test.go

@@ -42,7 +42,13 @@ func TestAccGitlabProjectEnvironment_basic(t *testing.T) {
 						Name:  fmt.Sprintf("ProjectEnvironment-%d", rInt),
 						State: "available",
 					}),
-					testCheckResourceAttrLazy("gitlab_project_environment.this", "created_at", func() string { return env1.CreatedAt.Format(time.RFC3339) }),
+					resource.TestCheckResourceAttrWith("gitlab_project_environment.this", "created_at", func(value string) error {
+						expectedValue := env1.CreatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
 				),
 			},
 			// Verify import
@@ -62,8 +68,20 @@ func TestAccGitlabProjectEnvironment_basic(t *testing.T) {
 						State:       "available",
 						ExternalURL: "https://example.com",
 					}),
-					testCheckResourceAttrLazy("gitlab_project_environment.this", "created_at", func() string { return env2.CreatedAt.Format(time.RFC3339) }),
-					testCheckResourceAttrLazy("gitlab_project_environment.this", "updated_at", func() string { return env2.UpdatedAt.Format(time.RFC3339) }),
+					resource.TestCheckResourceAttrWith("gitlab_project_environment.this", "created_at", func(value string) error {
+						expectedValue := env2.CreatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
+					resource.TestCheckResourceAttrWith("gitlab_project_environment.this", "updated_at", func(value string) error {
+						expectedValue := env2.UpdatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
 				),
 			},
 			// Verify import

internal/provider/resource_gitlab_project_issue_test.go

@@ -40,7 +40,13 @@ func TestAccGitlabProjectIssue_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "project", testProject.PathWithNamespace),
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "iid", "1"),
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "title", "Terraform test issue"),
-					testCheckResourceAttrLazy("gitlab_project_issue.this", "created_at", func() string { return testIssue.CreatedAt.Format(time.RFC3339) }),
+					resource.TestCheckResourceAttrWith("gitlab_project_issue.this", "created_at", func(value string) error {
+						expectedValue := testIssue.CreatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
 				),
 			},
 			// Verify import
@@ -58,7 +64,13 @@ func TestAccGitlabProjectIssue_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "project", testProject.PathWithNamespace),
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "iid", "1"),
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "title", "Terraform test issue"),
-					testCheckResourceAttrLazy("gitlab_project_issue.this", "updated_at", func() string { return updatedTestIssue.UpdatedAt.Format(time.RFC3339) }),
+					resource.TestCheckResourceAttrWith("gitlab_project_issue.this", "updated_at", func(value string) error {
+						expectedValue := updatedTestIssue.UpdatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
 				),
 			},
 			// Verify import
@@ -97,7 +109,13 @@ func TestAccGitlabProjectIssue_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabProjectIssueExists("gitlab_project_issue.this", &testIssue),
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "state", "closed"),
-					testCheckResourceAttrLazy("gitlab_project_issue.this", "closed_at", func() string { return testIssue.ClosedAt.Format(time.RFC3339) }),
+					resource.TestCheckResourceAttrWith("gitlab_project_issue.this", "closed_at", func(value string) error {
+						expectedValue := testIssue.ClosedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
 					resource.TestCheckResourceAttr("gitlab_project_issue.this", "closed_by_user_id", fmt.Sprintf("%d", currentUser.ID)),
 				),
 			},

internal/provider/resource_gitlab_service_external_wiki_test.go

@@ -34,7 +34,13 @@ func TestAccGitlabServiceExternalWiki_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(externalWikiResourceName, "external_wiki_url", externalWikiURL1),
 					resource.TestCheckResourceAttr(externalWikiResourceName, "external_wiki_url", externalWikiURL1),
 					resource.TestCheckResourceAttr(externalWikiResourceName, "active", "true"),
-					testCheckResourceAttrLazy(externalWikiResourceName, "created_at", func() string { return externalWikiService.CreatedAt.Format(time.RFC3339) }),
+					resource.TestCheckResourceAttrWith(externalWikiResourceName, "created_at", func(value string) error {
+						expectedValue := externalWikiService.CreatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
 				),
 			},
 			// Verify import
@@ -49,8 +55,20 @@ func TestAccGitlabServiceExternalWiki_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabServiceExternalWikiExists(externalWikiResourceName, &externalWikiService),
 					resource.TestCheckResourceAttr(externalWikiResourceName, "external_wiki_url", externalWikiURL2),
-					testCheckResourceAttrLazy(externalWikiResourceName, "created_at", func() string { return externalWikiService.CreatedAt.Format(time.RFC3339) }),
-					testCheckResourceAttrLazy(externalWikiResourceName, "updated_at", func() string { return externalWikiService.UpdatedAt.Format(time.RFC3339) }),
+					resource.TestCheckResourceAttrWith(externalWikiResourceName, "created_at", func(value string) error {
+						expectedValue := externalWikiService.CreatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
+					resource.TestCheckResourceAttrWith(externalWikiResourceName, "updated_at", func(value string) error {
+						expectedValue := externalWikiService.UpdatedAt.Format(time.RFC3339)
+						if value != expectedValue {
+							return fmt.Errorf("should be equal to %s", expectedValue)
+						}
+						return nil
+					}),
 				),
 			},
 			// Verify import