fix: makes the tests idempotent

Author: zacharyblasczyk

internal/provider/environment_data_source_test.go

@@ -16,15 +16,15 @@ func TestAccEnvironmentDataSource(t *testing.T) {
 	rName := acctest.RandString(8)
 	systemName := fmt.Sprintf("test-system-%s", rName)
 	envName := fmt.Sprintf("test-env-%s", rName)
-	complexName := fmt.Sprintf("complex-%s", envName)
+	complexName := fmt.Sprintf("complex-%s", rName)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			// Test basic configuration
 			{
-				Config: testAccEnvironmentDataSourceConfigSetup(systemName, envName) +
+				Config: testAccEnvironmentDataSourceConfigSetup(systemName, envName, complexName) +
 					testAccEnvironmentDataSourceConfigBasic(envName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.ctrlplane_environment.test", "name", envName),
@@ -35,7 +35,7 @@ func TestAccEnvironmentDataSource(t *testing.T) {
 			},
 			// Test complex filter
 			{
-				Config: testAccEnvironmentDataSourceConfigSetup(systemName, envName) +
+				Config: testAccEnvironmentDataSourceConfigSetup(systemName, envName, complexName) +
 					testAccEnvironmentDataSourceConfigComplex(complexName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.ctrlplane_environment.test_complex", "name", complexName),
@@ -46,7 +46,7 @@ func TestAccEnvironmentDataSource(t *testing.T) {
 			},
 			// Test with complex filter
 			{
-				Config: testAccEnvironmentDataSourceConfigWithComplexFilter(systemName, envName),
+				Config: testAccEnvironmentDataSourceConfigWithComplexFilter(systemName, envName, complexName),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.ctrlplane_environment.test_complex", "id"),
 					resource.TestCheckResourceAttr("data.ctrlplane_environment.test_complex", "name", complexName),
@@ -60,27 +60,28 @@ func TestAccEnvironmentDataSource(t *testing.T) {
 }
 
 func TestAccEnvironmentDataSourceErrorHandling(t *testing.T) {
-	// Define the tests for error handling
+	rName := acctest.RandString(8)
+	nonExistentEnvName := fmt.Sprintf("non-existent-env-%s", rName)
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
 		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
+			// Test with missing name (should fail)
 			{
-				Config: testAccEnvironmentDataSourceConfigMissingName(),
-				// Test for missing required field (name)
+				Config:      testAccEnvironmentDataSourceConfigMissingName(),
 				ExpectError: regexp.MustCompile(`The argument "name" is required`),
 			},
+			// Test with a non-existent environment name (should fail)
 			{
-				// Test for non-existent environment
-				Config:      testAccEnvironmentDataSourceConfigNonExistentEnv(),
+				Config:      testAccEnvironmentDataSourceConfigNonExistentEnv(nonExistentEnvName),
 				ExpectError: regexp.MustCompile(`Environment Not Found`),
 			},
 		},
 	})
 }
 
-func testAccEnvironmentDataSourceConfigSetup(systemName, envName string) string {
-	complexName := fmt.Sprintf("complex-%s", envName)
+func testAccEnvironmentDataSourceConfigSetup(systemName, envName, complexName string) string {
 	return fmt.Sprintf(`
 resource "ctrlplane_system" "test" {
   name        = "%[1]s"
@@ -93,38 +94,40 @@ resource "ctrlplane_environment" "test" {
   system_id   = ctrlplane_system.test.id
   description = "Test environment"
   metadata = {
-    key1 = "value1"
-    key2 = "value2"
+    "key1" = "value1"
+    "key2" = "value2"
+    "test" = "true"
   }
   resource_filter = {
-    type  = "metadata"
-    key   = "environment"
+    type     = "metadata"
+    key      = "environment"
     operator = "equals"
-    value = "staging"
+    value    = "production"
   }
 }
 
 resource "ctrlplane_environment" "test_complex" {
   name        = "%[3]s"
   system_id   = ctrlplane_system.test.id
-  description = "Test environment with complex filter"
+  description = "Complex environment"
   metadata = {
-    test = "true"
+    "key1"    = "complex_value"
+    "complex" = "true"
   }
   resource_filter = {
-    type      = "comparison"
-    operator  = "and"
+    type     = "comparison"
+    operator = "and"
     conditions = [
       {
         type     = "metadata"
         key      = "environment"
         operator = "equals"
-        value    = "staging"
+        value    = "production"
       },
       {
-        type     = "kind"
-        operator = "equals"
-        value    = "Deployment"
+        type     = "name"
+        operator = "contains"
+        value    = "api"
       }
     ]
   }
@@ -141,39 +144,45 @@ data "ctrlplane_environment" "test" {
 `, envName)
 }
 
-func testAccEnvironmentDataSourceConfigWithComplexFilter(systemName, envName string) string {
+func testAccEnvironmentDataSourceConfigWithComplexFilter(systemName, envName, complexName string) string {
 	return fmt.Sprintf(`
 %s
 
 data "ctrlplane_environment" "test_complex" {
-  name      = ctrlplane_environment.test_complex.name
+  name      = "%[2]s"
   system_id = ctrlplane_system.test.id
 }
-`, testAccEnvironmentDataSourceConfigSetup(systemName, envName))
+`, testAccEnvironmentDataSourceConfigSetup(systemName, envName, complexName), complexName)
 }
 
 func testAccEnvironmentDataSourceConfigMissingName() string {
 	return `
+resource "ctrlplane_system" "test" {
+  name        = "test-system-missing-name"
+  slug        = "test-system-missing-name"
+  description = "Test system"
+}
+
 data "ctrlplane_environment" "test" {
-  # Missing name
-  system_id = "00000000-0000-0000-0000-000000000000"
+  # Missing name field
+  system_id = ctrlplane_system.test.id
 }
 `
 }
 
-func testAccEnvironmentDataSourceConfigNonExistentEnv() string {
-	return `
+func testAccEnvironmentDataSourceConfigNonExistentEnv(envName string) string {
+	return fmt.Sprintf(`
 resource "ctrlplane_system" "test" {
   name        = "test-system-nonexistent"
+  slug        = "test-system-nonexistent" 
   description = "Test system"
-  slug        = "test-system-nonexistent"
 }
 
 data "ctrlplane_environment" "test" {
-  name      = "non-existent-environment"
+  name      = "%[1]s"
   system_id = ctrlplane_system.test.id
 }
-`
+`, envName)
 }
 
 func testAccEnvironmentDataSourceConfigComplex(complexName string) string {