feat: (storage) added deletion_policy field in storage bucket object (#14594) (#10445)

[upstream:00de1d49713446dbe1a381af748ecc2717380633]

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

Author: modular-magician

.changelog/14594.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+storage: added `deletion_policy` field to `google_storage_bucket_object` resource
+```

google-beta/services/storage/resource_storage_bucket_object.go

@@ -31,6 +31,7 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
 	"crypto/sha256"
 	"encoding/base64"
@@ -323,6 +324,13 @@ func ResourceStorageBucketObject() *schema.Resource {
 				Computed:    true,
 				Description: `A url reference to download this object.`,
 			},
+
+			"deletion_policy": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Description:  `The deletion policy for the object. Setting ABANDON allows the resource to be abandoned rather than deleted when removed from your Terraform configuration.`,
+				ValidateFunc: validation.StringInSlice([]string{"ABANDON"}, false),
+			},
 		},
 		UseJSONNumber: true,
 	}
@@ -587,6 +595,12 @@ func resourceStorageBucketObjectDelete(d *schema.ResourceData, meta interface{})
 		return err
 	}
 
+	if deletionPolicy := d.Get("deletion_policy"); deletionPolicy == "ABANDON" {
+		log.Printf("[WARN] Object %q deletion_policy is set to 'ABANDON', object deletion has been abandoned", d.Id())
+		d.SetId("")
+		return nil
+	}
+
 	bucket := d.Get("bucket").(string)
 	name := d.Get("name").(string)
 

google-beta/services/storage/resource_storage_bucket_object_test.go

@@ -632,6 +632,29 @@ func TestAccStorageObject_knownAfterApply(t *testing.T) {
 	})
 }
 
+func TestAccStorageObject_objectDeletionPolicy(t *testing.T) {
+	t.Parallel()
+
+	bucketName := acctest.TestBucketName(t)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccStorageObjectDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testGoogleStorageBucketsObjectDeletionPolicy(bucketName, "samplecontent"),
+			},
+			{
+				Config: testGoogleStorageBucketsObjectAbandon(bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckStorageObjectExists(t, bucketName),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckGoogleStorageObject(t *testing.T, bucket, object, md5 string) resource.TestCheckFunc {
 	return testAccCheckGoogleStorageObjectWithEncryption(t, bucket, object, md5, "")
 }
@@ -1096,3 +1119,42 @@ output "valid" {
 }
 `, bucketName, content, filename)
 }
+
+func testGoogleStorageBucketsObjectDeletionPolicy(bucketName string, customContent string) string {
+	return fmt.Sprintf(`
+resource "google_storage_bucket" "bucket" {
+  name          = "%s"
+  location      = "US"
+}
+
+resource "google_storage_bucket_object" "object" {
+  name            = "%s"
+  bucket          = google_storage_bucket.bucket.name
+  content         = "%s"
+  deletion_policy = "ABANDON"
+}
+`, bucketName, objectName, customContent)
+}
+
+func testGoogleStorageBucketsObjectAbandon(bucketName string) string {
+	return fmt.Sprintf(`
+resource "google_storage_bucket" "bucket" {
+  name          = "%s"
+  location      = "US"
+  force_destroy = true
+}
+`, bucketName)
+}
+
+func testAccCheckStorageObjectExists(t *testing.T, bucketName string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+
+		config := acctest.GoogleProviderConfig(t)
+
+		_, err := config.NewStorageClient(config.UserAgent).Objects.Get(bucketName, objectName).Do()
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+}

website/docs/r/storage_bucket_object.html.markdown

@@ -105,6 +105,8 @@ One of the following is required:
 
 * `force_empty_content_type` - (Optional) When set to true, it ensure the object's Content-Type is empty.
 
+* `deletion_policy` - (Optional) When set to ABANDON, the object won't be deleted from storage bucket. Instead, it will only be removed from terraform's state file.
+
 ---
 
 <a name="nested_customer_encryption"></a>The `customer_encryption` block supports: