Fixes autoclass permadiff issue (#10716) (#18197)

[upstream:098126f39d5bc12cb78a5069a8c68a3079b7e62c] Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · May 20, 2024 · c25b2b2 · c25b2b2
1 parent b44c535
commit c25b2b2
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 0 deletions.
diff --git a/google/services/storage/resource_storage_bucket.go b/google/services/storage/resource_storage_bucket.go
@@ -332,6 +332,14 @@ func ResourceStorageBucket() *schema.Resource {
 							return true
 						}
 					}
+					if new == "0" && old == "1" {
+						n := d.Get(strings.TrimSuffix(k, ".#"))
+						l = n.([]interface{})
+						contents := l[0].(map[string]interface{})
+						if contents["enabled"] == false {
+							return true
+						}
+					}
 					return false
 				},
 			},
@@ -755,6 +763,11 @@ func resourceStorageBucketUpdate(d *schema.ResourceData, meta interface{}) error
 	if d.HasChange("autoclass") {
 		if v, ok := d.GetOk("autoclass"); ok {
 			sb.Autoclass = expandBucketAutoclass(v)
+		} else {
+			sb.Autoclass = &storage.BucketAutoclass{
+				Enabled:         false,
+				ForceSendFields: []string{"Enabled"},
+			}
 		}
 	}
 

diff --git a/google/services/storage/resource_storage_bucket_test.go b/google/services/storage/resource_storage_bucket_test.go
@@ -110,6 +110,73 @@ func TestAccStorageBucket_basicWithAutoclass(t *testing.T) {
 	})
 }
 
+func TestAccStorageBucket_AutoclassDiffSupress(t *testing.T) {
+	t.Parallel()
+
+	var bucket storage.Bucket
+	bucketName := acctest.TestBucketName(t)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccStorageBucketDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccStorageBucket_basic(bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckStorageBucketExists(
+						t, "google_storage_bucket.bucket", bucketName, &bucket),
+				),
+			},
+			{
+				ResourceName:            "google_storage_bucket.bucket",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"force_destroy"},
+			},
+			{
+				Config: testAccStorageBucket_basicWithAutoclass(bucketName, false),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckStorageBucketExists(
+						t, "google_storage_bucket.bucket", bucketName, &bucket),
+				),
+			},
+			{
+				ResourceName:            "google_storage_bucket.bucket",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"force_destroy"},
+			},
+			{
+				Config: testAccStorageBucket_basicWithAutoclass(bucketName, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckStorageBucketExists(
+						t, "google_storage_bucket.bucket", bucketName, &bucket),
+				),
+			},
+			{
+				ResourceName:            "google_storage_bucket.bucket",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"force_destroy"},
+			},
+			{
+				Config: testAccStorageBucket_basic(bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckStorageBucketExists(
+						t, "google_storage_bucket.bucket", bucketName, &bucket),
+				),
+			},
+			{
+				ResourceName:            "google_storage_bucket.bucket",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"force_destroy"},
+			},
+		},
+	})
+}
+
 func TestAccStorageBucket_requesterPays(t *testing.T) {
 	t.Parallel()