Skip to content

Commit eed227b

Browse files
committed
cassettes + lint
1 parent 5011eec commit eed227b

File tree

4 files changed

+820
-616
lines changed

4 files changed

+820
-616
lines changed

internal/services/ipam/helpers.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,15 @@ func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region
8787
if opts.PrivateNetworkID != nil {
8888
req.PrivateNetworkID = opts.PrivateNetworkID
8989
}
90+
9091
if opts.ResourceID != nil {
9192
req.ResourceID = opts.ResourceID
9293
}
94+
9395
if opts.ResourceName != nil {
9496
req.ResourceName = opts.ResourceName
9597
}
98+
9699
if opts.ResourceType != nil {
97100
req.ResourceType = *opts.ResourceType
98101
}
@@ -108,11 +111,13 @@ func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region
108111
}
109112

110113
ipList := make([]map[string]interface{}, 0, len(resp.IPs))
114+
111115
for _, ip := range resp.IPs {
112116
ipNet := ip.Address
113117
if ipNet.IP == nil {
114118
continue
115119
}
120+
116121
ipMap := map[string]interface{}{
117122
"id": regional.NewIDString(region, ip.ID),
118123
"address": ipNet.IP.String(),

internal/services/lb/lb.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package lb
33
import (
44
"context"
55
"fmt"
6-
ipamAPI "github.com/scaleway/scaleway-sdk-go/api/ipam/v1"
7-
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
86
"net"
97
"strings"
108
"time"
@@ -13,6 +11,7 @@ import (
1311
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1412
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
1513
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
14+
ipamAPI "github.com/scaleway/scaleway-sdk-go/api/ipam/v1"
1615
lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
1716
"github.com/scaleway/scaleway-sdk-go/scw"
1817
"github.com/scaleway/terraform-provider-scaleway/v2/internal/cdf"
@@ -22,6 +21,7 @@ import (
2221
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
2322
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
2423
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
24+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
2525
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
2626
"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
2727
)
@@ -360,17 +360,20 @@ func resourceLbRead(ctx context.Context, d *schema.ResourceData, m interface{})
360360
privateNetworkIDs = append(privateNetworkIDs, pn.PrivateNetworkID)
361361
}
362362

363-
var allPrivateIPs []map[string]interface{}
363+
allPrivateIPs := []map[string]interface{}(nil)
364364
resourceType := ipamAPI.ResourceTypeLBServer
365+
365366
for _, privateNetworkID := range privateNetworkIDs {
366367
opts := &ipam.GetResourcePrivateIPsOptions{
367368
ResourceType: &resourceType,
368369
PrivateNetworkID: &privateNetworkID,
369370
}
371+
370372
privateIPs, err := ipam.GetResourcePrivateIPs(ctx, m, region, opts)
371373
if err != nil {
372374
return diag.FromErr(err)
373375
}
376+
374377
if privateIPs != nil {
375378
allPrivateIPs = append(allPrivateIPs, privateIPs...)
376379
}

0 commit comments

Comments
 (0)