Merge branch 'master' into feat/add-autoscaling-group

Author: yfodil

.golangci.yml

@@ -5,6 +5,11 @@ formatters:
     - gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true]
     - gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
     - goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt. [fast: true, auto-fix: true]
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: interface{}
+          replacement: any
 
 linters:
   # Run golangci-lint linters to see the list of all linters
@@ -29,6 +34,7 @@ linters:
     - exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix]
     - fatcontext # Detects nested contexts in loops and function literals. [auto-fix]
     - forbidigo # Forbids identifiers [fast: true, auto-fix: false]
+    - funcorder # Checks the order of functions, methods, and constructors. [fast]
     - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false]
     - gochecksumtype # Run exhaustiveness checks on Go "sum types" [fast: false, auto-fix: false]
     - goconst # Finds repeated strings that could be replaced by a constant [fast: true, auto-fix: false]
@@ -64,6 +70,7 @@ linters:
     - promlinter # Check Prometheus metrics naming via promlint [fast: true, auto-fix: false]
     - protogetter # Reports direct reads from proto message fields when getters should be used [fast: false, auto-fix: true]
     - reassign # Checks that package variables are not reassigned [fast: false, auto-fix: false]
+    - recvcheck # Checks for receiver type consistency.
     - revive # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint. [fast: false, auto-fix: false]
     - rowserrcheck # checks whether Err of rows is checked successfully [fast: false, auto-fix: false]
     - sloglint # ensure consistent code style when using log/slog [fast: false, auto-fix: false]

cmd/vcr-compressor/main.go

@@ -68,7 +68,7 @@ func main() {
 			continue
 		}
 
-		var m map[string]interface{}
+		var m map[string]any
 
 		err := json.Unmarshal([]byte(responseBody), &m)
 		if err != nil {

cmd/vcr-viewer/main.go

@@ -37,7 +37,7 @@ func main() {
 		log.Printf("    Status: %s\n", interaction.Response.Status)
 		log.Printf("    Body: %s\n", interaction.Response.Body)
 
-		var m map[string]interface{}
+		var m map[string]any
 
 		err := json.Unmarshal([]byte(interaction.Response.Body), &m)
 		if err != nil {

docs/data-sources/lb_acls.md

@@ -54,4 +54,5 @@ In addition to all arguments above, the following attributes are exported:
         - `http_filter` - The HTTP filter to match.
         - `http_filter_value` - The possible values to match for a given HTTP filter.
         - `http_filter_option` - A list of possible values for the HTTP filter based on the HTTP header.
-        - `invert` -  The condition will be of type "unless" if invert is set to `true`
+        - `invert` - The condition will be of type "unless" if invert is set to `true`
+        - `ips_edge_services` - Defines whether Edge Services IPs should be matched.

docs/guides/migration_guide_v2.md

@@ -103,7 +103,7 @@ Hence it is named: `scaleway_object_bucket`.
 ### Migration guide for renamed resources
 
 Because the resources changed their name, we cannot use automatic state migration.
-We will first get the identifier of the resource, then remove the resource from the terraform state and then use [`terraform import`](https://www.terraform.io/docs/import/usage.html) to import existing resources to a renamed resource.
+We will first get the identifier of the resource, then remove the resource from the terraform state and then use [`terraform import`](https://www.terraform.io/terraform/cli/import) to import existing resources to a renamed resource.
 
 For instance, let's suppose that you have resource in `fr-par-1` such as:
 

docs/resources/container.md

@@ -111,6 +111,10 @@ The following arguments are supported:
 
 - `args` - (Optional) Arguments passed to the command specified in the "command" field. These override the default arguments from the container image, and behave like command-line parameters.
 
+- `private_network_id` (Optional) The ID of the Private Network the container is connected to.
+
+~> **Important** This feature is currently in beta and requires a namespace with VPC integration activated by setting the `activate_vpc_integration` attribute to `true`.
+
 Note that if you want to use your own configuration, you must consult our configuration [restrictions](https://www.scaleway.com/en/docs/serverless-containers/reference-content/containers-limitations/#configuration-restrictions) section.
 
 ## Attributes Reference

docs/resources/container_namespace.md

@@ -40,6 +40,10 @@ The following arguments are supported:
 
 - `secret_environment_variables` - (Optional) The secret environment variables of the namespace.
 
+- `activate_vpc_integration` - (Optional) Activates VPC integration for the namespace. Containers of a namespace with VPC integration activated will be able to connect to a Private Network.
+
+~> **Important** Updates to `activate_vpc_integration` will recreate the namespace.
+
 ## Attributes Reference
 
 The `scaleway_container_namespace` resource exports certain attributes once the Containers namespace has been created. These attributes can be referenced in other parts of your Terraform configuration.

docs/resources/function.md

@@ -99,6 +99,9 @@ The following arguments are supported:
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the functions namespace is associated with.
 
+- `private_network_id` (Optional) The ID of the Private Network the function is connected to.
+
+~> **Important** This feature is currently in beta and requires a namespace with VPC integration activated by setting the `activate_vpc_integration` attribute to `true`.
 
 ## Attributes Reference
 

docs/resources/function_namespace.md

@@ -40,6 +40,10 @@ The following arguments are supported:
 
 - `secret_environment_variables` - (Optional) The secret environment variables of the namespace.
 
+- `activate_vpc_integration` - (Optional) Activates VPC integration for the namespace. Functions of a namespace with VPC integration activated will be able to connect to a Private Network.
+
+~> **Important** Updates to `activate_vpc_integration` will recreate the namespace.
+
 ## Attributes Reference
 
 The `scaleway_function_namespace` resource exports certain attributes once the Functions namespace has been created. These attributes can be referenced in other parts of your Terraform configuration.

docs/resources/instance_server.md

@@ -260,6 +260,10 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 - `protected` - (Optional) Set to true to activate server protection option.
 
+- `admin_password_encryption_ssh_key_id` - (Optional) The ID of the SSH RSA key that will be used to encrypt the initial admin password for OS requiring it.
+   Mandatory for Windows OS. The public_key value of this key is used to encrypt the admin password.
+   When set to an empty string, it resets this value and admin_password_encrypted_value to an empty string so a new password may be generated.
+
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server should be created.
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the server is associated with.