chore(registry): add support for fast retry with cassettes (#1191)

Author: remyleone

scaleway/helpers_registry.go

@@ -1,6 +1,7 @@
 package scaleway
 
 import (
+	"context"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -9,7 +10,8 @@ import (
 )
 
 const (
-	defaultRegistryNamespaceTimeout = 5 * time.Minute
+	defaultRegistryNamespaceTimeout       = 5 * time.Minute
+	defaultRegistryNamespaceRetryInterval = 5 * time.Second
 )
 
 type ErrorRegistryMessage struct {
@@ -39,3 +41,19 @@ func registryAPIWithRegionAndID(m interface{}, id string) (*registry.API, scw.Re
 	}
 	return api, region, id, nil
 }
+
+func waitForRegistryNamespace(ctx context.Context, api *registry.API, region scw.Region, id string, timeout time.Duration) (*registry.Namespace, error) {
+	retryInterval := defaultRegistryNamespaceRetryInterval
+	if DefaultWaitRetryInterval != nil {
+		retryInterval = *DefaultWaitRetryInterval
+	}
+
+	ns, err := api.WaitForNamespace(&registry.WaitForNamespaceRequest{
+		Region:        region,
+		NamespaceID:   id,
+		RetryInterval: &retryInterval,
+		Timeout:       scw.TimeDurationPtr(timeout),
+	}, scw.WithContext(ctx))
+
+	return ns, err
+}

scaleway/resource_registry_namespace.go

@@ -70,6 +70,11 @@ func resourceScalewayRegistryNamespaceCreate(ctx context.Context, d *schema.Reso
 
 	d.SetId(newRegionalIDString(region, ns.ID))
 
+	_, err = waitForRegistryNamespace(ctx, api, region, ns.ID, d.Timeout(schema.TimeoutCreate))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	return resourceScalewayRegistryNamespaceRead(ctx, d, meta)
 }
 
@@ -79,13 +84,7 @@ func resourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.Resour
 		return diag.FromErr(err)
 	}
 
-	ns, err := api.WaitForNamespace(&registry.WaitForNamespaceRequest{
-		Region:        region,
-		NamespaceID:   id,
-		Timeout:       scw.TimeDurationPtr(d.Timeout(schema.TimeoutRead)),
-		RetryInterval: DefaultWaitRetryInterval,
-	}, scw.WithContext(ctx))
-
+	ns, err := waitForRegistryNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutRead))
 	if err != nil {
 		if is404Error(err) {
 			d.SetId("")
@@ -111,13 +110,7 @@ func resourceScalewayRegistryNamespaceUpdate(ctx context.Context, d *schema.Reso
 		return diag.FromErr(err)
 	}
 
-	_, err = api.WaitForNamespace(&registry.WaitForNamespaceRequest{
-		Region:        region,
-		NamespaceID:   id,
-		RetryInterval: DefaultWaitRetryInterval,
-		Timeout:       scw.TimeDurationPtr(d.Timeout(schema.TimeoutUpdate)),
-	}, scw.WithContext(ctx))
-
+	_, err = waitForRegistryNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		if is404Error(err) {
 			d.SetId("")
@@ -146,13 +139,7 @@ func resourceScalewayRegistryNamespaceDelete(ctx context.Context, d *schema.Reso
 		return diag.FromErr(err)
 	}
 
-	_, err = api.WaitForNamespace(&registry.WaitForNamespaceRequest{
-		Region:        region,
-		NamespaceID:   id,
-		RetryInterval: DefaultWaitRetryInterval,
-		Timeout:       scw.TimeDurationPtr(d.Timeout(schema.TimeoutDelete)),
-	}, scw.WithContext(ctx))
-
+	_, err = waitForRegistryNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		if is404Error(err) {
 			d.SetId("")
@@ -165,7 +152,11 @@ func resourceScalewayRegistryNamespaceDelete(ctx context.Context, d *schema.Reso
 		Region:      region,
 		NamespaceID: id,
 	}, scw.WithContext(ctx))
+	if err != nil && !is404Error(err) {
+		return diag.FromErr(err)
+	}
 
+	_, err = waitForRegistryNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
 	if err != nil && !is404Error(err) {
 		return diag.FromErr(err)
 	}