feat: (storage) add flag to force empty content type (#14320) (#23568)

[upstream:f43bc3edeeebf4b23b39e0d06e5c3fe7b5aa37f1]

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

Author: modular-magician

.changelog/14320.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+storage: added `force_empty_content_type` flag to force empty content type in resource `google_storage_bucket_object`
+```

google/services/storage/resource_storage_bucket_object.go

@@ -99,11 +99,20 @@ func ResourceStorageBucketObject() *schema.Resource {
 			},
 
 			"content_type": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				ForceNew:    true,
-				Computed:    true,
-				Description: `Content-Type of the object data. Defaults to "application/octet-stream" or "text/plain; charset=utf-8".`,
+				Type:          schema.TypeString,
+				Optional:      true,
+				ForceNew:      true,
+				Computed:      true,
+				ConflictsWith: []string{"force_empty_content_type"},
+				Description:   `Content-Type of the object data. Defaults to "application/octet-stream" or "text/plain; charset=utf-8".`,
+			},
+
+			"force_empty_content_type": {
+				Type:          schema.TypeBool,
+				Optional:      true,
+				ForceNew:      true,
+				ConflictsWith: []string{"content_type"},
+				Description:   `Flag to set empty Content-Type.`,
 			},
 
 			"content": {
@@ -395,7 +404,11 @@ func resourceStorageBucketObjectCreate(d *schema.ResourceData, meta interface{})
 
 	insertCall := objectsService.Insert(bucket, object)
 	insertCall.Name(name)
-	insertCall.Media(media)
+	if v, ok := d.GetOk("force_empty_content_type"); ok && v.(bool) {
+		insertCall.Media(media, googleapi.ContentType(""))
+	} else {
+		insertCall.Media(media)
+	}
 
 	// This is done late as we need to add headers to enable customer encryption
 	if v, ok := d.GetOk("customer_encryption"); ok {

google/services/storage/resource_storage_bucket_object_test.go

@@ -145,6 +145,26 @@ func TestAccStorageObject_content(t *testing.T) {
 						"google_storage_bucket_object.object", "storage_class", "STANDARD"),
 				),
 			},
+			{
+				Config: testGoogleStorageBucketsObjectEmptyContentType(bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGoogleStorageObject(t, bucketName, objectName, dataMd5),
+					resource.TestCheckResourceAttr(
+						"google_storage_bucket_object.object", "content_type", ""),
+					resource.TestCheckResourceAttr(
+						"google_storage_bucket_object.object", "storage_class", "STANDARD"),
+				),
+			},
+			{
+				Config: testGoogleStorageBucketsObjectContent(bucketName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckGoogleStorageObject(t, bucketName, objectName, dataMd5),
+					resource.TestCheckResourceAttr(
+						"google_storage_bucket_object.object", "content_type", "text/plain; charset=utf-8"),
+					resource.TestCheckResourceAttr(
+						"google_storage_bucket_object.object", "storage_class", "STANDARD"),
+				),
+			},
 		},
 	})
 }
@@ -724,6 +744,23 @@ resource "google_storage_bucket_object" "object" {
 `, bucketName, objectName, content)
 }
 
+func testGoogleStorageBucketsObjectEmptyContentType(bucketName 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"
+  force_empty_content_type = true
+}
+`, bucketName, objectName, content)
+}
+
 func testGoogleStorageBucketsFolder(bucketName, folderName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {

website/docs/r/storage_bucket_object.html.markdown

@@ -103,6 +103,8 @@ One of the following is required:
 
 * `source_md5hash` - (Optional) User-provided md5hash to trigger replacement of object in storage bucket, Must be Base 64 MD5 hash of the object data. The usual way to set this is filemd5("file.zip"), where "file.zip" is the local filename
 
+* `force_empty_content_type` - (Optional) When set to true, it ensure the object's Content-Type is empty.
+
 ---
 
 <a name="nested_customer_encryption"></a>The `customer_encryption` block supports: