feat(instance): add support filesystem (#3149)

* feat(instance): add support filesystem

feat(file): add support v1beta1

Create, Read and Update function

Delete Methode

add tests

fix date issue and register cassettes

test: add validation for filesystem size granularity

fix: convertion

fix(instance): update schema filesystem

test(instance): add test attach filesystem

feat(instance): delete and update filesystem

chore: master sdk-go

go mod tidy

update doc and tests

fix fmt

update go.mod

fix(file): rename attribut size to size_in_gb

fix: error return attachFS and typo doc

fix: error return attachFS and typo doc

update FileSystem Size to GB

update FileSystem Size to GB

refacto waiter

tests: fix test and add waiter

* update cassette

* docs: fix size in file

* docs: fix size in file

---------

Co-authored-by: Rémy Léone <[email protected]>

Author: Laure-di

docs/resources/file_filesystem.md

@@ -18,14 +18,14 @@ This resource allows you to define and manage the size, tags, and region of a fi
 ```terraform
 resource scaleway_file_filesystem file {
   name = "my-nfs-filesystem"
-  size = 100000000000 # 100 GB
+  size_in_gb = 100
 }
 ```
 
 ## Argument Reference
 
 - `name` - (Optional) The name of the filesystem. If not provided, a random name will be generated.
-- `size` - (Required) The size of the filesystem in bytes, with a granularity of 100 GB (10¹¹ bytes).
+- `size_in_gb` - (Required) The size of the filesystem in bytes, with a granularity of 100 GB (10¹¹ bytes).
       - Minimum: 100 GB (100000000000 bytes)
       - Maximum: 10 TB (10000000000000 bytes)
 - `tags` - (Optional) A list of tags associated with the filesystem.

docs/resources/instance_server.md

@@ -45,6 +45,33 @@ resource "scaleway_instance_server" "web" {
 }
 ```
 
+### With filesystem
+
+```terraform
+resource scaleway_block_volume volume {
+  iops       = 15000
+  size_in_gb = 15
+}
+
+resource scaleway_file_filesystem terraform_instance_filesystem {
+  name = "filesystem-instance-terraform"
+  size_in_gb = 100
+}
+
+resource scaleway_instance_server base {
+  type  = "POP2-HM-2C-16G"
+  state = "started"
+  tags  = ["terraform-test", "scaleway_instance_server", "state"]
+  root_volume {
+    volume_type = "sbs_volume"
+    volume_id   = scaleway_block_volume.volume.id
+  }
+  filesystems {
+    filesystem_id = scaleway_file_filesystem.terraform_instance_filesystem.id
+  }
+}
+```
+
 ### With a reserved IP
 
 ```terraform
@@ -227,6 +254,9 @@ 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.
 
+- `filesystems` - (Optional) List of filesystems attached to the server.
+    - `filesystem_id` - (Optional) The unique ID of the filesystem attached to the server.
+
 - `ip_id` - (Optional) The ID of the reserved IP that is attached to the server.
 
 - `ip_ids` - (Optional) List of ID of reserved IPs that are attached to the server. Cannot be used with `ip_id`.
@@ -289,6 +319,8 @@ In addition to all arguments above, the following attributes are exported:
 - `placement_group_policy_respected` - (Deprecated) Always false, use [instance_placement_group resource](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).
 - `public_ips` - The list of public IPs of the server.
     - `id` - The ID of the IP.
     - `address` - The address of the IP.

internal/services/file/filesystem.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	file "github.com/scaleway/scaleway-sdk-go/api/file/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
@@ -37,10 +38,11 @@ func ResourceFileSystem() *schema.Resource {
 				Optional:    true,
 				Description: "The name of the filesystem",
 			},
-			"size": {
-				Type:        schema.TypeInt,
-				Required:    true,
-				Description: "The Filesystem size in bytes, with a granularity of 100 GB (10^11 bytes). Must be compliant with the minimum (100 GB) and maximum (10 TB) allowed size.",
+			"size_in_gb": {
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntBetween(1, 1000),
+				Description:  "The Filesystem size_in_gb in bytes, with a granularity of 100 GB (10^11 bytes). Must be compliant with the minimum (100 GB) and maximum (10 TB) allowed size_in_gb.",
 			},
 			"tags": {
 				Type: schema.TypeList,
@@ -87,10 +89,16 @@ func ResourceFileSystemCreate(ctx context.Context, d *schema.ResourceData, m any
 		Region:    region,
 		Name:      types.ExpandOrGenerateString(d.Get("name").(string), "file"),
 		ProjectID: d.Get("project_id").(string),
-		Size:      *types.ExpandUint64Ptr(d.Get("size")),
+		Size:      *types.ExpandUint64Ptr(d.Get("size_in_gb")),
 		Tags:      types.ExpandStrings(d.Get("tags")),
 	}
 
+	if size, ok := d.GetOk("size_in_gb"); ok {
+		sizeInGB := size.(int)
+		sizeInBytes := uint64(sizeInGB) * uint64(scw.GB)
+		req.Size = sizeInBytes
+	}
+
 	file, err := api.CreateFileSystem(req, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
@@ -128,7 +136,7 @@ func ResourceFileSystemRead(ctx context.Context, d *schema.ResourceData, m any)
 	_ = d.Set("region", fileSystem.Region)
 	_ = d.Set("organization_id", fileSystem.OrganizationID)
 	_ = d.Set("status", fileSystem.Status)
-	_ = d.Set("size", int64(fileSystem.Size))
+	_ = d.Set("size_in_gb", int(fileSystem.Size/scw.GB))
 	_ = d.Set("tags", fileSystem.Tags)
 	_ = d.Set("created_at", fileSystem.CreatedAt.Format(time.RFC3339))
 	_ = d.Set("updated_at", fileSystem.UpdatedAt.Format(time.RFC3339))
@@ -163,8 +171,9 @@ func ResourceFileSystemUpdate(ctx context.Context, d *schema.ResourceData, m any
 		req.Name = types.ExpandUpdatedStringPtr(d.Get("name"))
 	}
 
-	if d.HasChange("size") {
-		req.Size = types.ExpandUint64Ptr(d.Get("size"))
+	if d.HasChange("size_in_gb") {
+		sizeInGB := uint64(d.Get("size_in_gb").(int)) * uint64(scw.GB)
+		req.Size = types.ExpandUint64Ptr(sizeInGB)
 	}
 
 	if d.HasChange("tags") {

internal/services/file/filesystem_test.go

@@ -20,7 +20,7 @@ func TestAccFileSystem_Basic(t *testing.T) {
 
 	fileSystemName := "TestAccFileSystem_Basic"
 	fileSystemNameUpdated := "TestAccFileSystem_BasicUpdate"
-	size := int64(100_000_000_000)
+	sizeInGB := 100
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
@@ -31,25 +31,25 @@ func TestAccFileSystem_Basic(t *testing.T) {
 				Config: fmt.Sprintf(`
 					resource "scaleway_file_filesystem" "fs" {
 						name = "%s"
-						size = %d
+						size_in_gb = %d
 					}
-				`, fileSystemName, size),
+				`, fileSystemName, sizeInGB),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckFileSystemExists(tt, "scaleway_file_filesystem.fs"),
 					resource.TestCheckResourceAttr("scaleway_file_filesystem.fs", "name", fileSystemName),
-					resource.TestCheckResourceAttr("scaleway_file_filesystem.fs", "size", strconv.FormatInt(size, 10)),
+					resource.TestCheckResourceAttr("scaleway_file_filesystem.fs", "size_in_gb", strconv.Itoa(sizeInGB)),
 				),
 			},
 			{
 				Config: fmt.Sprintf(`
 					resource "scaleway_file_filesystem" "fs" {
 						name = "%s"
-						size = %d
+						size_in_gb = %d
 					}
-				`, fileSystemNameUpdated, size),
+				`, fileSystemNameUpdated, sizeInGB),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckFileSystemExists(tt, "scaleway_file_filesystem.fs"),
-					resource.TestCheckResourceAttr("scaleway_file_filesystem.fs", "size", strconv.FormatInt(size, 10)),
+					resource.TestCheckResourceAttr("scaleway_file_filesystem.fs", "size_in_gb", strconv.Itoa(sizeInGB)),
 				),
 			},
 		},
@@ -61,7 +61,7 @@ func TestAccFileSystem_SizeTooSmallFails(t *testing.T) {
 	defer tt.Cleanup()
 
 	fileSystemName := "TestAccFileSystem_SizeTooSmallFails"
-	size := int64(10_000_000_000)
+	sizeInGB := 10
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
@@ -72,9 +72,9 @@ func TestAccFileSystem_SizeTooSmallFails(t *testing.T) {
 				Config: fmt.Sprintf(`
 					resource "scaleway_file_filesystem" "fs" {
 						name = "%s"
-						size = %d
+						size_in_gb = %d
 					}
-				`, fileSystemName, size),
+				`, fileSystemName, sizeInGB),
 				ExpectError: regexp.MustCompile("size must be greater or equal to 100000000000"),
 			},
 		},
@@ -86,7 +86,7 @@ func TestAccFileSystem_InvalidSizeGranularityFails(t *testing.T) {
 	defer tt.Cleanup()
 
 	fileSystemName := "TestAccFileSystem_InvalidSizeGranularityFails"
-	size := int64(25_000_000_000)
+	sizeInGB := 250
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
@@ -97,10 +97,10 @@ func TestAccFileSystem_InvalidSizeGranularityFails(t *testing.T) {
 				Config: fmt.Sprintf(`
 					resource "scaleway_file_filesystem" "fs" {
 						name = "%s"
-						size = %d
+						size_in_gb = %d
 					}
-				`, fileSystemName, size),
-				ExpectError: regexp.MustCompile("size must be greater or equal to 100000000000"),
+				`, fileSystemName, sizeInGB),
+				ExpectError: regexp.MustCompile("size does not respect constraint, size must be a multiple of 100000000000"),
 			},
 		},
 	})