update go.mod

Author: Laure-di

docs/resources/instance_server.md

@@ -255,7 +255,7 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 ~> **Important:** If this field contains local volumes, you have to first detach them, in one apply, and then delete the volume in another apply.
 
 - `filesystem` - (Optional) List of filesystems attached to the server.
-  - `filesystem_id` - (Optional) The unique ID of the filesystem attached to the server.
+    - `filesystem_id` - (Optional) The unique ID of the filesystem attached to the server.
 
 - `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server.
   Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
@@ -318,8 +318,8 @@ In addition to all arguments above, the following attributes are exported:
 - `placement_group_policy_respected` - (Deprecated) Always false, use [instance_placement_group ressource](instance_placement_group.md) to known when the placement group policy is respected.
 - `root_volume`
     - `volume_id` - The volume ID of the root volume of the server.
-- `filesystem` 
-  - `state` - The current status of the filesystem (e.g., attached, detached).
+- `filesystem`
+    - `state` - The current status of the filesystem (e.g., attached, detached).
 - `private_ip` - The Scaleway internal IP address of the server (Deprecated use [ipam_ip datasource](../data-sources/ipam_ip.md#instance-private-network-ip) instead).
 - `public_ip` -  The public IP address of the server (Deprecated use `public_ips` instead).
 - `public_ips` - The list of public IPs of the server.

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.7.4
 	github.com/nats-io/nats.go v1.38.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250610132304-0ea56270b666
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250613151004-c065a4eb7430
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.38.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

@@ -447,8 +447,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250610132304-0ea56270b666 h1:NYaPksM7wPC69Fe9VCUoYY8GYB1hplR6s5hO2PA9rSQ=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250610132304-0ea56270b666/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250613151004-c065a4eb7430 h1:npqerdt+HbDkv1+43FdhXNKnzKqkxfwgCCZDHgZRKNE=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250613151004-c065a4eb7430/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

internal/services/file/filesystem_test.go

@@ -106,31 +106,6 @@ func TestAccFileSystem_InvalidSizeGranularityFails(t *testing.T) {
 	})
 }
 
-func TestAccFileSystem_InvalidSizeGranularityFails(t *testing.T) {
-	tt := acctest.NewTestTools(t)
-	defer tt.Cleanup()
-
-	fileSystemName := "TestAccFileSystem_Basic"
-	size := int64(25_000_000_000)
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      filetestfuncs.CheckFileDestroy(tt),
-		Steps: []resource.TestStep{
-			{
-				Config: fmt.Sprintf(`
-					resource "scaleway_file_filesystem" "fs" {
-						name = "%s"
-						size = %d
-					}
-				`, fileSystemName, size),
-				ExpectError: regexp.MustCompile("size does not respect constraint, size must be greater or equal to 100000000000"),
-			},
-		},
-	})
-}
-
 func testAccCheckFileSystemExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]

internal/services/instance/helpers_instance.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/dustin/go-humanize"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	blockSDK "github.com/scaleway/scaleway-sdk-go/api/block/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
@@ -552,3 +553,46 @@ func getServerProjectID(ctx context.Context, api *instance.API, zone scw.Zone, s
 
 	return server.Server.Project, nil
 }
+
+func attachNewFileSystem(newIDs map[string]struct{}, oldIDs map[string]struct{}, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, server *instance.Server) (diag.Diagnostics, bool) {
+	for id := range newIDs {
+		if _, alreadyAttached := oldIDs[id]; !alreadyAttached {
+			_, err := api.AttachServerFileSystem(&instance.AttachServerFileSystemRequest{
+				Zone:         zone,
+				ServerID:     server.ID,
+				FilesystemID: locality.ExpandID(id),
+			})
+			if err != nil {
+				return diag.FromErr(fmt.Errorf("error attaching filesystem %s: %w", id, err)), true
+			}
+		}
+	}
+
+	return nil, false
+}
+
+func detachOldFileSystem(oldIDs map[string]struct{}, newIDs map[string]struct{}, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, server *instance.Server) (diag.Diagnostics, bool) {
+	for id := range oldIDs {
+		if _, stillPresent := newIDs[id]; !stillPresent {
+			_, err := api.DetachServerFileSystem(&instance.DetachServerFileSystemRequest{
+				Zone:         zone,
+				ServerID:     server.ID,
+				FilesystemID: locality.ExpandID(id),
+			})
+			if err != nil {
+				return diag.FromErr(fmt.Errorf("error detaching filesystem %s: %w", id, err)), true
+			}
+		}
+	}
+
+	return nil, false
+}
+
+func collectFilesystemIDs(fsList []any, target map[string]struct{}) {
+	for _, fs := range fsList {
+		if fsMap, ok := fs.(map[string]any); ok {
+			id := fsMap["filesystem_id"].(string)
+			target[id] = struct{}{}
+		}
+	}
+}

internal/services/instance/server.go

@@ -539,17 +539,17 @@ func ResourceInstanceServerCreate(ctx context.Context, d *schema.ResourceData, m
 	///
 	// Attach Filesystem
 	///
-	_, err = waitForServer(ctx, api.API, zone, res.Server.ID, d.Timeout(schema.TimeoutCreate))
+
 	if filesystems, ok := d.GetOk("filesystems"); ok {
-		for _, filesystem := range filesystems.([]interface{}) {
-			fs := filesystem.(map[string]interface{})
+		for _, filesystem := range filesystems.([]any) {
+			fs := filesystem.(map[string]any)
 			filesystemID := fs["filesystem_id"]
+
 			_, err := api.AttachServerFileSystem(&instanceSDK.AttachServerFileSystemRequest{
 				Zone:         zone,
 				FilesystemID: regional.ExpandID(filesystemID.(string)).ID,
 				ServerID:     res.Server.ID,
 			})
-
 			if err != nil {
 				return nil
 			}
@@ -1120,16 +1120,16 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 	if d.HasChange("filesystems") {
 		oldRaw, newRaw := d.GetChange("filesystems")
 
-		oldList := oldRaw.([]interface{})
-		newList := newRaw.([]interface{})
+		oldList := oldRaw.([]any)
+		newList := newRaw.([]any)
 
 		oldIDs := make(map[string]struct{})
 		newIDs := make(map[string]struct{})
 
 		collectFilesystemIDs(oldList, oldIDs)
 		collectFilesystemIDs(newList, newIDs)
 
-		diagnostics, done := detachOlDFileSystem(oldIDs, newIDs, api, zone, server)
+		diagnostics, done := detachOldFileSystem(oldIDs, newIDs, api, zone, server)
 		if done {
 			return diagnostics
 		}
@@ -1239,47 +1239,6 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
 	return append(warnings, ResourceInstanceServerRead(ctx, d, m)...)
 }
 
-func attachNewFileSystem(newIDs map[string]struct{}, oldIDs map[string]struct{}, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, server *instanceSDK.Server) (diag.Diagnostics, bool) {
-	for id := range newIDs {
-		if _, alreadyAttached := oldIDs[id]; !alreadyAttached {
-			_, err := api.AttachServerFileSystem(&instanceSDK.AttachServerFileSystemRequest{
-				Zone:         zone,
-				ServerID:     server.ID,
-				FilesystemID: locality.ExpandID(id),
-			})
-			if err != nil {
-				return diag.FromErr(fmt.Errorf("error attaching filesystem %s: %w", id, err)), true
-			}
-		}
-	}
-	return nil, false
-}
-
-func detachOlDFileSystem(oldIDs map[string]struct{}, newIDs map[string]struct{}, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, server *instanceSDK.Server) (diag.Diagnostics, bool) {
-	for id := range oldIDs {
-		if _, stillPresent := newIDs[id]; !stillPresent {
-			_, err := api.DetachServerFileSystem(&instanceSDK.DetachServerFileSystemRequest{
-				Zone:         zone,
-				ServerID:     server.ID,
-				FilesystemID: locality.ExpandID(id),
-			})
-			if err != nil {
-				return diag.FromErr(fmt.Errorf("error detaching filesystem %s: %w", id, err)), true
-			}
-		}
-	}
-	return nil, false
-}
-
-func collectFilesystemIDs(fsList []interface{}, target map[string]struct{}) {
-	for _, fs := range fsList {
-		if fsMap, ok := fs.(map[string]interface{}); ok {
-			id := fsMap["filesystem_id"].(string)
-			target[id] = struct{}{}
-		}
-	}
-}
-
 func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	api, zone, id, err := instancehelpers.InstanceAndBlockAPIWithZoneAndID(m, d.Id())
 	if err != nil {
@@ -1319,14 +1278,17 @@ func ResourceInstanceServerDelete(ctx context.Context, d *schema.ResourceData, m
 
 	// Detach filesystem
 	if filesystems, ok := d.GetOk("filesystems"); ok {
-		fsList := filesystems.([]interface{})
+		fsList := filesystems.([]any)
 		for i, fsRaw := range fsList {
-			fsMap := fsRaw.(map[string]interface{})
+			fsMap := fsRaw.(map[string]any)
+
 			fsIDRaw, ok := fsMap["filesystem_id"]
 			if !ok || fsIDRaw == nil {
 				return diag.Errorf("filesystem_id is missing or nil for filesystem at index %d", i)
 			}
+
 			fsID := fsIDRaw.(string)
+
 			newFileSystemID := types.ExpandStringPtr(fsID)
 			if newFileSystemID == nil {
 				return diag.Errorf("failed to expand filesystem_id pointer at index %d", i)

internal/services/instance/types.go

@@ -1,11 +1,11 @@
 package instance
 
 import (
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"strconv"
 
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 )
 
@@ -102,12 +102,12 @@ func flattenServerPublicIPs(zone scw.Zone, ips []*instance.ServerIP) []any {
 	return flattenedIPs
 }
 
-func flattenServerFileSystem(zone scw.Zone, fs []*instance.ServerFilesystem) []interface{} {
-	filesystems := make([]interface{}, len(fs))
+func flattenServerFileSystem(zone scw.Zone, fs []*instance.ServerFilesystem) []any {
+	filesystems := make([]any, len(fs))
 	region, _ := zone.Region()
 
 	for i, f := range fs {
-		filesystems[i] = map[string]interface{}{
+		filesystems[i] = map[string]any{
 			"filesystem_id": regional.NewIDString(region, f.FilesystemID),
 			"status":        f.State,
 		}

internal/services/instance/waiters.go

@@ -97,6 +97,7 @@ func waitForFilesystems(ctx context.Context, api *instance.API, zone scw.Zone, i
 	if transport.DefaultWaitRetryInterval != nil {
 		retryInterval = *transport.DefaultWaitRetryInterval
 	}
+
 	server, err := api.WaitForServerFileSystem(&instance.WaitForServerFileSystemRequest{
 		ServerID:      id,
 		Zone:          zone,