addressed comments

Author: googlyrahman

mmv1/products/storage/AnywhereCache.yaml

@@ -32,14 +32,12 @@ examples:
     primary_resource_id: 'cache'
     vars:
       bucket_name: 'bucket-name'
-    test_vars_overrides:
-      bucket_name: '"anywhere-cache-bucket" + acctest.RandString(t, 10)'
     external_providers: ["time"]
 identity:
   - bucket
   - anywhereCacheId
 custom_code:
-  custom_create: templates/terraform/custom_create/storage_anywhere_cache_custom_create.go.tmpl
+  post_create: templates/terraform/post_create/storage_anywhere_cache_post_create.go.tmpl
 autogen_async: false
 timeouts:
   insert_minutes: 240

mmv1/templates/terraform/custom_create/storage_anywhere_cache_custom_create.go.tmpl

@@ -12,4 +12,5 @@ resource "google_storage_anywhere_cache" "cache" {
   bucket = google_storage_bucket.bucket.name
   zone = "us-central1-f"
   ttl = "3601s"
+  depends_on = [time_sleep.destroy_wait_5000_seconds]
 }

mmv1/templates/terraform/examples/storage_anywhere_cache_basic.tf.tmpl

@@ -0,0 +1,21 @@
+nameVal, ok := opRes["name"].(string)
+if !ok {
+    return fmt.Errorf("opRes['name'] is not a string: %v", opRes["name"])
+}
+
+nameParts := strings.Split(nameVal, "/")
+if len(nameParts) != 6 || nameParts[0] != "projects" || nameParts[2] != "buckets" || nameParts[4] != "anywhereCaches" {
+    return fmt.Errorf("error parsing the anywhereCacheId from %s", nameVal)
+}
+
+anywhereCacheID := nameParts[5]
+if err := d.Set("anywhere_cache_id", anywhereCacheID); err != nil {
+    return err
+}
+
+// This may have caused the ID to update - update it if so.
+id, err = tpgresource.ReplaceVars(d, config, "{{"b/{{bucket}}/anywhereCaches/{{anywhere_cache_id}}"}}")
+if err != nil {
+    return fmt.Errorf("Error constructing id: %s", err)
+}
+d.SetId(id)

mmv1/templates/terraform/post_create/storage_anywhere_cache_post_create.go.tmpl

@@ -3,16 +3,16 @@
 package storage_test
 
 import (
-	"testing"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"testing"
 )
 
 func TestAccStorageAnywhereCache_basic(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"bucket_name":   "anywhere-cache-bucket" + acctest.RandString(t, 10),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 
@@ -34,6 +34,11 @@ func TestAccStorageAnywhereCache_basic(t *testing.T) {
 			},
 			{
 				Config: testAccStorageAnywhereCache_update(context),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_storage_anywhere_cache.cache", plancheck.ResourceActionUpdate),
+					},
+				},
 			},
 			{
 				ResourceName:            "google_storage_anywhere_cache.cache",
@@ -48,7 +53,7 @@ func TestAccStorageAnywhereCache_basic(t *testing.T) {
 func testAccStorageAnywhereCache_full(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name                        = "%{bucket_name}"
+  name                        = "tf-test-bucket-name%{random_suffix}"
   location                    = "US"
 }
 
@@ -60,16 +65,16 @@ resource "time_sleep" "destroy_wait_5000_seconds" {
 resource "google_storage_anywhere_cache" "cache" {
   bucket = google_storage_bucket.bucket.name
   zone = "us-central1-f"
-  admission_policy = "admit-on-first-miss"
   ttl = "3601s"
+  depends_on = [time_sleep.destroy_wait_5000_seconds]
 }
 `, context)
 }
 
 func testAccStorageAnywhereCache_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_storage_bucket" "bucket" {
-  name                        = "%{bucket_name}"
+  name                        = "tf-test-bucket-name%{random_suffix}"
   location                    = "US"
 }
 
@@ -83,6 +88,7 @@ resource "google_storage_anywhere_cache" "cache" {
   zone = "us-central1-f"
   admission_policy = "admit-on-second-miss"
   ttl = "3620s"
+  depends_on = [time_sleep.destroy_wait_5000_seconds]
 }
 `, context)
 }

mmv1/third_party/terraform/services/storage/resource_storage_anywhere_cache_test.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"strings"
 
 	"github.com/hashicorp/terraform-provider-google/google/sweeper"
 	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
@@ -131,13 +130,11 @@ func testSweepStorageBucket(region string) error {
 			continue
 		}
 
-		if strings.HasPrefix(id, "anywhere-cache-bucket") {
-			readyToDeleteBucket := disableAnywhereCacheIfAny(config, id)
-			if !readyToDeleteBucket {
-				log.Printf("[INFO][SWEEPER_LOG] Bucket %s has anywhere caches, requests have been made to backend to disable them, The bucket would be automatically deleted once caches are deleted from bucket", id)
-				bucketWithCaches++
-				continue
-			}
+		readyToDeleteBucket := disableAnywhereCacheIfAny(config, id)
+		if !readyToDeleteBucket {
+			log.Printf("[INFO][SWEEPER_LOG] Bucket %s has anywhere caches, requests have been made to backend to disable them, The bucket would be automatically deleted once caches are deleted from bucket", id)
+			bucketWithCaches++
+			continue
 		}
 
 		deleteUrl := fmt.Sprintf("https://storage.googleapis.com/storage/v1/b/%s", id)

mmv1/third_party/terraform/services/storage/resource_storage_bucket_sweeper.go

@@ -28,7 +28,6 @@ var testResourcePrefixes = []string{
 	"cluster-",            // https://github.com/hashicorp/terraform-provider-google/issues/8924
 	"k8s-fw-",             // firewall rules are getting created and not cleaned up by k8 resources using this prefix
 	"ext-tf-test",         // Cloud Tasks Queues created automatically by tests for `google_firebase_extensions_instance`.
-	"anywhere-cache-bucket", // GCS bucket with anywhere caches on it.
 }
 
 // SharedConfigForRegion returns a common config setup needed for the sweeper