Merge branch 'master' into feat/add_support_for_mondoDB

Author: jremy42

cmd/tftemplate/models/resource.go

@@ -1,10 +1,11 @@
 package models
 
 import (
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
 	"strings"
 	"unicode"
+
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 )
 
 type ResourceTemplate struct {

cmd/tftemplate/templates.go

@@ -3,9 +3,9 @@ package main
 import (
 	"log"
 	"os"
+	"strings"
 	"text/template"
 
-	"strings"
 	"tftemplate/models"
 )
 

docs/resources/inference_deployment.md

@@ -0,0 +1,72 @@
+---
+subcategory: "Inference"
+page_title: "Scaleway: scaleway_inference_deployment"
+---
+
+# Resource: scaleway_inference_deployment
+
+Creates and manages Scaleway Managed Inference deployments.
+For more information, see [the documentation](https://www.scaleway.com/en/developers/api/inference/).
+
+## Example Usage
+
+### Basic
+
+```terraform
+resource "scaleway_inference_deployment" "deployment" {
+  name = "tf-inference-deployment"
+  node_type = "L4"
+  model_name = "meta/llama-3.1-8b-instruct:fp8"
+  public_endpoint {
+    is_enabled = true
+  }
+  accept_eula = true
+}
+```
+
+## Argument Reference
+
+- `model_name` - (Required) The model name to use for the deployment. Model names can be found in Console or using Scaleway's CLI (`scw inference model list`)
+- `node_type` - (Required) The node type to use for the deployment. Node types can be found using Scaleway's CLI (`scw inference node-type list`)
+- `name` - (Optional) The deployment name.
+- `accept_eula` - (Optional) Some models (e.g Meta Llama) require end-user license agreements. Set `true` to accept.
+- `tags` - (Optional) The tags associated with the deployment.
+- `min_size` - (Optional) The minimum size of the pool.
+- `max_size` - (Optional) The maximum size of the pool.
+- `private_endpoint` - (Optional) Configuration of the deployment's private endpoint.
+    - `private_network_id` - (Optional) The ID of the private network to use.
+    - `disable_auth` - (Optional) Disable the authentication on the endpoint.
+- `public_endpoint` - (Optional) Configuration of the deployment's public endpoint.
+    - `is_enabled` - (Optional) Enable or disable public endpoint.
+    - `disable_auth` - (Optional) Disable the authentication on the endpoint.
+
+- `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the deployment is created.
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the deployment is associated with.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+- `id` - The ID of the deployment.
+- `model_id` - The model id used for the deployment.
+- `size` - The size of the pool.
+- `status` - The status of the deployment.
+- `created_at` - The date and time of the creation of the deployment.
+- `updated_at` - The date and time of the last update of the deployment.
+- `private_endpoint` - Private endpoint's attributes.
+    - `id` - (Optional) The id of the private endpoint.
+    - `url` - (Optional) The URL of the endpoint.
+- `public_endpoint` - (Optional) Public endpoint's attributes.
+    - `id` - (Optional) The id of the public endpoint.
+    - `url` - (Optional) The URL of the endpoint.
+
+~> **Important:** Deployments' IDs are [regional](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{region}/{id}`, e.g. `fr-par/11111111-1111-1111-1111-111111111111`.
+
+
+## Import
+
+Functions can be imported using, `{region}/{id}`, as shown below:
+
+```bash
+terraform import scaleway_inference_deployment.deployment fr-par/11111111-1111-1111-1111-111111111111
+```

docs/resources/ipam_ip.md

@@ -76,6 +76,31 @@ resource "scaleway_ipam_ip" "ip01" {
 }
 ```
 
+### Book an IP for a custom resource
+
+```terraform
+resource "scaleway_vpc" "vpc01" {
+  name = "my vpc"
+}
+
+resource "scaleway_vpc_private_network" "pn01" {
+  vpc_id = scaleway_vpc.vpc01.id
+  ipv4_subnet {
+    subnet = "172.16.32.0/22"
+  }
+}
+
+resource "scaleway_ipam_ip" "ip01" {
+  address = "172.16.32.7"
+  source {
+    private_network_id = scaleway_vpc_private_network.pn01.id
+  }
+  custom_resource {
+    mac_address = "bc:24:11:74:d0:6a"
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -90,6 +115,9 @@ The following arguments are supported:
     - `private_network_id` - The Private Network of the IP (if the IP is a private IP).
     - `subnet_id` - The Private Network subnet of the IP (if the IP is a private IP).
 - `is_ipv6` - (Optional) Defines whether to request an IPv6 address instead of IPv4.
+- `custome_resource` - (Optional) The custom resource to attach to the IP being reserved. An example of a custom resource is a virtual machine hosted on an Elastic Metal server.
+    - `mac_address` - The MAC address of the custom resource.
+    - `name` - When the resource is in a Private Network, a DNS record is available to resolve the resource name.
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) of the IP.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the Project the IP is associated with.
 

docs/resources/object_bucket.md

@@ -141,7 +141,7 @@ If you make any change to your bucket's tags using the console, it will overwrit
     * `expose_headers` (Optional) Specifies header exposure in the response.
     * `max_age_seconds` (Optional) Specifies time in seconds that the browser can cache the response for a preflight request.
 
-* `force_destroy` - (Optional) Enable deletion of objects in the bucket before destroying, locked objects or under legal hold are also deleted and **not** recoverable
+* `force_destroy` - (Optional) Whether to allow the object to be deleted by removing any legal hold on any object version. Default is false. This value should be set to true only if the bucket has object lock enabled.
 
 * `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the bucket is associated with.
 

internal/provider/provider.go

@@ -23,6 +23,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/flexibleip"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/function"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/inference"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iot"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
@@ -151,6 +152,7 @@ func Provider(config *Config) plugin.ProviderFunc {
 				"scaleway_iam_policy":                          iam.ResourcePolicy(),
 				"scaleway_iam_ssh_key":                         iam.ResourceSSKKey(),
 				"scaleway_iam_user":                            iam.ResourceUser(),
+				"scaleway_inference_deployment":                inference.ResourceDeployment(),
 				"scaleway_instance_image":                      instance.ResourceImage(),
 				"scaleway_instance_ip":                         instance.ResourceIP(),
 				"scaleway_instance_ip_reverse_dns":             instance.ResourceIPReverseDNS(),