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

chore(container): add support for fast retry with cassettes #1190

Merged
merged 4 commits into from
Apr 11, 2022
Merged

chore(container): add support for fast retry with cassettes #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b49bbe4
chore(container): add support for fast retry with cassettes
remyleone Apr 8, 2022
32e652c
Fix
remyleone Apr 11, 2022
1675385
Merge branch 'master' into retries_container
remyleone Apr 11, 2022
253d646
Fix cassettes
remyleone Apr 11, 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
18 changes: 18 additions & 0 deletions scaleway/helpers_container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package scaleway

import (
"context"
"time"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
Expand All @@ -10,6 +11,7 @@ import (

const (
defaultContainerNamespaceTimeout = 20 * time.Second
defaultContainerRetryInterval = 5 * time.Second
)

// containerAPIWithRegion returns a new container API and the region.
Expand Down Expand Up @@ -97,3 +99,19 @@ func setCreateContainerRequest(d *schema.ResourceData, region scw.Region) (*cont

return req, nil
}

func waitForContainerNamespace(ctx context.Context, containerAPI *container.API, region scw.Region, id string, timeout time.Duration) (*container.Namespace, error) {
retryInterval := defaultContainerRetryInterval
if DefaultWaitRetryInterval != nil {
retryInterval = *DefaultWaitRetryInterval
}

ns, err := containerAPI.WaitForNamespace(&container.WaitForNamespaceRequest{
Region: region,
NamespaceID: id,
RetryInterval: &retryInterval,
Timeout: scw.TimeDurationPtr(timeout),
}, scw.WithContext(ctx))

return ns, err
}
33 changes: 11 additions & 22 deletions scaleway/resource_container_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ func resourceScalewayContainerNamespaceCreate(ctx context.Context, d *schema.Res

d.SetId(newRegionalIDString(region, ns.ID))

_, err = waitForContainerNamespace(ctx, api, region, ns.ID, d.Timeout(schema.TimeoutCreate))
if err != nil {
return diag.FromErr(err)
}

return resourceScalewayContainerNamespaceRead(ctx, d, meta)
}

Expand All @@ -91,12 +96,7 @@ func resourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.Resou
return diag.FromErr(err)
}

ns, err := api.WaitForNamespace(&container.WaitForNamespaceRequest{
Region: region,
NamespaceID: id,
RetryInterval: DefaultWaitRetryInterval,
}, scw.WithContext(ctx))

ns, err := waitForContainerNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutRead))
if err != nil {
if is404Error(err) {
d.SetId("")
Expand All @@ -123,17 +123,13 @@ func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.Res
return diag.FromErr(err)
}

ns, err := api.WaitForNamespace(&container.WaitForNamespaceRequest{
Region: region,
NamespaceID: id,
RetryInterval: DefaultWaitRetryInterval,
}, scw.WithContext(ctx))
ns, err := waitForContainerNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutUpdate))
if err != nil {
return diag.FromErr(err)
}

req := &container.UpdateNamespaceRequest{
Region: region,
Region: ns.Region,
NamespaceID: ns.ID,
}

Expand All @@ -159,11 +155,7 @@ func resourceScalewayContainerNamespaceDelete(ctx context.Context, d *schema.Res
return diag.FromErr(err)
}

_, err = api.WaitForNamespace(&container.WaitForNamespaceRequest{
Region: region,
NamespaceID: id,
RetryInterval: DefaultWaitRetryInterval,
}, scw.WithContext(ctx))
_, err = waitForContainerNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
if err != nil {
if is404Error(err) {
d.SetId("")
Expand All @@ -176,21 +168,18 @@ func resourceScalewayContainerNamespaceDelete(ctx context.Context, d *schema.Res
Region: region,
NamespaceID: id,
}, scw.WithContext(ctx))

if err != nil && !is404Error(err) {
return diag.FromErr(err)
}

_, err = api.WaitForNamespace(&container.WaitForNamespaceRequest{
Region: region,
NamespaceID: id,
}, scw.WithContext(ctx))
_, err = waitForContainerNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
if err != nil {
if is404Error(err) {
d.SetId("")
return nil
}
return diag.FromErr(err)
}

return nil
}
Loading