Storage autoclass DSF (#8137) (#14902)

* Add DSF for empty object in storage bucket autoclass

* Remove extra test step

* Write specific DSF for storage autoclass

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

Author: modular-magician

.changelog/8137.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+storage: fixed a bug in `google_storage_bucket` that caused a permadiff when the `autoclass.enabled` field was explicitly set to false
+```

google/resource_storage_bucket.go

@@ -269,8 +269,25 @@ func ResourceStorageBucket() *schema.Resource {
 					},
 				},
 				Description: `The bucket's autoclass configuration.`,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					_, n := d.GetChange(strings.TrimSuffix(k, ".#"))
+					if !strings.HasSuffix(k, ".#") {
+						return false
+					}
+					var l []interface{}
+					if new == "1" && old == "0" {
+						l = n.([]interface{})
+						contents, ok := l[0].(map[string]interface{})
+						if !ok {
+							return false
+						}
+						if contents["enabled"] == false {
+							return true
+						}
+					}
+					return false
+				},
 			},
-
 			"website": {
 				Type:     schema.TypeList,
 				Optional: true,

google/resource_storage_bucket_test.go

@@ -67,7 +67,21 @@ func TestAccStorageBucket_basicWithAutoclass(t *testing.T) {
 		CheckDestroy:             testAccStorageBucketDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccStorageBucket_basicWithAutoclass(bucketName),
+				Config: testAccStorageBucket_basicWithAutoclass(bucketName, true),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"google_storage_bucket.bucket", "force_destroy", "false"),
+				),
+			},
+			{
+				ResourceName:            "google_storage_bucket.bucket",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"force_destroy"},
+			},
+			// Autoclass is ForceNew, so this destroys & recreates, but does test the explicitly disabled config
+			{
+				Config: testAccStorageBucket_basicWithAutoclass(bucketName, false),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(
 						"google_storage_bucket.bucket", "force_destroy", "false"),
@@ -1359,16 +1373,16 @@ resource "google_storage_bucket" "bucket" {
 `, bucketName)
 }
 
-func testAccStorageBucket_basicWithAutoclass(bucketName string) string {
+func testAccStorageBucket_basicWithAutoclass(bucketName string, autoclass bool) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
   name     = "%s"
   location = "US"
   autoclass  {
-    enabled  = true
+    enabled  = %t
   }
 }
-`, bucketName)
+`, bucketName, autoclass)
 }
 
 func testAccStorageBucket_requesterPays(bucketName string, pays bool) string {