test without destroy

OctopusDeployLabs · Dec 8, 2024 · d00d227 · d00d227
1 parent d524c2c
commit d00d227
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/octopusdeploy_framework/resource_git_trigger.go b/octopusdeploy_framework/resource_git_trigger.go
@@ -162,12 +162,10 @@ func (r *gitTriggerResource) Delete(ctx context.Context, req resource.DeleteRequ
 
 	client := r.Config.Client
 
-	project := projects.NewProject(data.ProjectId.ValueString(), data.SpaceId.ValueString(), "")
-	projectTrigger := triggers.NewProjectTrigger(data.Name.ValueString(), data.Description.ValueString(), data.IsDisabled.ValueBool(), project, nil, nil)
-	projectTrigger.ID = data.ID.ValueString()
+	projectTriggers, _ := client.ProjectTriggers.GetAll()
 
-	if err := client.ProjectTriggers.Delete(projectTrigger); err != nil {
-		reason := fmt.Sprintf("unable to delete Git Trigger '%s' with space '%s'", client.GetSpaceID(), data.SpaceId.ValueString())
+	if err := client.ProjectTriggers.DeleteByID(data.ID.ValueString()); err != nil {
+		reason := fmt.Sprintf("unable to delete Git Trigger '%s' with space '%s', count of triggers: %d, name: '%s'", client.GetSpaceID(), data.SpaceId.ValueString(), len(projectTriggers), projectTriggers[0].Filter.GetFilterType())
 		resp.Diagnostics.AddError(reason, err.Error())
 		return
 	}

diff --git a/octopusdeploy_framework/resource_git_trigger_test.go b/octopusdeploy_framework/resource_git_trigger_test.go
@@ -72,7 +72,6 @@ func TestAccOctopusDeployGitTrigger(t *testing.T) {
 	//}
 
 	resource.Test(t, resource.TestCase{
-		CheckDestroy:             func(s *terraform.State) error { return testGitTriggerCheckDestroy(s) },
 		PreCheck:                 func() { TestAccPreCheck(t) },
 		ProtoV6ProviderFactories: ProtoV6ProviderFactories(),
 		Steps: []resource.TestStep{