Skip to content

Commit a774dcf

Browse files
committed
fix fmt
1 parent 874f583 commit a774dcf

File tree

5 files changed

+22
-28
lines changed

5 files changed

+22
-28
lines changed

docs/resources/instance_server.md

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,30 @@ resource "scaleway_instance_server" "web" {
4848
### With filesystem
4949

5050
```terraform
51-
52-
resource "scaleway_block_volume" "volume" {
53-
iops = 15000
54-
size_in_gb = 15
51+
resource scaleway_block_volume volume {
52+
iops = 15000
53+
size_in_gb = 15
5554
}
5655
57-
resource "scaleway_file_filesystem" "terraform_instance_filesystem"{
58-
name="filesystem-instance-terraform"
59-
size = 100000000000
56+
resource scaleway_file_filesystem terraform_instance_filesystem {
57+
name = "filesystem-instance-terraform"
58+
size = 100000000000
6059
}
6160
62-
resource "scaleway_instance_server" "base" {
63-
type = "POP2-HM-2C-16G"
64-
state = "started"
65-
tags = [ "terraform-test", "scaleway_instance_server", "state" ]
66-
root_volume {
67-
volume_type = "sbs_volume"
68-
volume_id = scaleway_block_volume.volume.id
69-
}
70-
filesystems {
71-
filesystem_id = scaleway_file_filesystem.terraform_instance_filesystem.id
72-
}
73-
}`
61+
resource scaleway_instance_server base {
62+
type = "POP2-HM-2C-16G"
63+
state = "started"
64+
tags = ["terraform-test", "scaleway_instance_server", "state"]
65+
root_volume {
66+
volume_type = "sbs_volume"
67+
volume_id = scaleway_block_volume.volume.id
68+
}
69+
filesystems {
70+
filesystem_id = scaleway_file_filesystem.terraform_instance_filesystem.id
71+
}
72+
}
7473
```
7574

76-
77-
7875
### With a reserved IP
7976

8077
```terraform
@@ -321,7 +318,8 @@ In addition to all arguments above, the following attributes are exported:
321318
- `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.
322319
- `root_volume`
323320
- `volume_id` - The volume ID of the root volume of the server.
324-
- `filesystem` - (Computed) The current status of the filesystem (e.g., attached, detached).
321+
- `filesystem`
322+
- `state` - The current status of the filesystem (e.g., attached, detached).
325323
- `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).
326324
- `public_ip` - The public IP address of the server (Deprecated use `public_ips` instead).
327325
- `public_ips` - The list of public IPs of the server.

go.sum

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
447447
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
448448
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
449449
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
450-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250604134054-a06406d42247 h1:wlIvcSpGl3mGDpQmwrZHnYMIlB7Mwx3bhg151LG22Ws=
451-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250604134054-a06406d42247/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
450+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250610132304-0ea56270b666 h1:NYaPksM7wPC69Fe9VCUoYY8GYB1hplR6s5hO2PA9rSQ=
452451
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250610132304-0ea56270b666/go.mod h1:zFWiHphneiey3s8HOtAEnGrRlWivNaxW5T6d5Xfco7g=
453452
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
454453
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=

internal/services/instance/helpers_instance.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ const (
4141
defaultInstancePlacementGroupTimeout = 1 * time.Minute
4242
defaultInstanceIPTimeout = 1 * time.Minute
4343
defaultInstanceIPReverseDNSTimeout = 10 * time.Minute
44-
defaultFileSystemWaitTimeout = 15 * time.Minute
4544

4645
defaultInstanceSnapshotWaitTimeout = 1 * time.Hour
4746

internal/services/instance/server.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
11341134
return diagnostics
11351135
}
11361136

1137-
_, err := waitForFilesystems(ctx, api.API, zone, id, *scw.TimeDurationPtr(defaultFileSystemWaitTimeout))
1137+
_, err := waitForFilesystems(ctx, api.API, zone, id, *scw.TimeDurationPtr(DefaultInstanceServerWaitTimeout))
11381138
if err != nil {
11391139
return diag.FromErr(err)
11401140
}
@@ -1239,7 +1239,6 @@ func ResourceInstanceServerUpdate(ctx context.Context, d *schema.ResourceData, m
12391239
return append(warnings, ResourceInstanceServerRead(ctx, d, m)...)
12401240
}
12411241

1242-
12431242
func attachNewFileSystem(newIDs map[string]struct{}, oldIDs map[string]struct{}, api *instancehelpers.BlockAndInstanceAPI, zone scw.Zone, server *instanceSDK.Server) (diag.Diagnostics, bool) {
12441243
for id := range newIDs {
12451244
if _, alreadyAttached := oldIDs[id]; !alreadyAttached {

internal/services/instance/types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ func flattenServerPublicIPs(zone scw.Zone, ips []*instance.ServerIP) []any {
102102
return flattenedIPs
103103
}
104104

105-
106105
func flattenServerFileSystem(zone scw.Zone, fs []*instance.ServerFilesystem) []interface{} {
107106
filesystems := make([]interface{}, len(fs))
108107
region, _ := zone.Region()

0 commit comments

Comments
 (0)