Merge pull request #1160 from timofurrer/testing/destroy-checks

Refactor destory checks to check for resource under test

Author: RicePatrick

internal/provider/resource_gitlab_label_test.go

@@ -141,17 +141,16 @@ func testAccCheckGitlabLabelAttributes(label *gitlab.Label, want *testAccGitlabL
 
 func testAccCheckGitlabLabelDestroy(s *terraform.State) error {
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "gitlab_project" {
+		if rs.Type != "gitlab_label" {
 			continue
 		}
 
-		gotRepo, _, err := testGitlabClient.Projects.GetProject(rs.Primary.ID, nil)
+		project := rs.Primary.Attributes["project"]
+		labelName := rs.Primary.ID
+
+		_, _, err := testGitlabClient.Labels.GetLabel(project, labelName)
 		if err == nil {
-			if gotRepo != nil && fmt.Sprintf("%d", gotRepo.ID) == rs.Primary.ID {
-				if gotRepo.MarkedForDeletionAt == nil {
-					return fmt.Errorf("Repository still exists")
-				}
-			}
+			return fmt.Errorf("Label %s in project %s still exists", labelName, project)
 		}
 		if !is404(err) {
 			return err

internal/provider/resource_gitlab_pipeline_trigger_test.go

@@ -140,17 +140,19 @@ func testAccCheckGitlabPipelineTriggerAttributes(trigger *gitlab.PipelineTrigger
 
 func testAccCheckGitlabPipelineTriggerDestroy(s *terraform.State) error {
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "gitlab_project" {
+		if rs.Type != "gitlab_pipeline_trigger" {
 			continue
 		}
 
-		gotRepo, _, err := testGitlabClient.Projects.GetProject(rs.Primary.ID, nil)
+		project := rs.Primary.Attributes["project"]
+		pipelineTriggerID, err := strconv.Atoi(rs.Primary.ID)
+		if err != nil {
+			return err
+		}
+
+		_, _, err = testGitlabClient.PipelineTriggers.GetPipelineTrigger(project, pipelineTriggerID)
 		if err == nil {
-			if gotRepo != nil && fmt.Sprintf("%d", gotRepo.ID) == rs.Primary.ID {
-				if gotRepo.MarkedForDeletionAt == nil {
-					return fmt.Errorf("Repository still exists")
-				}
-			}
+			return fmt.Errorf("Pipeline Trigger %d in project %s still exists", pipelineTriggerID, project)
 		}
 		if !is404(err) {
 			return err

internal/provider/resource_gitlab_project_hook_test.go

@@ -193,17 +193,19 @@ func testAccCheckGitlabProjectHookAttributes(hook *gitlab.ProjectHook, want *tes
 
 func testAccCheckGitlabProjectHookDestroy(s *terraform.State) error {
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "gitlab_project" {
+		if rs.Type != "gitlab_project_hook" {
 			continue
 		}
 
-		gotRepo, _, err := testGitlabClient.Projects.GetProject(rs.Primary.ID, nil)
+		project := rs.Primary.Attributes["project"]
+		hookID, err := strconv.Atoi(rs.Primary.ID)
+		if err != nil {
+			return err
+		}
+
+		_, _, err = testGitlabClient.Projects.GetProjectHook(project, hookID)
 		if err == nil {
-			if gotRepo != nil && fmt.Sprintf("%d", gotRepo.ID) == rs.Primary.ID {
-				if gotRepo.MarkedForDeletionAt == nil {
-					return fmt.Errorf("Repository still exists")
-				}
-			}
+			return fmt.Errorf("Project Hook %d in project %s still exists", hookID, project)
 		}
 		if !is404(err) {
 			return err

internal/provider/resource_gitlab_service_jira_test.go

@@ -121,17 +121,15 @@ func testAccCheckGitlabServiceJiraExists(n string, service *gitlab.JiraService)
 
 func testAccCheckGitlabServiceJiraDestroy(s *terraform.State) error {
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "gitlab_project" {
+		if rs.Type != "gitlab_service_jira" {
 			continue
 		}
 
-		gotRepo, _, err := testGitlabClient.Projects.GetProject(rs.Primary.ID, nil)
+		project := rs.Primary.ID
+
+		_, _, err := testGitlabClient.Services.GetJiraService(project)
 		if err == nil {
-			if gotRepo != nil && fmt.Sprintf("%d", gotRepo.ID) == rs.Primary.ID {
-				if gotRepo.MarkedForDeletionAt == nil {
-					return fmt.Errorf("Repository still exists")
-				}
-			}
+			return fmt.Errorf("Jira Service Integration in project %s still exists", project)
 		}
 		if !is404(err) {
 			return err

internal/provider/resource_gitlab_service_slack_test.go

@@ -155,17 +155,15 @@ func testAccCheckGitlabServiceExists(n string, service *gitlab.SlackService) res
 
 func testAccCheckGitlabServiceSlackDestroy(s *terraform.State) error {
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "gitlab_project" {
+		if rs.Type != "gitlab_service_slack" {
 			continue
 		}
 
-		gotRepo, _, err := testGitlabClient.Projects.GetProject(rs.Primary.ID, nil)
+		project := rs.Primary.ID
+
+		_, _, err := testGitlabClient.Services.GetSlackService(project)
 		if err == nil {
-			if gotRepo != nil && fmt.Sprintf("%d", gotRepo.ID) == rs.Primary.ID {
-				if gotRepo.MarkedForDeletionAt == nil {
-					return fmt.Errorf("Repository still exists")
-				}
-			}
+			return fmt.Errorf("Slack Service Integration in project %s still exists", project)
 		}
 		if !is404(err) {
 			return err