fixes and lint

Author: yfodil

internal/services/baremetal/server.go

@@ -492,7 +492,7 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface
 	}
 	_ = d.Set("private_network", flattenPrivateNetworks(pnRegion, listPrivateNetworks.ServerPrivateNetworks))
 
-	var privateNetworkIDs []string
+	privateNetworkIDs := make([]string, 0, len(listPrivateNetworks.ServerPrivateNetworks))
 	for _, pn := range listPrivateNetworks.ServerPrivateNetworks {
 		privateNetworkIDs = append(privateNetworkIDs, pn.PrivateNetworkID)
 	}

internal/services/instance/private_nic.go

@@ -88,6 +88,7 @@ func ResourcePrivateNIC() *schema.Resource {
 						},
 					},
 				},
+			},
 			"ipam_ip_ids": {
 				Type: schema.TypeList,
 				Elem: &schema.Schema{

internal/services/instance/server.go

@@ -804,6 +804,8 @@ func ResourceInstanceServerRead(ctx context.Context, d *schema.ResourceData, m i
 			}
 		}
 		_ = d.Set("private_ips", allPrivateIPs)
+
+		return nil
 	}
 	return nil
 }

internal/services/instance/server_test.go

@@ -14,6 +14,7 @@ import (
 	instanceSDK "github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	"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/provider"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
@@ -2103,7 +2104,7 @@ func TestAccServer_BlockExternalRootVolumeUpdate(t *testing.T) {
 	})
 }
 
-/*func TestAccServer_PrivateNetworkMissingPNIC(t *testing.T) {
+func TestAccServer_PrivateNetworkMissingPNIC(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
@@ -2265,4 +2266,3 @@ func TestAccServer_BlockExternalRootVolumeUpdate(t *testing.T) {
 		},
 	})
 }
-*/

internal/services/ipam/helpers.go

@@ -106,7 +106,7 @@ func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region
 		return nil, nil
 	}
 
-	var ipList []map[string]interface{}
+	ipList := make([]map[string]interface{}, 0, len(resp.IPs))
 	for _, ip := range resp.IPs {
 		ipNet := ip.Address
 		if ipNet.IP == nil {

internal/services/lb/lb.go

@@ -347,7 +347,7 @@ func resourceLbRead(ctx context.Context, d *schema.ResourceData, m interface{})
 	}
 	_ = d.Set("private_network", flattenPrivateNetworkConfigs(privateNetworks))
 
-	var privateNetworkIDs []string
+	privateNetworkIDs := make([]string, 0, len(privateNetworks))
 	for _, pn := range privateNetworks {
 		privateNetworkIDs = append(privateNetworkIDs, pn.PrivateNetworkID)
 	}