feat(object): add content_type attribute (#3138)

* fix(object): add content_type attribut

* add and correct documentation

* add computed to content_type

* undo removed line

---------

Co-authored-by: Rémy Léone <[email protected]>

Author: Laure-di

docs/resources/object.md

@@ -49,6 +49,8 @@ The following arguments are supported:
 
 * `metadata` - (Optional) Map of metadata used for the object (keys must be lowercase).
 
+* `content_type` -  (Optional) The standard MIME type of the object's content (e.g., 'application/json', 'text/plain'). This specifies how the object should be interpreted by clients. See RFC 9110: https://www.rfc-editor.org/rfc/rfc9110.html#name-content-type
+
 * `tags` - (Optional) Map of tags.
 
 * `sse_customer_key` - (Optional) Customer's encryption keys to encrypt data (SSE-C)

docs/resources/object_bucket_website_configuration.md

@@ -12,16 +12,27 @@ Refer to the [dedicated documentation](https://www.scaleway.com/en/docs/object-s
 ## Example Usage
 
 ```terraform
-resource "scaleway_object_bucket" "main" {
-  name = "MyBucket"
+resource "scaleway_object_bucket" "test" {
+  name = "my-bucket"
   acl  = "public-read"
 }
 
-resource "scaleway_object_bucket_website_configuration" "main" {
-  bucket = scaleway_object_bucket.main.id
+resource scaleway_object "some_file" {
+  bucket = scaleway_object_bucket.test.name
+  key = "index.html"
+  file = "index.html"
+  visibility = "public-read"
+  content_type = "text/html"
+}
+
+resource "scaleway_object_bucket_website_configuration" "test" {
+  bucket = scaleway_object_bucket.test.name
   index_document {
     suffix = "index.html"
   }
+  error_document {
+    key = "error.html"
+  }
 }
 ```
 

internal/services/block/testdata/snapshot-from-s3.cassette.yaml

@@ -89,6 +89,12 @@ func ResourceObject() *schema.Resource {
 				},
 				ValidateDiagFunc: validateMapKeyLowerCase(),
 			},
+			"content_type": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Computed:    true,
+				Description: "The standard MIME type of the object's content (e.g., 'application/json', 'text/plain'). This specifies how the object should be interpreted by clients. See RFC 9110: https://www.rfc-editor.org/rfc/rfc9110.html#name-content-type",
+			},
 			"tags": {
 				Optional:    true,
 				Type:        schema.TypeMap,
@@ -153,6 +159,10 @@ func resourceObjectCreate(ctx context.Context, d *schema.ResourceData, m interfa
 		Metadata:     types.ExpandMapStringString(d.Get("metadata")),
 	}
 
+	if contentType, ok := d.GetOk("content_type"); ok {
+		req.ContentType = types.ExpandStringPtr(contentType)
+	}
+
 	visibilityStr := types.ExpandStringPtr(d.Get("visibility").(string))
 	if visibilityStr != nil {
 		req.ACL = s3Types.ObjectCannedACL(*visibilityStr)
@@ -253,6 +263,10 @@ func resourceObjectUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 			ACL:          s3Types.ObjectCannedACL(d.Get("visibility").(string)),
 		}
 
+		if contentType, ok := d.GetOk("content_type"); ok {
+			req.ContentType = types.ExpandStringPtr(contentType)
+		}
+
 		if encryptionKey, ok := d.GetOk("sse_customer_key"); ok {
 			digestMD5, encryption, err := EncryptCustomerKey(encryptionKey.(string))
 			if err != nil {
@@ -286,6 +300,10 @@ func resourceObjectUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 			ACL:          s3Types.ObjectCannedACL(d.Get("visibility").(string)),
 		}
 
+		if contentType, ok := d.GetOk("content_type"); ok {
+			req.ContentType = types.ExpandStringPtr(contentType)
+		}
+
 		if encryptionKey, ok := d.GetOk("sse_customer_key"); ok {
 			digestMD5, encryption, err := EncryptCustomerKey(encryptionKey.(string))
 			if err != nil {
@@ -368,6 +386,7 @@ func resourceObjectRead(ctx context.Context, d *schema.ResourceData, m interface
 	}
 
 	_ = d.Set("metadata", types.FlattenMap(obj.Metadata))
+	_ = d.Set("content_type", &obj.ContentType)
 
 	tags, err := s3Client.GetObjectTagging(ctx, &s3.GetObjectTaggingInput{
 		Bucket: types.ExpandStringPtr(bucket),

internal/services/object/object.go

@@ -107,6 +107,45 @@ func TestAccObject_Basic(t *testing.T) {
 	})
 }
 
+func TestAccObject_ContentType(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-content-type")
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			objectchecks.IsObjectDestroyed(tt),
+			objectchecks.IsBucketDestroyed(tt),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+				resource "scaleway_object_bucket" "main" {
+					name = "%s"
+					region = "%s"
+				}
+
+				resource "scaleway_object" "file" {
+					bucket     = scaleway_object_bucket.main.id
+					key        = "index.html"
+					file       = "testfixture/index.html"
+					visibility = "public-read"
+					content_type = "text/html"
+				}
+					
+				`, bucketName, objectTestsMainRegion),
+				Check: resource.ComposeTestCheckFunc(
+					objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.main", true),
+					testAccCheckObjectExists(tt, "scaleway_object.file"),
+					resource.TestCheckResourceAttr("scaleway_object.file", "content_type", "text/html"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccObject_Hash(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()