Merge pull request #1105 from timofurrer/linter-improv

timofurrer · web-flow · commit 76daeb387324 · 2022-05-31T08:29:39.000+02:00
Remove a few technical debts regarding issues detected by the linter
diff --git a/internal/provider/data_source_gitlab_project.go b/internal/provider/data_source_gitlab_project.go
@@ -289,7 +289,6 @@ var _ = registerDataSource("gitlab_project", func() *schema.Resource {
 				Type:        schema.TypeString,
 				Computed:    true,
 			},
-			// lintignore: S031 // TODO: Resolve this tfproviderlint issue
 			"push_rules": {
 				Description: "Push rules for the project.",
 				Type:        schema.TypeList,
diff --git a/internal/provider/data_source_gitlab_projects.go b/internal/provider/data_source_gitlab_projects.go
@@ -1,5 +1,3 @@
-// lintignore: S031 // TODO: Resolve this tfproviderlint issue
-
 package provider
 
 import (
@@ -200,7 +198,6 @@ func flattenProjects(projects []*gitlab.Project) (values []map[string]interface{
 }
 
 var _ = registerDataSource("gitlab_projects", func() *schema.Resource {
-	// lintignore: S024 // TODO: Resolve this tfproviderlint issue
 	return &schema.Resource{
 		Description: `The ` + "`gitlab_projects`" + ` data source allows details of multiple projects to be retrieved. Optionally filtered by the set attributes.
 
@@ -223,7 +220,6 @@ var _ = registerDataSource("gitlab_projects", func() *schema.Resource {
 				Description: "The ID of the group owned by the authenticated user to look projects for within. Cannot be used with `min_access_level`, `with_programming_language` or `statistics`.",
 				Type:        schema.TypeInt,
 				Optional:    true,
-				ForceNew:    true,
 			},
 			"page": {
 				Description: "The first page to begin the query on.",
diff --git a/internal/provider/resource_gitlab_group_cluster_test.go b/internal/provider/resource_gitlab_group_cluster_test.go
@@ -97,22 +97,7 @@ func TestAccGitlabGroupCluster_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabGroupCluster_import(t *testing.T) {
-	rInt := acctest.RandInt()
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccRequiresLessThan(t, "15.0") },
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabGroupClusterDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabGroupClusterConfig(rInt, true),
-			},
+			// Verify Import
 			{
 				ResourceName:            "gitlab_group_cluster.foo",
 				ImportState:             true,
diff --git a/internal/provider/resource_gitlab_group_test.go b/internal/provider/resource_gitlab_group_test.go
@@ -40,6 +40,12 @@ func TestAccGitlabGroup_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_group.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the group to change the description
 			{
 				Config: testAccGitlabGroupUpdateConfig(rInt, 1),
@@ -64,6 +70,12 @@ func TestAccGitlabGroup_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_group.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the group to use zero-value `default_branch_protection`
 			{
 				Config: testAccGitlabGroupUpdateConfig(rInt, 0),
@@ -88,6 +100,12 @@ func TestAccGitlabGroup_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_group.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the group to put the name and description back
 			{
 				Config: testAccGitlabGroupConfig(rInt),
@@ -106,21 +124,7 @@ func TestAccGitlabGroup_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabGroup_import(t *testing.T) {
-	rInt := acctest.RandInt()
-
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabGroupDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabGroupConfig(rInt),
-			},
+			// Verify Import
 			{
 				ResourceName:      "gitlab_group.foo",
 				ImportState:       true,
diff --git a/internal/provider/resource_gitlab_instance_cluster_test.go b/internal/provider/resource_gitlab_instance_cluster_test.go
@@ -99,22 +99,7 @@ func TestAccGitlabInstanceCluster_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabInstanceCluster_import(t *testing.T) {
-	rInt := acctest.RandInt()
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccRequiresLessThan(t, "15.0") },
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabInstanceClusterDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabInstanceClusterConfig(rInt, true),
-			},
+			// Verify Import
 			{
 				ResourceName:            "gitlab_instance_cluster.foo",
 				ImportState:             true,
diff --git a/internal/provider/resource_gitlab_pipeline_schedule_test.go b/internal/provider/resource_gitlab_pipeline_schedule_test.go
@@ -36,6 +36,13 @@ func TestAccGitlabPipelineSchedule_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_pipeline_schedule.schedule",
+				ImportStateIdFunc: getPipelineScheduleImportID("gitlab_pipeline_schedule.schedule"),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the pipeline schedule to change the parameters
 			{
 				Config: testAccGitlabPipelineScheduleUpdateConfig(rInt),
@@ -50,6 +57,13 @@ func TestAccGitlabPipelineSchedule_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_pipeline_schedule.schedule",
+				ImportStateIdFunc: getPipelineScheduleImportID("gitlab_pipeline_schedule.schedule"),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the pipeline schedule to get back to initial settings
 			{
 				Config: testAccGitlabPipelineScheduleConfig(rInt),
@@ -64,25 +78,10 @@ func TestAccGitlabPipelineSchedule_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabPipelineSchedule_import(t *testing.T) {
-	rInt := acctest.RandInt()
-	resourceName := "gitlab_pipeline_schedule.schedule"
-
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabPipelineScheduleDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabPipelineScheduleConfig(rInt),
-			},
+			// Verify Import
 			{
-				ResourceName:      resourceName,
-				ImportStateIdFunc: getPipelineScheduleImportID(resourceName),
+				ResourceName:      "gitlab_pipeline_schedule.schedule",
+				ImportStateIdFunc: getPipelineScheduleImportID("gitlab_pipeline_schedule.schedule"),
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
diff --git a/internal/provider/resource_gitlab_pipeline_schedule_variable_test.go b/internal/provider/resource_gitlab_pipeline_schedule_variable_test.go
@@ -20,7 +20,7 @@ func TestAccGitlabPipelineScheduleVariable_basic(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabProjectDestroy,
+		CheckDestroy:      testAccCheckGitlabPipelineScheduleVariableDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccGitlabPipelineScheduleVariableConfig(rInt),
@@ -32,6 +32,13 @@ func TestAccGitlabPipelineScheduleVariable_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_pipeline_schedule_variable.schedule_var",
+				ImportState:       true,
+				ImportStateIdFunc: getPipelineScheduleVariableID("gitlab_pipeline_schedule_variable.schedule_var"),
+				ImportStateVerify: true,
+			},
 			{
 				Config: testAccGitlabPipelineScheduleVariableUpdateConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(
@@ -42,6 +49,13 @@ func TestAccGitlabPipelineScheduleVariable_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_pipeline_schedule_variable.schedule_var",
+				ImportState:       true,
+				ImportStateIdFunc: getPipelineScheduleVariableID("gitlab_pipeline_schedule_variable.schedule_var"),
+				ImportStateVerify: true,
+			},
 			{
 				Config: testAccGitlabPipelineScheduleVariableConfig(rInt),
 				Check: resource.ComposeTestCheckFunc(
@@ -52,26 +66,11 @@ func TestAccGitlabPipelineScheduleVariable_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabPipelineScheduleVariable_import(t *testing.T) {
-	rInt := acctest.RandInt()
-	resourceName := "gitlab_pipeline_schedule_variable.schedule_var"
-
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabPipelineScheduleVariableDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabPipelineScheduleVariableConfig(rInt),
-			},
+			// Verify Import
 			{
-				ResourceName:      resourceName,
+				ResourceName:      "gitlab_pipeline_schedule_variable.schedule_var",
 				ImportState:       true,
-				ImportStateIdFunc: getPipelineScheduleVariableID(resourceName),
+				ImportStateIdFunc: getPipelineScheduleVariableID("gitlab_pipeline_schedule_variable.schedule_var"),
 				ImportStateVerify: true,
 			},
 		},
diff --git a/internal/provider/resource_gitlab_pipeline_trigger_test.go b/internal/provider/resource_gitlab_pipeline_trigger_test.go
@@ -32,6 +32,13 @@ func TestAccGitlabPipelineTrigger_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_pipeline_trigger.trigger",
+				ImportStateIdFunc: getPipelineTriggerImportID("gitlab_pipeline_trigger.trigger"),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the pipeline trigger to change the parameters
 			{
 				Config: testAccGitlabPipelineTriggerUpdateConfig(rInt),
@@ -42,6 +49,13 @@ func TestAccGitlabPipelineTrigger_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_pipeline_trigger.trigger",
+				ImportStateIdFunc: getPipelineTriggerImportID("gitlab_pipeline_trigger.trigger"),
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the pipeline trigger to get back to initial settings
 			{
 				Config: testAccGitlabPipelineTriggerConfig(rInt),
@@ -52,25 +66,10 @@ func TestAccGitlabPipelineTrigger_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabPipelineTrigger_import(t *testing.T) {
-	rInt := acctest.RandInt()
-	resourceName := "gitlab_pipeline_trigger.trigger"
-
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabPipelineTriggerDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabPipelineTriggerConfig(rInt),
-			},
+			// Verify Import
 			{
-				ResourceName:      resourceName,
-				ImportStateIdFunc: getPipelineTriggerImportID(resourceName),
+				ResourceName:      "gitlab_pipeline_trigger.trigger",
+				ImportStateIdFunc: getPipelineTriggerImportID("gitlab_pipeline_trigger.trigger"),
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
diff --git a/internal/provider/resource_gitlab_project_cluster_test.go b/internal/provider/resource_gitlab_project_cluster_test.go
@@ -99,22 +99,7 @@ func TestAccGitlabProjectCluster_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabProjectCluster_import(t *testing.T) {
-	rInt := acctest.RandInt()
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:          func() { testAccRequiresLessThan(t, "15.0") },
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabProjectClusterDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabProjectClusterConfig(rInt, true),
-			},
+			// Verify Import
 			{
 				ResourceName:            "gitlab_project_cluster.foo",
 				ImportState:             true,
diff --git a/internal/provider/resource_gitlab_project_freeze_period_test.go b/internal/provider/resource_gitlab_project_freeze_period_test.go
@@ -33,6 +33,12 @@ func TestAccGitlabProjectFreezePeriod_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_project_freeze_period.schedule",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the freeze period to change the parameters
 			{
 				Config: testAccGitlabProjectFreezePeriodUpdateConfig(rInt),
@@ -45,6 +51,12 @@ func TestAccGitlabProjectFreezePeriod_basic(t *testing.T) {
 					}),
 				),
 			},
+			// Verify Import
+			{
+				ResourceName:      "gitlab_project_freeze_period.schedule",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			// Update the freeze period to get back to initial settings
 			{
 				Config: testAccGitlabProjectFreezePeriodConfig(rInt),
@@ -57,21 +69,7 @@ func TestAccGitlabProjectFreezePeriod_basic(t *testing.T) {
 					}),
 				),
 			},
-		},
-	})
-}
-
-// lintignore: AT002 // TODO: Resolve this tfproviderlint issue
-func TestAccGitlabProjectFreezePeriod_import(t *testing.T) {
-	rInt := acctest.RandInt()
-
-	resource.Test(t, resource.TestCase{
-		ProviderFactories: providerFactories,
-		CheckDestroy:      testAccCheckGitlabProjectDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccGitlabProjectFreezePeriodConfig(rInt),
-			},
+			// Verify Import
 			{
 				ResourceName:      "gitlab_project_freeze_period.schedule",
 				ImportState:       true,
diff --git a/internal/provider/resource_gitlab_project_level_mr_approvals_test.go b/internal/provider/resource_gitlab_project_level_mr_approvals_test.go
diff --git a/internal/provider/resource_gitlab_service_github_test.go b/internal/provider/resource_gitlab_service_github_test.go
diff --git a/internal/provider/resource_gitlab_service_pipelines_email_test.go b/internal/provider/resource_gitlab_service_pipelines_email_test.go
diff --git a/internal/provider/resource_gitlab_service_slack_test.go b/internal/provider/resource_gitlab_service_slack_test.go
diff --git a/internal/provider/resource_gitlab_tag_protection_test.go b/internal/provider/resource_gitlab_tag_protection_test.go
