chore(apple-silicon): add support for fast retry with cassettes (#1188)

Author: remyleone

scaleway/helpers_apple_silicon.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 (
-	defaultAppleSiliconServerTimeout = 2 * time.Minute
+	defaultAppleSiliconServerTimeout       = 2 * time.Minute
+	defaultAppleSiliconServerRetryInterval = 5 * time.Second
 )
 
 const (
@@ -39,3 +41,19 @@ func asAPIWithZoneAndID(m interface{}, id string) (*applesilicon.API, scw.Zone,
 	}
 	return asAPI, zone, ID, nil
 }
+
+func waitForAppleSiliconServer(ctx context.Context, api *applesilicon.API, zone scw.Zone, ID string, timeout time.Duration) (*applesilicon.Server, error) {
+	retryInterval := defaultAppleSiliconServerRetryInterval
+	if DefaultWaitRetryInterval != nil {
+		retryInterval = *DefaultWaitRetryInterval
+	}
+
+	server, err := api.WaitForServer(&applesilicon.WaitForServerRequest{
+		ServerID:      ID,
+		Zone:          zone,
+		Timeout:       scw.TimeDurationPtr(timeout),
+		RetryInterval: &retryInterval,
+	}, scw.WithContext(ctx))
+
+	return server, err
+}

scaleway/resource_apple_silicon_server.go

@@ -98,11 +98,7 @@ func resourceScalewayAppleSiliconServerCreate(ctx context.Context, d *schema.Res
 
 	d.SetId(newZonedIDString(zone, res.ID))
 
-	_, err = asAPI.WaitForServer(&applesilicon.WaitForServerRequest{
-		ServerID:      res.ID,
-		Timeout:       scw.TimeDurationPtr(defaultAppleSiliconServerTimeout),
-		RetryInterval: DefaultWaitRetryInterval,
-	}, scw.WithContext(ctx))
+	_, err = waitForAppleSiliconServer(ctx, asAPI, zone, res.ID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -137,7 +133,7 @@ func resourceScalewayAppleSiliconServerRead(ctx context.Context, d *schema.Resou
 	_ = d.Set("ip", res.IP.String())
 	_ = d.Set("vnc_url", res.VncURL)
 
-	_ = d.Set("zone", zone.String())
+	_ = d.Set("zone", res.Zone.String())
 	_ = d.Set("organization_id", res.OrganizationID)
 	_ = d.Set("project_id", res.ProjectID)