Merge branch 'main' of github.com:Moon1706/terraform-provider-gitlab into main

Author: SharaevN

.vscode/settings.json

@@ -4,6 +4,6 @@
         "GITLAB_TOKEN": "ACCTEST1234567890123",
         "GITLAB_BASE_URL": "http://127.0.0.1:8080"
     },
-    "go.testFlags": ["-count=1", "-v", "-tags=acceptance"],
+    "go.testFlags": ["-count=1", "-v", "-tags=acceptance", "-parallel=2"],
     "go.buildFlags": ["-tags=acceptance"]
 }

docs/resources/project.md

@@ -20,11 +20,11 @@ The `gitlab_project` resource allows to manage the lifecycle of a project.
 
 A project can either be created in a group or user namespace.
 
--> **Default Branch Protection Workaround** Projects are created with default branch protection. 
-Since this default branch protection is not currently managed via Terraform, to workaround this limitation, 
+-> **Default Branch Protection Workaround** Projects are created with default branch protection.
+Since this default branch protection is not currently managed via Terraform, to workaround this limitation,
 you can remove the default branch protection via the API and create your desired Terraform managed branch protection.
-In the `gitlab_project` resource, define a `local-exec` provisioner which invokes 
-the `/projects/:id/protected_branches/:name` API via curl to delete the branch protection on the default 
+In the `gitlab_project` resource, define a `local-exec` provisioner which invokes
+the `/projects/:id/protected_branches/:name` API via curl to delete the branch protection on the default
 branch using a `DELETE` request. Then define the desired branch protection using the `gitlab_branch_protection` resource.
 
 **Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ce/api/projects.html)

internal/provider/data_source_gitlab_branch_test.go

@@ -15,7 +15,7 @@ import (
 func TestAccDataGitlabBranch_basic(t *testing.T) {
 	rInt := acctest.RandInt()
 	project := testAccCreateProject(t)
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

internal/provider/data_source_gitlab_cluster_agent_test.go

@@ -17,7 +17,7 @@ func TestAccDataSourceGitlabClusterAgent_basic(t *testing.T) {
 	testProject := testAccCreateProject(t)
 	testAgent := testAccCreateClusterAgents(t, testProject.ID, 1)[0]
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

internal/provider/data_source_gitlab_cluster_agents_test.go

@@ -16,7 +16,7 @@ func TestAccDataSourceGitlabClusterAgents_basic(t *testing.T) {
 	testProject := testAccCreateProject(t)
 	testClusterAgents := testAccCreateClusterAgents(t, testProject.ID, 25)
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

internal/provider/data_source_gitlab_group_membership_test.go

@@ -14,7 +14,7 @@ import (
 func TestAccDataSourceGitlabMembership_basic(t *testing.T) {
 	rInt := acctest.RandInt()
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			// Create the group and one member

internal/provider/data_source_gitlab_group_variable_test.go

@@ -14,7 +14,7 @@ import (
 func TestAccDataSourceGitlabGroupVariable_basic(t *testing.T) {
 	testGroup := testAccCreateGroups(t, 1)[0]
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

internal/provider/data_source_gitlab_group_variables_test.go

@@ -18,7 +18,7 @@ func TestAccDataSourceGitlabGroupVariables_basic(t *testing.T) {
 		testVariables = append(testVariables, testAccCreateGroupVariable(t, testGroup.ID))
 	}
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{

internal/provider/data_source_gitlab_instance_variable_test.go

@@ -7,25 +7,28 @@ import (
 	"fmt"
 	"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"
 )
 
 func TestAccDataSourceGitlabInstanceVariable_basic(t *testing.T) {
-	resource.Test(t, resource.TestCase{
+	rInt := acctest.RandInt()
+
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: `
+				Config: fmt.Sprintf(`
 					resource "gitlab_instance_variable" "this" {
-						key               = "any_key"
-					        value             = "any-value"
+						key               = "any_key_%d"
+					    value             = "any-value"
 					}
 
 					data "gitlab_instance_variable" "this" {
 						key               = gitlab_instance_variable.this.key
 					}
-				`,
+				`, rInt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccDataSourceGitlabInstanceVariable("gitlab_instance_variable.this", "data.gitlab_instance_variable.this"),
 				),

internal/provider/data_source_gitlab_project_issue_test.go

@@ -14,7 +14,7 @@ import (
 func TestAccDataSourceGitlabProjectIssue_basic(t *testing.T) {
 	testProject := testAccCreateProject(t)
 
-	resource.Test(t, resource.TestCase{
+	resource.ParallelTest(t, resource.TestCase{
 		ProviderFactories: providerFactories,
 		Steps: []resource.TestStep{
 			{