chore: fix tests

Author: domenicsim1

octopusdeploy/test_helpers_test.go

@@ -0,0 +1,38 @@
+package octopusdeploy
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+)
+
+// testAccProjectGroup creates a project group configuration for testing
+func testAccProjectGroup(localName string, name string) string {
+	return fmt.Sprintf(`resource "octopusdeploy_project_group" "%s" {
+		name = "%s"
+	}`, localName, name)
+}
+
+// testAccProjectGroupCheckDestroy checks that all project groups have been destroyed
+func testAccProjectGroupCheckDestroy(s *terraform.State) error {
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "octopusdeploy_project_group" {
+			continue
+		}
+
+		if projectGroup, err := octoClient.ProjectGroups.GetByID(rs.Primary.ID); err == nil {
+			return fmt.Errorf("project group (%s) still exists", projectGroup.GetID())
+		}
+	}
+
+	return nil
+}
+
+// testAwsAccount creates an AWS account configuration for testing
+func testAwsAccount(localName string, name string, accessKey string, secretKey string) string {
+	return fmt.Sprintf(`resource "octopusdeploy_aws_account" "%s" {
+		access_key = "%s"
+		name       = "%s"
+		secret_key = "%s"
+	}`, localName, accessKey, name, secretKey)
+}

octopusdeploy_framework/resource_project_group_test.go

@@ -24,7 +24,7 @@ func TestAccOctopusDeployProjectGroupBasic(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Check: resource.ComposeTestCheckFunc(
-					testProjectGroupExists(prefix),
+					testOctopusDeployProjectGroupExists(prefix),
 					resource.TestCheckResourceAttrSet(prefix, "id"),
 					resource.TestCheckResourceAttr(prefix, "name", name),
 					resource.TestCheckResourceAttr(prefix, "description", description),
@@ -53,15 +53,15 @@ func TestAccOctopusDeployProjectGroupUpdate(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Check: resource.ComposeTestCheckFunc(
-					testProjectGroupExists(prefix),
+					testOctopusDeployProjectGroupExists(prefix),
 					resource.TestCheckResourceAttr(prefix, "name", name),
 					resource.TestCheckResourceAttr(prefix, "description", description),
 				),
 				Config: testProjectGroupBasic(localName, name, description),
 			},
 			{
 				Check: resource.ComposeTestCheckFunc(
-					testProjectGroupExists(prefix),
+					testOctopusDeployProjectGroupExists(prefix),
 					resource.TestCheckResourceAttr(prefix, "name", newName),
 					resource.TestCheckResourceAttr(prefix, "description", newDescription),
 				),
@@ -84,7 +84,7 @@ func TestAccOctopusDeployProjectGroupMinimal(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Check: resource.ComposeTestCheckFunc(
-					testProjectGroupExists(prefix),
+					testOctopusDeployProjectGroupExists(prefix),
 					resource.TestCheckResourceAttrSet(prefix, "id"),
 					resource.TestCheckResourceAttr(prefix, "name", name),
 					resource.TestCheckResourceAttr(prefix, "description", ""),
@@ -136,7 +136,7 @@ func testProjectGroupMinimal(localName string, name string) string {
 	}`, localName, name)
 }
 
-func testProjectGroupExists(resourceName string) resource.TestCheckFunc {
+func testOctopusDeployProjectGroupExists(resourceName string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[resourceName]
 		if !ok {