Fix breaking changes introduce in SDK v2.11.0 upgrade

Author: timofurrer

internal/provider/helper_test.go

@@ -66,8 +66,8 @@ func isRunningInCE() (bool, error) {
 func testAccCheck(t *testing.T) {
 	t.Helper()
 
-	if os.Getenv(resource.TestEnvVar) == "" {
-		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.TestEnvVar))
+	if os.Getenv(resource.EnvTfAcc) == "" {
+		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.EnvTfAcc))
 	}
 }
 
@@ -318,8 +318,8 @@ type testAccGitlabProjectContext struct {
 // testAccGitlabProjectStart initializes the GitLab client and creates a test project. Remember to
 // call testAccGitlabProjectContext.finish() when finished with the testAccGitlabProjectContext.
 func testAccGitlabProjectStart(t *testing.T) testAccGitlabProjectContext {
-	if os.Getenv(resource.TestEnvVar) == "" {
-		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.TestEnvVar))
+	if os.Getenv(resource.EnvTfAcc) == "" {
+		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.EnvTfAcc))
 		return testAccGitlabProjectContext{}
 	}
 

internal/provider/provider_test.go

@@ -34,7 +34,7 @@ var testGitlabConfig = Config{
 var testGitlabClient *gitlab.Client
 
 func init() {
-	if os.Getenv(resource.TestEnvVar) != "" {
+	if os.Getenv(resource.EnvTfAcc) != "" {
 		client, err := testGitlabConfig.Client()
 		if err != nil {
 			panic("failed to create test client: " + err.Error()) // lintignore: R009 // TODO: Resolve this tfproviderlint issue

internal/provider/resource_gitlab_project_test.go

@@ -694,8 +694,8 @@ func TestAccGitlabProject_transfer(t *testing.T) {
 // lintignore: AT002 // not a Terraform import test
 func TestAccGitlabProject_importURL(t *testing.T) {
 	// Since we do some manual setup in this test, we need to handle the test skip first.
-	if os.Getenv(resource.TestEnvVar) == "" {
-		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.TestEnvVar))
+	if os.Getenv(resource.EnvTfAcc) == "" {
+		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.EnvTfAcc))
 	}
 
 	rInt := acctest.RandInt()
@@ -822,8 +822,8 @@ func testAccCheckGitlabProjectMirroredAttributes(project *gitlab.Project, want *
 // lintignore: AT002 // not a Terraform import test
 func TestAccGitlabProject_importURLMirrored(t *testing.T) {
 	// Since we do some manual setup in this test, we need to handle the test skip first.
-	if os.Getenv(resource.TestEnvVar) == "" {
-		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.TestEnvVar))
+	if os.Getenv(resource.EnvTfAcc) == "" {
+		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", resource.EnvTfAcc))
 	}
 
 	var mirror gitlab.Project

main.go

@@ -1,9 +1,7 @@
 package main
 
 import (
-	"context"
 	"flag"
-	"log"
 
 	"github.com/gitlabhq/terraform-provider-gitlab/internal/provider"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
@@ -16,21 +14,11 @@ var (
 )
 
 func main() {
-
 	var debugMode bool
 
 	flag.BoolVar(&debugMode, "debug", false, "set to true to run the provider with support for debuggers like delve")
 	flag.Parse()
 
-	opts := &plugin.ServeOpts{ProviderFunc: provider.New(version)}
-
-	if debugMode {
-		err := plugin.Debug(context.Background(), "registry.terraform.io/providers/gitlabhq/gitlab", opts)
-		if err != nil {
-			log.Fatal(err.Error())
-		}
-		return
-	}
-
+	opts := &plugin.ServeOpts{ProviderFunc: provider.New(version), Debug: debugMode, ProviderAddr: "registry.terraform.io/providers/gitlabhq/gitlab"}
 	plugin.Serve(opts)
 }