Merge branch 'master' into rerecord

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

@@ -1,11 +1,14 @@
 package meta
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
 	"net/http"
 	"os"
+	"strings"
+	"text/tabwriter"
 
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -24,6 +27,7 @@ const (
 )
 
 type CredentialsSource struct {
+	Variables     map[string][]string
 	AccessKey     string
 	SecretKey     string
 	ProjectID     string
@@ -73,6 +77,47 @@ func (m Meta) ZoneSource() string {
 	return m.credentialsSource.DefaultZone
 }
 
+// HasMultipleVariableSources return an informative message during the Provider initialization
+// if there are multiple sources of configuration that could confuse the user
+//
+// Variable			AvailableSources									Using
+// SCW_ACCESS_KEY	Active Profile in config.yaml, Environment variable	Environment variable
+// SCW_SECRET_KEY	Active Profile in config.yaml, Environment variable	Environment variable
+func (m Meta) HasMultipleVariableSources() (bool, string, error) {
+	multiple := false
+
+	variables := []string{scw.ScwAccessKeyEnv, scw.ScwSecretKeyEnv, scw.ScwDefaultProjectIDEnv, scw.ScwDefaultRegionEnv, scw.ScwDefaultZoneEnv}
+
+	w := new(tabwriter.Writer)
+	buf := &bytes.Buffer{}
+	w.Init(buf, 0, 8, 0, '\t', 0)
+
+	_, err := fmt.Fprintln(w, "Variable\tAvailableSources\tUsing")
+	if err != nil {
+		return false, "", err
+	}
+
+	for _, variable := range variables {
+		values, ok := m.credentialsSource.Variables[variable]
+		if ok {
+			if len(values) > 1 {
+				_, err := fmt.Fprintf(w, "%s\t%s\t%s\n", variable, strings.Join(values, ", "), values[len(values)-1])
+				if err != nil {
+					return false, "", err
+				}
+
+				multiple = true
+			}
+		}
+	}
+
+	if err := w.Flush(); err != nil {
+		return false, "", err
+	}
+
+	return multiple, buf.String(), nil
+}
+
 type Config struct {
 	ProviderSchema      *schema.ResourceData
 	HTTPClient          *http.Client
@@ -270,29 +315,39 @@ func GetCredentialsSource(defaultZoneProfile, activeProfile, providerProfile, en
 		},
 	}
 	credentialsSource := &CredentialsSource{}
+	credentialsSource.Variables = map[string][]string{}
 
 	for _, pair := range profilesInOrder {
 		source := pair.Source
 		profile := pair.Profile
 
 		if profile.AccessKey != nil {
 			credentialsSource.AccessKey = source
+			credentialsSource.Variables[scw.ScwAccessKeyEnv] = append(credentialsSource.Variables[scw.ScwAccessKeyEnv], source)
 		}
 
 		if profile.SecretKey != nil {
 			credentialsSource.SecretKey = source
+			credentialsSource.Variables[scw.ScwSecretKeyEnv] = append(credentialsSource.Variables[scw.ScwSecretKeyEnv], source)
 		}
 
 		if profile.DefaultProjectID != nil {
 			credentialsSource.ProjectID = source
+			credentialsSource.Variables[scw.ScwDefaultProjectIDEnv] = append(credentialsSource.Variables[scw.ScwDefaultProjectIDEnv], source)
 		}
 
 		if profile.DefaultRegion != nil {
 			credentialsSource.DefaultRegion = source
+			if source != CredentialsSourceDefault {
+				credentialsSource.Variables[scw.ScwDefaultRegionEnv] = append(credentialsSource.Variables[scw.ScwDefaultRegionEnv], source)
+			}
 		}
 
 		if profile.DefaultZone != nil {
 			credentialsSource.DefaultZone = source
+			if source != CredentialsSourceDefault {
+				credentialsSource.Variables[scw.ScwDefaultZoneEnv] = append(credentialsSource.Variables[scw.ScwDefaultZoneEnv], source)
+			}
 		}
 	}
 

internal/meta/meta_test.go

@@ -0,0 +1,49 @@
+package meta_test
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHasMultipleVariableSources(t *testing.T) {
+	ctx := t.Context()
+
+	cfg := &meta.Config{}
+
+	scwConfigigFile := `profiles:
+  test:
+    access_key: SCWXXXXXXXXXXXXXXXXX
+    secret_key: 866F4A9A-D058-4D3C-A39F-86930849CCC0
+    default_project_id: 866F4A9A-D058-4D3C-A39F-86930849CCC0
+`
+
+	dir := t.TempDir()
+
+	err := os.WriteFile(path.Join(dir, "config.yaml"), []byte(scwConfigigFile), 0o644)
+	require.NoError(t, err)
+
+	t.Setenv("SCW_CONFIG_PATH", path.Join(dir, "config.yaml"))
+	t.Setenv("SCW_PROFILE", "test")
+	t.Setenv("SCW_ACCESS_KEY", "SCWXXXXXXXXXXXXXXXXX")
+	t.Setenv("SCW_SECRET_KEY", "866F4A9A-D058-4D3C-A39F-86930849CCC0")
+	t.Setenv("SCW_DEFAULT_PROJECT_ID", "866F4A9A-D058-4D3C-A39F-86930849CCC0")
+
+	m, err := meta.NewMeta(ctx, cfg)
+	require.NoError(t, err)
+
+	ok, message, err := m.HasMultipleVariableSources()
+	require.NoError(t, err)
+	assert.True(t, ok)
+
+	expectedMessage := `Variable		AvailableSources					Using
+SCW_ACCESS_KEY		Active Profile in config.yaml, Environment variable	Environment variable
+SCW_SECRET_KEY		Active Profile in config.yaml, Environment variable	Environment variable
+SCW_DEFAULT_PROJECT_ID	Active Profile in config.yaml, Environment variable	Environment variable
+`
+	assert.Equal(t, expectedMessage, message)
+}

internal/provider/provider.go

@@ -357,7 +357,28 @@ func Provider(config *Config) plugin.ProviderFunc {
 				return nil, diag.FromErr(err)
 			}
 
-			return m, nil
+			var diags diag.Diagnostics
+
+			ok, message, err := m.HasMultipleVariableSources()
+			if err != nil {
+				diags = append(diags, diag.Diagnostic{
+					Severity: diag.Warning,
+					Summary:  "Error checking multiple variable sources",
+					Detail:   err.Error(),
+				})
+
+				return m, diags
+			}
+
+			if ok && err == nil {
+				diags = append(diags, diag.Diagnostic{
+					Severity: diag.Warning,
+					Summary:  "Multiple variable sources detected, please make sure the right credentials are used",
+					Detail:   message,
+				})
+			}
+
+			return m, diags
 		}
 
 		return p

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
 	})
 }