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

Author: remyleone

scaleway/helpers_container.go

@@ -1,6 +1,7 @@
 package scaleway
 
 import (
+	"context"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -10,6 +11,7 @@ import (
 
 const (
 	defaultContainerNamespaceTimeout = 20 * time.Second
+	defaultContainerRetryInterval    = 5 * time.Second
 )
 
 // containerAPIWithRegion returns a new container API and the region.
@@ -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
+}

scaleway/resource_container_namespace.go

@@ -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)
 }
 
@@ -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("")
@@ -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,
 	}
 
@@ -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("")
@@ -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
 }