Skip to content

Commit 6f542ac

Browse files
remyleoneremyleone
authored
feat(instance): add support for configurable timeout (#1165)
1 parent ee0c4d8 commit 6f542ac

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎scaleway/resource_instance_server.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
386386
_, err = instanceAPI.WaitForServer(&instance.WaitForServerRequest{
387387
Zone: zone,
388388
ServerID: res.Server.ID,
389-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
389+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutCreate)),
390390
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
391391
})
392392
if err != nil {
@@ -419,7 +419,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
419419
_, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
420420
Zone: zone,
421421
ServerID: res.Server.ID,
422-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
422+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutCreate)),
423423
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
424424
})
425425
if err != nil {
@@ -458,7 +458,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
458458
_, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
459459
Zone: zone,
460460
ServerID: res.Server.ID,
461-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
461+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutCreate)),
462462
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
463463
})
464464
if err != nil {
@@ -485,7 +485,7 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD
485485
server, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
486486
Zone: zone,
487487
ServerID: ID,
488-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
488+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutRead)),
489489
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
490490
})
491491
if err != nil {
@@ -639,7 +639,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
639639
server, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
640640
Zone: zone,
641641
ServerID: ID,
642-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
642+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
643643
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
644644
})
645645
if err != nil {
@@ -731,7 +731,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
731731
server, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
732732
Zone: zone,
733733
ServerID: ID,
734-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
734+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
735735
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
736736
})
737737

@@ -754,7 +754,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
754754
_, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
755755
Zone: zone,
756756
ServerID: ID,
757-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
757+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
758758
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
759759
})
760760
if err != nil {
@@ -766,7 +766,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
766766
_, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
767767
Zone: zone,
768768
ServerID: ID,
769-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
769+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
770770
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
771771
})
772772
if err != nil {
@@ -785,7 +785,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
785785
_, err = instanceAPI.WaitForServer(&instance.WaitForServerRequest{
786786
Zone: zone,
787787
ServerID: ID,
788-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
788+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
789789
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
790790
})
791791
if err != nil {
@@ -841,7 +841,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
841841
_, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
842842
Zone: zone,
843843
ServerID: ID,
844-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
844+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
845845
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
846846
})
847847
if err != nil {
@@ -872,7 +872,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
872872
_, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
873873
Zone: zone,
874874
ServerID: ID,
875-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
875+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
876876
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
877877
})
878878
if err != nil {
@@ -899,7 +899,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
899899
_, err := instanceAPI.WaitForServer(&instance.WaitForServerRequest{
900900
Zone: zone,
901901
ServerID: ID,
902-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
902+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
903903
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
904904
})
905905
if err != nil {
@@ -932,7 +932,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
932932
_, err = instanceAPI.WaitForServer(&instance.WaitForServerRequest{
933933
Zone: zone,
934934
ServerID: ID,
935-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
935+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
936936
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
937937
})
938938
if err != nil {
@@ -947,7 +947,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
947947
_, err = instanceAPI.WaitForServer(&instance.WaitForServerRequest{
948948
Zone: zone,
949949
ServerID: ID,
950-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
950+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
951951
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
952952
})
953953
if err != nil {
@@ -975,7 +975,7 @@ func resourceScalewayInstanceServerDelete(ctx context.Context, d *schema.Resourc
975975
_, err = instanceAPI.WaitForServer(&instance.WaitForServerRequest{
976976
Zone: zone,
977977
ServerID: ID,
978-
Timeout: scw.TimeDurationPtr(defaultInstanceServerWaitTimeout),
978+
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutDelete)),
979979
RetryInterval: scw.TimeDurationPtr(retryInstanceServerInterval),
980980
})
981981
if err != nil {

0 commit comments

Comments
 (0)