fix: refactor tests

cloudflare · Dec 20, 2024 · 517c699 · 517c699
1 parent 5cc721a
commit 517c699
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/internal/services/api_shield_operation/custom.go b/internal/services/api_shield_operation/custom.go
diff --git a/internal/services/api_shield_operation/resource_test.go b/internal/services/api_shield_operation/resource_test.go
@@ -41,9 +41,6 @@ func TestAccCloudflareAPIShieldOperation_Create(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceID, "method", "GET"),
 					resource.TestCheckResourceAttr(resourceID, "host", domain),
 					resource.TestCheckResourceAttr(resourceID, "endpoint", "/example/path"),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.method", "GET"),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.host", domain),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.endpoint", "/example/path"),
 				),
 			},
 		},
@@ -74,9 +71,6 @@ func TestAccCloudflareAPIShieldOperation_ForceNew(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceID, "method", "GET"),
 					resource.TestCheckResourceAttr(resourceID, "host", domain),
 					resource.TestCheckResourceAttr(resourceID, "endpoint", "/example/path"),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.method", "GET"),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.host", domain),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.endpoint", "/example/path"),
 				),
 			},
 			{
@@ -86,17 +80,14 @@ func TestAccCloudflareAPIShieldOperation_ForceNew(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceID, "method", "POST"), // check that we've 'updated' the value
 					resource.TestCheckResourceAttr(resourceID, "host", domain),
 					resource.TestCheckResourceAttr(resourceID, "endpoint", "/example/path"),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.method", "POST"), // check that we've 'updated' the value
-					resource.TestCheckResourceAttr(resourceID, "operations.0.host", domain),
-					resource.TestCheckResourceAttr(resourceID, "operations.0.endpoint", "/example/path"),
 				),
 			},
 		},
 	})
 }
 
 func testAccCheckAPIShieldOperationDelete(s *terraform.State) error {
-	client := acctest.SharedClient() // TODO(terraform): replace with SharedV2Clent
+	client := acctest.SharedClient()
 
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "cloudflare_api_shield_operation" {

diff --git a/internal/services/api_shield_operation/testdata/apishieldoperation.tf b/internal/services/api_shield_operation/testdata/apishieldoperation.tf
@@ -1,10 +1,6 @@
 resource "cloudflare_api_shield_operation" "%[1]s" {
-	zone_id = "%[2]s"
-	operations = [
-		{
-			method = "%[3]s"
-			host = "%[4]s"
-			endpoint = "%[5]s"
-		}
-	]
-}
+	zone_id  = "%[2]s"
+	method   = "%[3]s"
+	host     = "%[4]s"
+	endpoint = "%[5]s"
+}