Fix

Author: remyleone

scaleway/helpers_baremetal.go

@@ -102,41 +102,31 @@ func flattenBaremetalIPs(ips []*baremetal.IP) interface{} {
 	return flattendIPs
 }
 
-func waitForBaremetalServer(ctx context.Context, d *schema.ResourceData, meta interface{}, timeout time.Duration) (*baremetal.Server, error) {
-	api, zonedID, err := baremetalAPIWithZoneAndID(meta, d.Id())
-	if err != nil {
-		return nil, err
-	}
-
+func waitForBaremetalServer(ctx context.Context, api *baremetal.API, zone scw.Zone, ID string, timeout time.Duration) (*baremetal.Server, error) {
 	retryInterval := baremetalRetryInterval
 	if DefaultWaitRetryInterval != nil {
 		retryInterval = *DefaultWaitRetryInterval
 	}
 
 	server, err := api.WaitForServer(&baremetal.WaitForServerRequest{
-		Zone:          zonedID.Zone,
-		ServerID:      zonedID.ID,
+		Zone:          zone,
+		ServerID:      ID,
 		Timeout:       scw.TimeDurationPtr(timeout),
 		RetryInterval: &retryInterval,
 	}, scw.WithContext(ctx))
 
 	return server, err
 }
 
-func waitForBaremetalServerInstall(ctx context.Context, d *schema.ResourceData, meta interface{}, timeout time.Duration) (*baremetal.Server, error) {
-	baremetalAPI, ID, err := baremetalAPIWithZoneAndID(meta, d.Id())
-	if err != nil {
-		return nil, err
-	}
-
+func waitForBaremetalServerInstall(ctx context.Context, api *baremetal.API, zone scw.Zone, ID string, timeout time.Duration) (*baremetal.Server, error) {
 	retryInterval := baremetalRetryInterval
 	if DefaultWaitRetryInterval != nil {
 		retryInterval = *DefaultWaitRetryInterval
 	}
 
-	server, err := baremetalAPI.WaitForServerInstall(&baremetal.WaitForServerInstallRequest{
-		Zone:          ID.Zone,
-		ServerID:      ID.ID,
+	server, err := api.WaitForServerInstall(&baremetal.WaitForServerInstallRequest{
+		Zone:          zone,
+		ServerID:      ID,
 		Timeout:       scw.TimeDurationPtr(timeout),
 		RetryInterval: &retryInterval,
 	}, scw.WithContext(ctx))

scaleway/resource_baremetal_server.go

@@ -152,7 +152,7 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
 
 	d.SetId(newZonedID(server.Zone, server.ID).String())
 
-	_, err = waitForBaremetalServer(ctx, d, meta, d.Timeout(schema.TimeoutCreate))
+	_, err = waitForBaremetalServer(ctx, baremetalAPI, zone, server.ID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -168,7 +168,7 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
 		return diag.FromErr(err)
 	}
 
-	_, err = waitForBaremetalServerInstall(ctx, d, meta, d.Timeout(schema.TimeoutCreate))
+	_, err = waitForBaremetalServerInstall(ctx, baremetalAPI, zone, server.ID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -250,7 +250,7 @@ func resourceScalewayBaremetalServerUpdate(ctx context.Context, d *schema.Resour
 			return diag.FromErr(err)
 		}
 
-		_, err = waitForBaremetalServerInstall(ctx, d, meta, d.Timeout(schema.TimeoutUpdate))
+		_, err = waitForBaremetalServerInstall(ctx, baremetalAPI, zonedID.Zone, zonedID.ID, d.Timeout(schema.TimeoutUpdate))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -269,15 +269,14 @@ func resourceScalewayBaremetalServerDelete(ctx context.Context, d *schema.Resour
 		Zone:     zonedID.Zone,
 		ServerID: zonedID.ID,
 	}, scw.WithContext(ctx))
-
 	if err != nil {
 		if is404Error(err) {
 			return nil
 		}
 		return diag.FromErr(err)
 	}
 
-	_, err = waitForBaremetalServer(ctx, d, meta, d.Timeout(schema.TimeoutDelete))
+	_, err = waitForBaremetalServer(ctx, baremetalAPI, zonedID.Zone, zonedID.ID, d.Timeout(schema.TimeoutDelete))
 	if err != nil && !is404Error(err) {
 		return diag.FromErr(err)
 	}