fix golangci-lint

Author: Laure-di

internal/services/applesilicon/clients.go

@@ -39,5 +39,6 @@ func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*apple
 	if err != nil {
 		return nil, "", err
 	}
+
 	return privateNetworkAPI, zone, nil
 }

internal/services/applesilicon/helpers.go

@@ -2,6 +2,7 @@ package applesilicon
 
 import (
 	"context"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -13,6 +14,7 @@ func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceDa
 	if err != nil {
 		return err
 	}
+
 	listPrivateNetwork, err := privateNetworkAPI.ListServerPrivateNetworks(&applesilicon.PrivateNetworkAPIListServerPrivateNetworksRequest{
 		Zone:     zone,
 		ServerID: &serverID,
@@ -36,5 +38,6 @@ func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceDa
 	if err != nil && !httperrors.Is404(err) {
 		return err
 	}
+
 	return nil
 }

internal/services/applesilicon/server.go

@@ -2,19 +2,19 @@ package applesilicon
 
 import (
 	"context"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	applesilicon "github.com/scaleway/scaleway-sdk-go/api/applesilicon/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
 
 func ResourceServer() *schema.Resource {
@@ -176,11 +176,16 @@ func ResourceAppleSiliconServerCreate(ctx context.Context, d *schema.ResourceDat
 			ServerID:                   res.ID,
 			PerPrivateNetworkIpamIPIDs: expandPrivateNetworks(pn),
 		}
+
 		_, err := privateNetworkAPI.SetServerPrivateNetworks(req, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)
 		}
+
 		_, err = waitForAppleSiliconPrivateNetworkServer(ctx, privateNetworkAPI, zone, res.ID, d.Timeout(schema.TimeoutCreate))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	return ResourceAppleSiliconServerRead(ctx, d, m)
@@ -220,18 +225,20 @@ func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("zone", res.Zone.String())
 	_ = d.Set("organization_id", res.OrganizationID)
 	_ = d.Set("project_id", res.ProjectID)
+
 	listPrivateNetworks, err := privateNetworkAPI.ListServerPrivateNetworks(&applesilicon.PrivateNetworkAPIListServerPrivateNetworksRequest{
 		Zone:     res.Zone,
 		ServerID: &res.ID,
 	})
 	if err != nil {
 		return diag.FromErr(err)
 	}
+
 	pnRegion, err := res.Zone.Region()
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	//check if pn
+
 	_ = d.Set("private_network", flattenPrivateNetworks(pnRegion, listPrivateNetworks.ServerPrivateNetworks))
 
 	return nil
@@ -243,7 +250,7 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
-	appleSilisonPrivateNetworkAPI, zone, err := newPrivateNetworkAPIWithZone(d, m)
+	appleSilisonPrivateNetworkAPI, zonePN, err := newPrivateNetworkAPIWithZone(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -275,7 +282,7 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 	if d.HasChange("private_network") && d.Get("enable_vpc").(bool) {
 		privateNetwork := d.Get("private_network")
 		req := &applesilicon.PrivateNetworkAPISetServerPrivateNetworksRequest{
-			Zone:                       zone,
+			Zone:                       zonePN,
 			ServerID:                   ID,
 			PerPrivateNetworkIpamIPIDs: expandPrivateNetworks(privateNetwork),
 		}
@@ -285,7 +292,11 @@ func ResourceAppleSiliconServerUpdate(ctx context.Context, d *schema.ResourceDat
 			return diag.FromErr(err)
 		}
 	}
+
 	_, err = waitForAppleSiliconPrivateNetworkServer(ctx, appleSilisonPrivateNetworkAPI, zone, ID, d.Timeout(schema.TimeoutCreate))
+	if err != nil {
+		return diag.FromErr(err)
+	}
 
 	return ResourceAppleSiliconServerRead(ctx, d, m)
 }

internal/services/applesilicon/types.go

@@ -17,18 +17,23 @@ func expandPrivateNetworks(pn interface{}) map[string]*[]string {
 		id := locality.ExpandID(rawPN["id"].(string))
 
 		ipamIPIDs := &[]string{}
+
 		if ipamIPs, ok := rawPN["ipam_ip_ids"]; ok && ipamIPs != nil {
 			ipamIPsList := ipamIPs.([]interface{})
 			if len(ipamIPsList) > 0 {
 				ips := make([]string, len(ipamIPsList))
+
 				for i, ip := range ipamIPsList {
 					ips[i] = locality.ExpandID(ip.(string))
 				}
+
 				ipamIPIDs = &ips
 			}
 		}
+
 		privateNetworks[id] = ipamIPIDs
 	}
+
 	return privateNetworks
 }
 
@@ -44,5 +49,6 @@ func flattenPrivateNetworks(region scw.Region, privateNetworks []*applesilicon.S
 			"updated_at":  types.FlattenTime(privateNetwork.UpdatedAt),
 		})
 	}
+
 	return flattenedPrivateNetworks
 }

internal/services/applesilicon/waiters.go

@@ -58,9 +58,9 @@ func waitForTerminalVPCState(ctx context.Context, api *applesilicon.API, zone sc
 		Timeout:       scw.TimeDurationPtr(timeout),
 		RetryInterval: &retryInterval,
 	}, scw.WithContext(ctx))
-
 	if err != nil {
 		return err
 	}
+
 	return nil
 }