fix(storage-bucket-object): do not delete object on update content, j… (#10038) (#18479)

[upstream:672734df9f9288e14d854871815242b7af410e9f]

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

Author: modular-magician

.changelog/10038.txt

@@ -0,0 +1,4 @@
+```release-note:enhancement
+storage: The update on `google_storage_bucket_object` content is now no more delete to create object, but just push a new object if the content change
+
+```

google/services/storage/resource_storage_bucket_object.go

@@ -1,5 +1,6 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: MPL-2.0
 package storage
 
 import (
@@ -90,7 +91,6 @@ func ResourceStorageBucketObject() *schema.Resource {
 			"content": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				ForceNew:     true,
 				ExactlyOneOf: []string{"source"},
 				Sensitive:    true,
 				Computed:     true,
@@ -122,7 +122,6 @@ func ResourceStorageBucketObject() *schema.Resource {
 				Type: schema.TypeString,
 				// This field is not Computed because it needs to trigger a diff.
 				Optional: true,
-				ForceNew: true,
 				// Makes the diff message nicer:
 				// detect_md5hash:       "1XcnP/iFw/hNrbhXi7QTmQ==" => "different hash" (forces new resource)
 				// Instead of the more confusing:
@@ -378,45 +377,53 @@ func resourceStorageBucketObjectUpdate(d *schema.ResourceData, meta interface{})
 	bucket := d.Get("bucket").(string)
 	name := d.Get("name").(string)
 
-	objectsService := storage.NewObjectsService(config.NewStorageClientWithTimeoutOverride(userAgent, d.Timeout(schema.TimeoutUpdate)))
-	getCall := objectsService.Get(bucket, name)
+	if d.HasChange("content") || d.HasChange("detect_md5hash") {
+		// The KMS key name are not able to be set on create :
+		// or you get error: Error uploading object test-maarc: googleapi: Error 400: Malformed Cloud KMS crypto key: projects/myproject/locations/myregion/keyRings/mykeyring/cryptoKeys/mykeyname/cryptoKeyVersions/1, invalid
+		d.Set("kms_key_name", nil)
+		return resourceStorageBucketObjectCreate(d, meta)
+	} else {
 
-	res, err := getCall.Do()
-	if err != nil {
-		return fmt.Errorf("Error retrieving object during update %s: %s", name, err)
-	}
+		objectsService := storage.NewObjectsService(config.NewStorageClientWithTimeoutOverride(userAgent, d.Timeout(schema.TimeoutUpdate)))
+		getCall := objectsService.Get(bucket, name)
 
-	hasRetentionChanges := d.HasChange("retention")
-	if hasRetentionChanges {
-		if v, ok := d.GetOk("retention"); ok {
-			res.Retention = expandObjectRetention(v)
-		} else {
-			res.Retention = nil
-			res.NullFields = append(res.NullFields, "Retention")
+		res, err := getCall.Do()
+		if err != nil {
+			return fmt.Errorf("Error retrieving object during update %s: %s", name, err)
 		}
-	}
 
-	if d.HasChange("event_based_hold") {
-		v := d.Get("event_based_hold")
-		res.EventBasedHold = v.(bool)
-	}
+		hasRetentionChanges := d.HasChange("retention")
+		if hasRetentionChanges {
+			if v, ok := d.GetOk("retention"); ok {
+				res.Retention = expandObjectRetention(v)
+			} else {
+				res.Retention = nil
+				res.NullFields = append(res.NullFields, "Retention")
+			}
+		}
 
-	if d.HasChange("temporary_hold") {
-		v := d.Get("temporary_hold")
-		res.TemporaryHold = v.(bool)
-	}
+		if d.HasChange("event_based_hold") {
+			v := d.Get("event_based_hold")
+			res.EventBasedHold = v.(bool)
+		}
 
-	updateCall := objectsService.Update(bucket, name, res)
-	if hasRetentionChanges {
-		updateCall.OverrideUnlockedRetention(true)
-	}
-	_, err = updateCall.Do()
+		if d.HasChange("temporary_hold") {
+			v := d.Get("temporary_hold")
+			res.TemporaryHold = v.(bool)
+		}
 
-	if err != nil {
-		return fmt.Errorf("Error updating object %s: %s", name, err)
-	}
+		updateCall := objectsService.Update(bucket, name, res)
+		if hasRetentionChanges {
+			updateCall.OverrideUnlockedRetention(true)
+		}
+		_, err = updateCall.Do()
 
-	return nil
+		if err != nil {
+			return fmt.Errorf("Error updating object %s: %s", name, err)
+		}
+
+		return nil
+	}
 }
 
 func resourceStorageBucketObjectRead(d *schema.ResourceData, meta interface{}) error {

google/services/storage/resource_storage_bucket_object_test.go

@@ -459,6 +459,55 @@ func TestAccStorageObject_retention(t *testing.T) {
 	})
 }
 
+func TestResourceStorageBucketObjectUpdate_ContentChange(t *testing.T) {
+	t.Parallel()
+
+	bucketName := acctest.TestBucketName(t)
+	initialContent := []byte("initial content")
+	updatedContent := []byte("updated content")
+	h := md5.New()
+	if _, err := h.Write(initialContent); err != nil {
+		t.Errorf("error calculating md5: %v", err)
+	}
+	dataMd5 := base64.StdEncoding.EncodeToString(h.Sum(nil))
+
+	h2 := md5.New()
+	if _, err := h2.Write(updatedContent); err != nil {
+		t.Errorf("error calculating md5: %v", err)
+	}
+	newDataMd5 := base64.StdEncoding.EncodeToString(h2.Sum(nil))
+	// Update the object content and verify
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccStorageObjectDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testGoogleStorageBucketsObjectCustomContent(bucketName, string(initialContent)),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGoogleStorageObject(t, bucketName, objectName, dataMd5),
+					resource.TestCheckResourceAttr(
+						"google_storage_bucket_object.object",
+						"content",
+						string(initialContent),
+					),
+				),
+			},
+			{
+				Config: testGoogleStorageBucketsObjectCustomContent(bucketName, string(updatedContent)),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGoogleStorageObject(t, bucketName, objectName, newDataMd5),
+					resource.TestCheckResourceAttr(
+						"google_storage_bucket_object.object",
+						"content",
+						string(updatedContent),
+					),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckGoogleStorageObject(t *testing.T, bucket, object, md5 string) resource.TestCheckFunc {
 	return testAccCheckGoogleStorageObjectWithEncryption(t, bucket, object, md5, "")
 }
@@ -539,6 +588,22 @@ func testAccStorageObjectDestroyProducer(t *testing.T) func(s *terraform.State)
 	}
 }
 
+func testGoogleStorageBucketsObjectCustomContent(bucketName string, customContent string) string {
+	return fmt.Sprintf(`
+resource "google_storage_bucket" "bucket" {
+  name          = "%s"
+  location      = "US"
+  force_destroy = true
+}
+
+resource "google_storage_bucket_object" "object" {
+  name    = "%s"
+  bucket  = google_storage_bucket.bucket.name
+  content = "%s"
+}
+`, bucketName, objectName, customContent)
+}
+
 func testGoogleStorageBucketsObjectContent(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {