Skip to content

Commit 648418f

Browse files
committed
cassettes + lint
1 parent 63d1ed1 commit 648418f

File tree

6 files changed

+4043
-2517
lines changed

6 files changed

+4043
-2517
lines changed

internal/services/instance/private_nic.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,12 @@ func ResourceInstancePrivateNICRead(ctx context.Context, d *schema.ResourceData,
195195
ResourceType: &resourceType,
196196
PrivateNetworkID: &privateNIC.PrivateNetworkID,
197197
}
198+
198199
privateIP, err := ipam.GetResourcePrivateIPs(ctx, m, region, opts)
199200
if err != nil {
200201
return diag.FromErr(err)
201202
}
203+
202204
_ = d.Set("private_ip", privateIP)
203205

204206
return nil

internal/services/instance/testdata/data-source-private-nic-basic.cassette.yaml

Lines changed: 1798 additions & 916 deletions
Large diffs are not rendered by default.

internal/services/instance/testdata/private-nic-basic.cassette.yaml

Lines changed: 598 additions & 451 deletions
Large diffs are not rendered by default.

internal/services/instance/testdata/private-nic-tags.cassette.yaml

Lines changed: 982 additions & 590 deletions
Large diffs are not rendered by default.

internal/services/instance/testdata/private-nic-with-ipam.cassette.yaml

Lines changed: 658 additions & 560 deletions
Large diffs are not rendered by default.

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(),

0 commit comments

Comments
 (0)