Merge branch 'master' into serverless_add_tags_for_container_and_namespace

Author: Mia-Cross

docs/data-sources/availability_zones.md

@@ -18,7 +18,7 @@ The following command allow you to retrieve a the AZs of a Region.
 
 ```hcl
 # Get info by Region key
-data scaleway_availability_zones main {
+data "scaleway_availability_zones" "main" {
   region = "nl-ams"
 }
 ```

docs/data-sources/container.md

@@ -18,10 +18,10 @@ The following commands allow you to:
 - retrieve a container by its ID
 
 ```hcl
-resource scaleway_container_namespace main {
+resource "scaleway_container_namespace" "main" {
 }
 
-resource scaleway_container main {
+resource "scaleway_container" "main" {
   name         = "test-container-data"
   namespace_id = scaleway_container_namespace.main.id
 }

docs/data-sources/flexible_ip.md

@@ -26,8 +26,8 @@ data "scaleway_flexible_ip" "my_ip" {
 - `ip_address` - (Optional) The IP address.
   Only one of `ip_address` and `ip_id` should be specified.
 
-- `ip_id` - (Optional) The IP ID.
-  Only one of `ip_address` and `ip_id` should be specified.
+- `flexible_ip_id` - (Optional) The IP ID.
+  Only one of `ip_address` and `flexible_ip_id` should be specified.
 
 ## Attributes Reference
 

docs/data-sources/inference_model.md

@@ -1,5 +1,5 @@
 ---
-subcategory: "inference"
+subcategory: "Inference"
 page_title: "Scaleway: scaleway_inference_model"
 ---
 

docs/data-sources/lb_certificate.md

@@ -16,16 +16,16 @@ For more information, see the [main documentation](https://www.scaleway.com/en/d
 ### Let's Encrypt
 
 ```hcl
-resource scaleway_lb_ip main {
+resource "scaleway_lb_ip" "main" {
 }
 
-resource scaleway_lb main {
+resource "scaleway_lb" "main" {
   ip_id = scaleway_lb_ip.main.id
   name  = "data-test-lb-cert"
   type  = "LB-S"
 }
 
-resource scaleway_lb_certificate main {
+resource "scaleway_lb_certificate" "main" {
   lb_id = scaleway_lb.main.id
   name  = "data-test-lb-cert"
   letsencrypt {

docs/data-sources/rdb_database_backup.md

@@ -10,16 +10,16 @@ Gets information about an RDB backup.
 ## Example Usage
 
 ```hcl
-data scaleway_rdb_database_backup find_by_name {
+data "scaleway_rdb_database_backup" "find_by_name" {
   name = "mybackup"
 }
 
-data scaleway_rdb_database_backup find_by_name_and_instance {
+data "scaleway_rdb_database_backup" "find_by_name_and_instance" {
   name        = "mybackup"
   instance_id = "11111111-1111-1111-1111-111111111111"
 }
 
-data scaleway_rdb_database_backup find_by_id {
+data "scaleway_rdb_database_backup" "find_by_id" {
   backup_id = "11111111-1111-1111-1111-111111111111"
 }
 ```

docs/data-sources/vpc_gateway_network.md

@@ -18,11 +18,11 @@ resource "scaleway_vpc_gateway_network" "main" {
   enable_masquerade  = true
 }
 
-data scaleway_vpc_gateway_network by_id {
+data "scaleway_vpc_gateway_network" "by_id" {
   gateway_network_id = scaleway_vpc_gateway_network.main.id
 }
 
-data scaleway_vpc_gateway_network by_gateway_and_pn {
+data "scaleway_vpc_gateway_network" "by_gateway_and_pn" {
   gateway_id         = scaleway_vpc_public_gateway.pg01.id
   private_network_id = scaleway_vpc_private_network.pn01.id
 }

docs/data-sources/vpc_routes.md

@@ -10,17 +10,17 @@ Gets information about multiple VPC routes.
 ## Example Usage
 
 ```hcl
-resource scaleway_vpc vpc01 {
+resource "scaleway_vpc" "vpc01" {
   name           = "tf-vpc-route"
   enable_routing = true
 }
 
-resource scaleway_vpc_private_network pn01 {
+resource "scaleway_vpc_private_network" "pn01" {
   name   = "tf-pn-route"
   vpc_id = scaleway_vpc.vpc01.id
 }
 
-resource scaleway_vpc_private_network pn02 {
+resource "scaleway_vpc_private_network" "pn02" {
   name   = "tf-pn_route-2"
   vpc_id = scaleway_vpc.vpc01.id
 }

docs/resources/apple_silicon_server.md

@@ -13,7 +13,7 @@ see the [API documentation](https://www.scaleway.com/en/developers/api/apple-sil
 ### Basic
 
 ```terraform
-resource scaleway_apple_silicon_server server {
+resource "scaleway_apple_silicon_server" "server" {
   name = "test-m1"
   type = "M1-M"
 }

docs/resources/container.md

@@ -14,12 +14,12 @@ For more information on the limitations of Serverless Containers, refer to the [
 ## Example Usage
 
 ```terraform
-resource scaleway_container_namespace main {
+resource "scaleway_container_namespace" "main" {
   name        = "my-ns-test"
   description = "test container"
 }
 
-resource scaleway_container main {
+resource "scaleway_container" "main" {
   name            = "my-container-02"
   description     = "environment variables test"
   tags            = ["tag1", "tag2"]
@@ -182,7 +182,7 @@ The period between health checks is also configurable.
 Example:
 
 ```terraform
-resource scaleway_container main {
+resource "scaleway_container" "main" {
   name         = "my-container-02"
   namespace_id = scaleway_container_namespace.main.id
 
@@ -209,7 +209,7 @@ It replaces current `max_concurrency` that has been deprecated.
 Example:
 
 ```terraform
-resource scaleway_container main {
+resource "scaleway_container" "main" {
   name         = "my-container-02"
   namespace_id = scaleway_container_namespace.main.id