Generate sweepers to the service packages (#8128) (#5817)

* Generate sweepers to the service packages

* Remove function AddTestSweepers in the acctest package

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/8128.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/acctest/gcp_sweeper.go

@@ -3,13 +3,9 @@
 package acctest
 
 import (
-	"encoding/hex"
 	"fmt"
-	"hash/crc32"
-	"runtime"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
@@ -59,16 +55,3 @@ func IsSweepableTestResource(resourceName string) bool {
 	}
 	return false
 }
-
-func AddTestSweepers(name string, sweeper func(region string) error) {
-	_, filename, _, _ := runtime.Caller(0)
-	hash := crc32.NewIEEE()
-	hash.Write([]byte(filename))
-	hashedFilename := hex.EncodeToString(hash.Sum(nil))
-	uniqueName := name + "_" + hashedFilename
-
-	resource.AddTestSweepers(uniqueName, &resource.Sweeper{
-		Name: name,
-		F:    sweeper,
-	})
-}

google-beta/gcp_sweeper_test.go

@@ -7,7 +7,123 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accessapproval"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/accesscontextmanager"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/activedirectory"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/alloydb"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigateway"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apigee"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/appengine"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/artifactregistry"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/beyondcorp"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquery"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryanalyticshub"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryconnection"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquerydatapolicy"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigquerydatatransfer"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigqueryreservation"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/bigtable"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/billing"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/binaryauthorization"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/certificatemanager"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudasset"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuild"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudbuildv2"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudfunctions"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudfunctions2"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudidentity"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudids"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudiot"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrun"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudrunv2"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudscheduler"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/cloudtasks"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/compute"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/containeranalysis"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/containerattached"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/databasemigrationservice"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datacatalog"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataform"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datafusion"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datalossprevention"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataplex"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataproc"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dataprocmetastore"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datastore"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/datastream"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/deploymentmanager"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflow"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dialogflowcx"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/dns"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/documentai"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/essentialcontacts"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/filestore"
 	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebase"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasedatabase"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasehosting"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebasestorage"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firestore"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gameservices"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkebackup"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkehub2"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/gkeonprem"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/healthcare"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iam2"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iambeta"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iamworkforcepool"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/iap"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/identityplatform"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/kms"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/memcache"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/mlengine"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/monitoring"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkmanagement"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networksecurity"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkservices"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/notebooks"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/orgpolicy"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/osconfig"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/oslogin"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/privateca"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/publicca"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsub"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/pubsublite"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/redis"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/resourcemanager"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/runtimeconfig"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/secretmanager"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securitycenter"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/securityscanner"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicedirectory"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/servicemanagement"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/serviceusage"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/sourcerepo"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/spanner"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/sql"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storage"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/storagetransfer"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/tags"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/tpu"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vertexai"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vmwareengine"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/vpcaccess"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workflows"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/workstations"
+
+	// Manually add the services for DCL resource and handwritten resource sweepers if they are not in the above list
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/apikeys"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/clouddeploy"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/composer"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/container"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/containeraws"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/containerazure"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/eventarc"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebase"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/firebaserules"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/networkconnectivity"
+	_ "github.com/hashicorp/terraform-provider-google-beta/google-beta/services/recaptchaenterprise"
 )
 
 func TestMain(m *testing.M) {

google-beta/resource_access_context_manager_access_policy_test.go

@@ -3,10 +3,7 @@
 package google
 
 import (
-	"context"
 	"fmt"
-	"log"
-	neturl "net/url"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -16,78 +13,6 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
-func init() {
-	resource.AddTestSweepers("gcp_access_context_manager_policy", &resource.Sweeper{
-		Name: "gcp_access_context_manager_policy",
-		F:    testSweepAccessContextManagerPolicies,
-	})
-}
-
-func testSweepAccessContextManagerPolicies(region string) error {
-	config, err := acctest.SharedConfigForRegion(region)
-	if err != nil {
-		log.Fatalf("error getting shared config for region %q: %s", region, err)
-	}
-
-	err = config.LoadAndValidate(context.Background())
-	if err != nil {
-		log.Fatalf("error loading and validating shared config for region %q: %s", region, err)
-	}
-
-	testOrg := acctest.GetTestOrgFromEnv(nil)
-	if testOrg == "" {
-		log.Printf("test org not set for test environment, skip sweep")
-		return nil
-	}
-
-	log.Printf("[DEBUG] Listing Access Policies for org %q", testOrg)
-
-	parent := neturl.QueryEscape(fmt.Sprintf("organizations/%s", testOrg))
-	listUrl := fmt.Sprintf("%saccessPolicies?parent=%s", config.AccessContextManagerBasePath, parent)
-
-	resp, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "GET",
-		RawURL:    listUrl,
-		UserAgent: config.UserAgent,
-	})
-	if err != nil && !transport_tpg.IsGoogleApiErrorWithCode(err, 404) {
-		log.Printf("unable to list AccessPolicies for organization %q: %v", testOrg, err)
-		return nil
-	}
-	var policies []interface{}
-	if resp != nil {
-		if v, ok := resp["accessPolicies"]; ok {
-			policies = v.([]interface{})
-		}
-	}
-
-	if len(policies) == 0 {
-		log.Printf("[DEBUG] no access policies found, exiting sweeper")
-		return nil
-	}
-	if len(policies) > 1 {
-		log.Printf("unexpected - more than one access policies found, change the tests")
-		return nil
-	}
-
-	policy := policies[0].(map[string]interface{})
-	log.Printf("[DEBUG] Deleting test Access Policies %q", policy["name"])
-
-	policyUrl := config.AccessContextManagerBasePath + policy["name"].(string)
-	if _, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
-		Config:    config,
-		Method:    "DELETE",
-		RawURL:    policyUrl,
-		UserAgent: config.UserAgent,
-	}); err != nil && !transport_tpg.IsGoogleApiErrorWithCode(err, 404) {
-		log.Printf("unable to delete access policy %q", policy["name"].(string))
-		return nil
-	}
-
-	return nil
-}
-
 // Since each test here is acting on the same organization and only one AccessPolicy
 // can exist, they need to be run serially
 func TestAccAccessContextManager(t *testing.T) {

google-beta/resource_cloudfunctions_function_test.go

@@ -5,9 +5,7 @@ package google
 import (
 	"bytes"
 	"fmt"
-	"log"
 	"os"
-	"strings"
 	"testing"
 
 	"archive/zip"
@@ -31,14 +29,6 @@ const testBucketTriggerPath = "./test-fixtures/cloudfunctions/bucket_trigger.js"
 const testFirestoreTriggerPath = "./test-fixtures/cloudfunctions/firestore_trigger.js"
 const testSecretEnvVarFunctionPath = "./test-fixtures/cloudfunctions/secret_environment_variables.js"
 const testSecretVolumesMountFunctionPath = "./test-fixtures/cloudfunctions/secret_volumes_mount.js"
-const testFunctionsSourceArchivePrefix = "cloudfunczip"
-
-func init() {
-	resource.AddTestSweepers("gcp_cloud_function_source_archive", &resource.Sweeper{
-		Name: "gcp_cloud_function_source_archive",
-		F:    sweepCloudFunctionSourceZipArchives,
-	})
-}
 
 func TestAccCloudFunctionsFunction_basic(t *testing.T) {
 	t.Parallel()
@@ -684,28 +674,6 @@ func createZIPArchiveForCloudFunctionSource(t *testing.T, sourcePath string) str
 	return tmpfile.Name()
 }
 
-func sweepCloudFunctionSourceZipArchives(_ string) error {
-	files, err := ioutil.ReadDir(os.TempDir())
-	if err != nil {
-		log.Printf("Error reading files: %s", err)
-		return nil
-	}
-	for _, f := range files {
-		if f.IsDir() {
-			continue
-		}
-		if strings.HasPrefix(f.Name(), testFunctionsSourceArchivePrefix) {
-			filepath := fmt.Sprintf("%s/%s", os.TempDir(), f.Name())
-			if err := os.Remove(filepath); err != nil {
-				log.Printf("Error removing files: %s", err)
-				return nil
-			}
-			log.Printf("[INFO] cloud functions sweeper removed old file %s", filepath)
-		}
-	}
-	return nil
-}
-
 func testAccCloudFunctionsFunction_basic(functionName string, bucketName string, zipFilePath string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {