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(iot): add support for configurable timeout in hub #1177

Merged
merged 2 commits into from
Apr 6, 2022
Merged

feat(iot): add support for configurable timeout in hub #1177

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d20db1c
feat(iot): add support for configurable timeout in hub
remyleone Apr 5, 2022
e25c633
Merge branch 'master' into timeout_iot_hub
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
4 changes: 3 additions & 1 deletion scaleway/helpers_iot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package scaleway

import (
"fmt"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
iot "github.com/scaleway/scaleway-sdk-go/api/iot/v1"
Expand All @@ -25,11 +26,12 @@ func iotAPIWithRegionAndID(m interface{}, id string) (*iot.API, scw.Region, stri
return iotAPI, region, ID, err
}

func waitIotHub(iotAPI *iot.API, region scw.Region, hubID string, desiredStates ...iot.HubStatus) error {
func waitIotHub(iotAPI *iot.API, region scw.Region, hubID string, timeout time.Duration, desiredStates ...iot.HubStatus) error {
hub, err := iotAPI.WaitForHub(&iot.WaitForHubRequest{
HubID: hubID,
Region: region,
RetryInterval: DefaultWaitRetryInterval,
Timeout: scw.TimeDurationPtr(timeout),
})
if err != nil {
return err
Expand Down
6 changes: 3 additions & 3 deletions scaleway/resource_iot_hub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func resourceScalewayIotHubCreate(ctx context.Context, d *schema.ResourceData, m
return diag.FromErr(err)
}

err = waitIotHub(iotAPI, region, res.ID, iot.HubStatusReady)
err = waitIotHub(iotAPI, region, res.ID, d.Timeout(schema.TimeoutCreate), iot.HubStatusReady)
if err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -183,7 +183,7 @@ func resourceScalewayIotHubCreate(ctx context.Context, d *schema.ResourceData, m
return diag.FromErr(err)
}

err = waitIotHub(iotAPI, region, res.ID, iot.HubStatusDisabled)
err = waitIotHub(iotAPI, region, res.ID, d.Timeout(schema.TimeoutCreate), iot.HubStatusDisabled)
if err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -262,7 +262,7 @@ func resourceScalewayIotHubUpdate(ctx context.Context, d *schema.ResourceData, m
return diag.FromErr(err)
}

err = waitIotHub(iotAPI, region, hubID, iot.HubStatusReady, iot.HubStatusDisabled)
err = waitIotHub(iotAPI, region, hubID, d.Timeout(schema.TimeoutUpdate), iot.HubStatusReady, iot.HubStatusDisabled)
if err != nil {
return diag.FromErr(err)
}
Expand Down