Merge branch 'master' into feat/add-secret-data-wo

Author: remyleone

.github/workflows/documentation.yml

@@ -61,7 +61,14 @@ jobs:
           go-version: stable
       - name: Install Terraform
         uses: hashicorp/setup-terraform@v3
-      - run: go tool tfplugindocs validate
-      - run: rm -fr ./docs
-      - run: go tool tfplugindocs generate
+      - run: make docs
       - run: git diff --exit-code docs
+
+  terraform_fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+      - name: Run terraform fmt on examples folder
+        run: terraform fmt -recursive -check -diff examples

GNUmakefile

@@ -64,7 +64,10 @@ tfproviderdocs:
 tfproviderlintx:
 	go tool tfproviderlintx -XR001=false -XS002=false ./...
 
-docs:
+format_examples:
+	terraform fmt -recursive examples
+
+docs: format_examples
 	go tool tfplugindocs validate
 	rm -fr ./docs
 	go tool tfplugindocs generate

docs/resources/apple_silicon_server.md

@@ -5,8 +5,9 @@ page_title: "Scaleway: scaleway_apple_silicon"
 
 # Resource: scaleway_apple_silicon_server
 
-Creates and manages Scaleway Apple silicon. For more information,
-see the [API documentation](https://www.scaleway.com/en/developers/api/apple-silicon/).
+The [`scaleway_apple_silicon_server`](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/apple_silicon_server) resource creates and manages Scaleway Apple silicon servers.
+
+For more information, see the [API documentation](https://www.scaleway.com/en/developers/api/apple-silicon/).
 
 ## Example Usage
 

examples/instance-servers/main.tf

@@ -11,8 +11,8 @@ resource "scaleway_instance_ip" "ip" {
 }
 
 resource "scaleway_instance_server" "server" {
-  count = var.server_count
-  type = "PLAY2-MICRO"
-  image = "ubuntu_jammy"
+  count  = var.server_count
+  type   = "PLAY2-MICRO"
+  image  = "ubuntu_jammy"
   ip_ids = [scaleway_instance_ip.ip[count.index].id]
 }

internal/locality/regional/schemas_framework.go

@@ -2,7 +2,9 @@ package regional
 
 import (
 	"github.com/hashicorp/terraform-plugin-framework/action/schema"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
 
 // AllRegions returns all valid Scaleway regions as strings
@@ -16,9 +18,17 @@ func AllRegions() []string {
 }
 
 // SchemaAttribute returns a Plugin Framework schema attribute for a region field
-func SchemaAttribute() schema.StringAttribute {
+func SchemaAttribute(description ...string) schema.StringAttribute {
+	desc := "The region you want to attach the resource to"
+	if len(description) > 0 {
+		desc = description[0]
+	}
+
 	return schema.StringAttribute{
 		Optional:    true,
-		Description: "The region you want to attach the resource to",
+		Description: desc,
+		Validators: []validator.String{
+			verify.IsStringOneOfWithWarning(AllRegions()),
+		},
 	}
 }

internal/locality/zonal/schemas_framework.go

@@ -0,0 +1,18 @@
+package zonal
+
+import (
+	"github.com/hashicorp/terraform-plugin-framework/action/schema"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
+)
+
+// SchemaAttribute returns a Plugin Framework schema attribute for a zone field
+func SchemaAttribute(description string) schema.StringAttribute {
+	return schema.StringAttribute{
+		Optional:    true,
+		Description: description,
+		Validators: []validator.String{
+			verify.IsStringOneOfWithWarning(AllZones()),
+		},
+	}
+}

internal/services/baremetal/server.go

@@ -382,31 +382,32 @@ func ResourceServerCreate(ctx context.Context, d *schema.ResourceData, m any) di
 		req.UserData = &cloudInitStr
 	}
 
-	partitioningSchema := baremetal.Schema{}
-
 	if file, ok := d.GetOk("partitioning"); ok || !d.Get("install_config_afterward").(bool) {
 		if diags := validateInstallConfig(ctx, d, m); len(diags) > 0 {
 			return diags
 		}
 
+		req.Install = &baremetal.CreateServerRequestInstall{
+			OsID:            zonal.ExpandID(d.Get("os")).ID,
+			Hostname:        d.Get("hostname").(string),
+			SSHKeyIDs:       types.ExpandStrings(d.Get("ssh_key_ids")),
+			User:            types.ExpandStringPtr(d.Get("user")),
+			Password:        types.ExpandStringPtr(d.Get("password")),
+			ServicePassword: types.ExpandStringPtr(d.Get("service_password")),
+			ServiceUser:     types.ExpandStringPtr(d.Get("service_user")),
+		}
+
+		partitioningSchema := baremetal.Schema{}
+
 		if file != "" {
 			todecode, _ := file.(string)
 
 			err = json.Unmarshal([]byte(todecode), &partitioningSchema)
 			if err != nil {
 				return diag.FromErr(err)
 			}
-		}
 
-		req.Install = &baremetal.CreateServerRequestInstall{
-			OsID:               zonal.ExpandID(d.Get("os")).ID,
-			Hostname:           d.Get("hostname").(string),
-			SSHKeyIDs:          types.ExpandStrings(d.Get("ssh_key_ids")),
-			User:               types.ExpandStringPtr(d.Get("user")),
-			Password:           types.ExpandStringPtr(d.Get("password")),
-			PartitioningSchema: &partitioningSchema,
-			ServicePassword:    types.ExpandStringPtr(d.Get("service_password")),
-			ServiceUser:        types.ExpandStringPtr(d.Get("service_user")),
+			req.Install.PartitioningSchema = &partitioningSchema
 		}
 	}