Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(baremetal): add configurable timeout #1164

Merged
merged 5 commits into from
Apr 6, 2022
Merged

feat(baremetal): add configurable timeout #1164

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec3fa0e
feat(baremetal): add configurable timeout
remyleone Apr 5, 2022
ca618df
Merge branch 'master' into baremetal_timeout
Monitob Apr 6, 2022
b8f8b1c
Fix
remyleone Apr 6, 2022
ac43ecf
Merge branch 'master' into baremetal_timeout
remyleone Apr 6, 2022
957aed5
Merge branch 'master' into baremetal_timeout
remyleone Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions scaleway/helpers_baremetal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ import (
)

const (
baremetalServerWaitForTimeout = 60 * time.Minute
baremetalServerRetryFuncTimeout = baremetalServerWaitForTimeout + time.Minute // some RetryFunc are calling a WaitFor
defaultBaremetalServerTimeout = baremetalServerRetryFuncTimeout + time.Minute
baremetalServerWaitForTimeout = 60 * time.Minute
baremetalServerRetryFuncTimeout = baremetalServerWaitForTimeout + time.Minute // some RetryFunc are calling a WaitFor
defaultBaremetalServerTimeout = baremetalServerRetryFuncTimeout + time.Minute
defaultBaremetalServerCreateTimeout = defaultBaremetalServerTimeout
defaultBaremetalServerReadTimeout = defaultBaremetalServerTimeout
defaultBaremetalServerUpdateTimeout = defaultBaremetalServerTimeout
defaultBaremetalServerDeleteTimeout = defaultBaremetalServerTimeout
)

// instanceAPIWithZone returns a new baremetal API and the zone for a Create request
Expand Down
13 changes: 8 additions & 5 deletions scaleway/resource_baremetal_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ func resourceScalewayBaremetalServer() *schema.Resource {
},
SchemaVersion: 0,
Timeouts: &schema.ResourceTimeout{
Default: schema.DefaultTimeout(defaultBaremetalServerTimeout),
Create: schema.DefaultTimeout(defaultBaremetalServerCreateTimeout),
Update: schema.DefaultTimeout(defaultBaremetalServerUpdateTimeout),
Delete: schema.DefaultTimeout(defaultBaremetalServerDeleteTimeout),
Read: schema.DefaultTimeout(defaultBaremetalServerReadTimeout),
},
Schema: map[string]*schema.Schema{
"name": {
Expand Down Expand Up @@ -155,7 +158,7 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
_, err = baremetalAPI.WaitForServer(&baremetal.WaitForServerRequest{
Zone: server.Zone,
ServerID: server.ID,
Timeout: scw.TimeDurationPtr(baremetalServerWaitForTimeout),
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutCreate)),
RetryInterval: DefaultWaitRetryInterval,
})
if err != nil {
Expand All @@ -176,7 +179,7 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
_, err = baremetalAPI.WaitForServerInstall(&baremetal.WaitForServerInstallRequest{
Zone: server.Zone,
ServerID: server.ID,
Timeout: scw.TimeDurationPtr(baremetalServerWaitForTimeout),
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutCreate)),
RetryInterval: DefaultWaitRetryInterval,
})
if err != nil {
Expand Down Expand Up @@ -263,7 +266,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
_, err = baremetalAPI.WaitForServerInstall(&baremetal.WaitForServerInstallRequest{
Zone: server.Zone,
ServerID: server.ID,
Timeout: scw.TimeDurationPtr(baremetalServerWaitForTimeout),
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
RetryInterval: DefaultWaitRetryInterval,
})
if err != nil {
Expand Down Expand Up @@ -295,7 +298,7 @@ func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.Resour
_, err = baremetalAPI.WaitForServer(&baremetal.WaitForServerRequest{
Zone: server.Zone,
ServerID: server.ID,
Timeout: scw.TimeDurationPtr(baremetalServerWaitForTimeout),
Timeout: scw.TimeDurationPtr(d.Timeout(schema.TimeoutDelete)),
RetryInterval: DefaultWaitRetryInterval,
})

Expand Down