Implement changes for newly merged resources

Author: timofurrer

internal/provider/access_level_helpers.go

@@ -1,4 +1,4 @@
-package gitlab
+package provider
 
 import (
 	"github.com/xanzy/go-gitlab"

internal/provider/resource_gitlab_managed_license.go

@@ -1,14 +1,15 @@
-package gitlab
+package provider
 
 import (
 	"context"
 	"fmt"
+	"log"
+	"strconv"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/xanzy/go-gitlab"
-	"log"
-	"strconv"
 )
 
 func resourceGitlabManagedLicense() *schema.Resource {

internal/provider/resource_gitlab_managed_license_test.go

@@ -1,23 +1,24 @@
-package gitlab
+package provider
 
 import (
 	"fmt"
+	"strconv"
+	"testing"
+
 	"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/terraform"
 	"github.com/xanzy/go-gitlab"
-	"strconv"
-	"testing"
 )
 
 func TestAccGitlabManagedLicense_basic(t *testing.T) {
 	var managedLicense gitlab.ManagedLicense
 	rInt := acctest.RandInt()
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() {},
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckManagedLicenseDestroy,
+		PreCheck:          func() {},
+		ProviderFactories: providerFactories,
+		CheckDestroy:      testAccCheckManagedLicenseDestroy,
 		Steps: []resource.TestStep{
 			{
 				// Create a managed license with an "approved" state
@@ -58,9 +59,7 @@ func testAccCheckGitlabManagedLicenseStatus(n string, license *gitlab.ManagedLic
 			return fmt.Errorf("no project ID is set")
 		}
 
-		conn := testAccProvider.Meta().(*gitlab.Client)
-
-		licenses, _, err := conn.ManagedLicenses.ListManagedLicenses(project)
+		licenses, _, err := testGitlabClient.ManagedLicenses.ListManagedLicenses(project)
 		if err != nil {
 			return err
 		}
@@ -76,8 +75,6 @@ func testAccCheckGitlabManagedLicenseStatus(n string, license *gitlab.ManagedLic
 }
 
 func testAccCheckManagedLicenseDestroy(state *terraform.State) error {
-	conn := testAccProvider.Meta().(*gitlab.Client)
-
 	for _, rs := range state.RootModule().Resources {
 		if rs.Type != "gitlab_managed_licence" {
 			continue
@@ -86,7 +83,7 @@ func testAccCheckManagedLicenseDestroy(state *terraform.State) error {
 		id, _ := strconv.Atoi(rs.Primary.ID)
 		pid := rs.Primary.Attributes["project"]
 
-		license, _, err := conn.ManagedLicenses.GetManagedLicense(pid, id)
+		license, _, err := testGitlabClient.ManagedLicenses.GetManagedLicense(pid, id)
 		if err == nil {
 			if license != nil && license.ID == id {
 				return fmt.Errorf("license still exists")
@@ -114,9 +111,7 @@ func testAccCheckGitlabManagedLicenseExists(n string, license *gitlab.ManagedLic
 			return fmt.Errorf("no project ID is set")
 		}
 
-		conn := testAccProvider.Meta().(*gitlab.Client)
-
-		licenses, _, err := conn.ManagedLicenses.ListManagedLicenses(project)
+		licenses, _, err := testGitlabClient.ManagedLicenses.ListManagedLicenses(project)
 		if err != nil {
 			return err
 		}

internal/provider/resource_gitlab_project_test.go

@@ -379,9 +379,9 @@ func TestAccGitlabProject_archiveOnDestroy(t *testing.T) {
 	rInt := acctest.RandInt()
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckGitlabProjectArchivedOnDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: providerFactories,
+		CheckDestroy:      testAccCheckGitlabProjectArchivedOnDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccGitlabProjectConfigArchiveOnDestroy(rInt),
@@ -883,13 +883,12 @@ func testAccCheckGitlabProjectDestroy(s *terraform.State) error {
 }
 
 func testAccCheckGitlabProjectArchivedOnDestroy(s *terraform.State) error {
-	conn := testAccProvider.Meta().(*gitlab.Client)
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "gitlab_project" {
 			continue
 		}
 
-		gotRepo, _, err := conn.Projects.GetProject(rs.Primary.ID, nil)
+		gotRepo, _, err := testGitlabClient.Projects.GetProject(rs.Primary.ID, nil)
 		if err != nil {
 			return fmt.Errorf("unable to get project %s, to check if it has been archived on the destroy", rs.Primary.ID)
 		}