feat: sweepers for workers_kv and zero_trust_list (#6281)

Author: tamas-jozsa

internal/services/workers_kv/resource_test.go

@@ -3,6 +3,7 @@ package workers_kv_test
 import (
 	"context"
 	"fmt"
+	"log"
 	"os"
 	"regexp"
 	"strings"
@@ -21,6 +22,59 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
 )
 
+func TestMain(m *testing.M) {
+	resource.TestMain(m)
+}
+
+func init() {
+	resource.AddTestSweepers("cloudflare_workers_kv", &resource.Sweeper{
+		Name: "cloudflare_workers_kv",
+		F:    testSweepCloudflareWorkersKV,
+	})
+}
+
+func testSweepCloudflareWorkersKV(r string) error {
+	ctx := context.Background()
+	client := acctest.SharedClient()
+	accountID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
+	
+	if accountID == "" {
+		return nil
+	}
+
+	// List all KV namespaces
+	namespaces, err := client.KV.Namespaces.List(ctx, kv.NamespaceListParams{
+		AccountID: cloudflare.F(accountID),
+	})
+	if err != nil {
+		log.Printf("[ERROR] Failed to fetch KV namespaces: %s", err)
+		return err
+	}
+
+	for _, namespace := range namespaces.Result {
+		// List keys in this namespace
+		keys, err := client.KV.Namespaces.Keys.List(ctx, namespace.ID, kv.NamespaceKeyListParams{
+			AccountID: cloudflare.F(accountID),
+		})
+		if err != nil {
+			log.Printf("[ERROR] Failed to fetch KV keys for namespace %s: %s", namespace.ID, err)
+			continue
+		}
+
+		// Delete all keys in the namespace (sweepers clean up everything from test accounts)
+		for _, key := range keys.Result {
+			_, err := client.KV.Namespaces.Values.Delete(ctx, namespace.ID, key.Name, kv.NamespaceValueDeleteParams{
+				AccountID: cloudflare.F(accountID),
+			})
+			if err != nil {
+				log.Printf("[ERROR] Failed to delete KV key %s in namespace %s: %s", key.Name, namespace.ID, err)
+			}
+		}
+	}
+
+	return nil
+}
+
 func TestAccCloudflareWorkersKV_Basic(t *testing.T) {
 	name := utils.GenerateRandomResourceName()
 	key := utils.GenerateRandomResourceName()

internal/services/workers_kv_namespace/resource_test.go

@@ -3,6 +3,7 @@ package workers_kv_namespace_test
 import (
 	"context"
 	"fmt"
+	"log"
 	"os"
 	"regexp"
 	"strings"
@@ -21,6 +22,48 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
 )
 
+func TestMain(m *testing.M) {
+	resource.TestMain(m)
+}
+
+func init() {
+	resource.AddTestSweepers("cloudflare_workers_kv_namespace", &resource.Sweeper{
+		Name: "cloudflare_workers_kv_namespace",
+		F:    testSweepCloudflareWorkersKVNamespace,
+	})
+}
+
+func testSweepCloudflareWorkersKVNamespace(r string) error {
+	ctx := context.Background()
+	client := acctest.SharedClient()
+	accountID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
+	
+	if accountID == "" {
+		return nil
+	}
+
+	// List all KV namespaces
+	namespaces, err := client.KV.Namespaces.List(ctx, kv.NamespaceListParams{
+		AccountID: cloudflare.F(accountID),
+	})
+	if err != nil {
+		log.Printf("[ERROR] Failed to fetch KV namespaces: %s", err)
+		return err
+	}
+
+	// Delete all namespaces (sweepers clean up everything from test accounts)
+	for _, namespace := range namespaces.Result {
+		_, err := client.KV.Namespaces.Delete(ctx, namespace.ID, kv.NamespaceDeleteParams{
+			AccountID: cloudflare.F(accountID),
+		})
+		if err != nil {
+			log.Printf("[ERROR] Failed to delete KV namespace %s (%s): %s", namespace.Title, namespace.ID, err)
+		}
+	}
+
+	return nil
+}
+
 func TestAccCloudflareWorkersKVNamespace_Basic(t *testing.T) {
 	rnd := utils.GenerateRandomResourceName()
 	newRnd := utils.GenerateRandomResourceName()

internal/services/zero_trust_list/resource_test.go

@@ -3,12 +3,15 @@ package zero_trust_list_test
 import (
 	"context"
 	"fmt"
+	"log"
 	"os"
 	"strconv"
 	"strings"
 	"testing"
 
 	"github.com/cloudflare/cloudflare-go"
+	cfv6 "github.com/cloudflare/cloudflare-go/v6"
+	"github.com/cloudflare/cloudflare-go/v6/zero_trust"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/consts"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
@@ -21,6 +24,48 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
 )
 
+func TestMain(m *testing.M) {
+	resource.TestMain(m)
+}
+
+func init() {
+	resource.AddTestSweepers("cloudflare_zero_trust_list", &resource.Sweeper{
+		Name: "cloudflare_zero_trust_list",
+		F:    testSweepCloudflareZeroTrustList,
+	})
+}
+
+func testSweepCloudflareZeroTrustList(r string) error {
+	ctx := context.Background()
+	client := acctest.SharedClient()
+	accountID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
+	
+	if accountID == "" {
+		return nil
+	}
+	
+	// List all zero trust lists
+	page, err := client.ZeroTrust.Gateway.Lists.List(ctx, zero_trust.GatewayListListParams{
+		AccountID: cfv6.F(accountID),
+	})
+	if err != nil {
+		log.Printf("[ERROR] Failed to fetch zero trust lists: %s", err)
+		return err
+	}
+
+	// Delete all lists (sweepers clean up everything from test accounts)
+	for _, list := range page.Result {
+		_, err := client.ZeroTrust.Gateway.Lists.Delete(ctx, list.ID, zero_trust.GatewayListDeleteParams{
+			AccountID: cfv6.F(accountID),
+		})
+		if err != nil {
+			log.Printf("[ERROR] Failed to delete zero trust list %s (%s): %s", list.Name, list.ID, err)
+		}
+	}
+
+	return nil
+}
+
 func TestAccCloudflareTeamsList_Basic(t *testing.T) {
 	// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the Access
 	// service does not yet support the API tokens and it results in