Merge branch 'master' into warn-creds

Author: remyleone

docs/resources/iam_user.md

@@ -5,24 +5,15 @@ page_title: "Scaleway: scaleway_iam_user"
 
 # Resource: scaleway_iam_user
 
-Creates and manages Scaleway IAM Users.
+Creates and manages Scaleway IAM [Users](https://www.scaleway.com/en/docs/iam/concepts/#member).
 For more information, see the [API documentation](https://www.scaleway.com/en/developers/api/iam/#path-users-list-users-of-an-organization).
 
 ## Example Usage
 
-### Guest user
+### User
 
 ```terraform
-resource "scaleway_iam_user" "guest" {
-  email = "[email protected]"
-  tags  = ["test-tag"]
-}
-```
-
-### Member user
-
-```terraform
-resource "scaleway_iam_user" "member" {
+resource "scaleway_iam_user" "user" {
   email      = "[email protected]"
   tags       = ["test-tag"]
   username   = "foo"
@@ -31,21 +22,26 @@ resource "scaleway_iam_user" "member" {
 }
 ```
 
-When `username` is set, the user is created as a [Member](https://www.scaleway.com/en/docs/iam/concepts/#member). Otherwise, it is created as a [Guest](https://www.scaleway.com/en/docs/iam/concepts/#guest).
-
 ### Multiple users
 
 ```terraform
 locals {
-  users = toset([
-    "[email protected]",
-    "[email protected]"
-  ])
+  users = [
+    {
+      email = "[email protected]"
+      username = "test"
+    },
+    {
+      email = "[email protected]"
+      username = "test2"
+    }
+  ]
 }
 
-resource "scaleway_iam_user" "user" {
-  for_each = local.users
-  email    = each.key
+resource "scaleway_iam_user" "users" {
+  count    = length(local.users)
+  email    = local.users[count.index].email
+  username = local.users[count.index].username
 }
 ```
 
@@ -57,7 +53,7 @@ resource "scaleway_iam_user" "user" {
 
 - `tags` - (Optional) The tags associated with the user.
 
-- `username` - (Optional) The username of the IAM user. When it is set, the user is created as a Member. When it is not set, the user is created as a Guest and the username is set as equal to the email.
+- `username` - (Required) The username of the IAM user.
 
 - `password` - The password for first access.
 
@@ -73,8 +69,6 @@ resource "scaleway_iam_user" "user" {
 
 - `locale` - The user's locale (e.g., en_US).
 
-Important: When creating a Guest user, all arguments are ignored, except for `organization_id`, `email` and `tags`.
-
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:

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/helpers_block.go

@@ -52,7 +52,7 @@ func customDiffCannotShrink(key string) schema.CustomizeDiffFunc {
 		oldValue := oldValueI.(int)
 		newValue := newValueI.(int)
 
-		return oldValue < newValue
+		return oldValue > newValue
 	})
 }