Skip to content

Commit ce54f2e

Browse files
Mia-Crossyfodil
andcommitted
feat(baremetal): read private ips
Co-authored-by: Yacine Fodil <[email protected]>
1 parent 8801985 commit ce54f2e

8 files changed

+7878
-5461
lines changed

docs/resources/baremetal_server.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,9 @@ In addition to all arguments above, the following attributes are exported:
321321
- `status` - The private network status.
322322
- `created_at` - The date and time of the creation of the private network.
323323
- `updated_at` - The date and time of the last update of the private network.
324+
- `private_ip` - The list of private IPv4 addresses associated with the resource.
325+
- `id` - The ID of the IPv4 address resource.
326+
- `address` - The private IPv4 address.
324327
- `ips` - (List of) The IPs of the server.
325328
- `id` - The ID of the IP.
326329
- `address` - The address of the IP.

internal/services/baremetal/server.go

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1313
"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
1414
baremetalV3 "github.com/scaleway/scaleway-sdk-go/api/baremetal/v3"
15+
ipamAPI "github.com/scaleway/scaleway-sdk-go/api/ipam/v1"
1516
"github.com/scaleway/scaleway-sdk-go/scw"
1617
sdkValidation "github.com/scaleway/scaleway-sdk-go/validation"
1718
"github.com/scaleway/terraform-provider-scaleway/v2/internal/cdf"
@@ -21,6 +22,7 @@ import (
2122
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
2223
"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
2324
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
25+
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
2426
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
2527
"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
2628
)
@@ -268,6 +270,25 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
268270
Optional: true,
269271
Description: "The partitioning schema in json format",
270272
},
273+
"private_ips": {
274+
Type: schema.TypeList,
275+
Computed: true,
276+
Description: "List of private IPv4 addresses associated with the resource",
277+
Elem: &schema.Resource{
278+
Schema: map[string]*schema.Schema{
279+
"id": {
280+
Type: schema.TypeString,
281+
Computed: true,
282+
Description: "The ID of the IPv4 address resource",
283+
},
284+
"address": {
285+
Type: schema.TypeString,
286+
Computed: true,
287+
Description: "The private IPv4 address",
288+
},
289+
},
290+
},
291+
},
271292
},
272293
CustomizeDiff: customdiff.Sequence(
273294
customDiffOffer(),
@@ -508,6 +529,32 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface
508529

509530
_ = d.Set("private_network", flattenPrivateNetworks(pnRegion, listPrivateNetworks.ServerPrivateNetworks))
510531

532+
privateNetworkIDs := make([]string, 0, len(listPrivateNetworks.ServerPrivateNetworks))
533+
for _, pn := range listPrivateNetworks.ServerPrivateNetworks {
534+
privateNetworkIDs = append(privateNetworkIDs, pn.PrivateNetworkID)
535+
}
536+
537+
var allPrivateIPs []map[string]interface{}
538+
539+
for _, privateNetworkID := range privateNetworkIDs {
540+
resourceType := ipamAPI.ResourceTypeBaremetalPrivateNic
541+
opts := &ipam.GetResourcePrivateIPsOptions{
542+
ResourceType: &resourceType,
543+
PrivateNetworkID: &privateNetworkID,
544+
}
545+
546+
privateIPs, err := ipam.GetResourcePrivateIPs(ctx, m, pnRegion, opts)
547+
if err != nil {
548+
return diag.FromErr(err)
549+
}
550+
551+
if privateIPs != nil {
552+
allPrivateIPs = append(allPrivateIPs, privateIPs...)
553+
}
554+
}
555+
556+
_ = d.Set("private_ips", allPrivateIPs)
557+
511558
return nil
512559
}
513560

internal/services/baremetal/server_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,8 @@ func TestAccServer_CreateServerWithPrivateNetwork(t *testing.T) {
613613
testAccCheckBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
614614
testAccCheckBaremetalServerHasPrivateNetwork(tt, "scaleway_baremetal_server.base"),
615615
resource.TestCheckResourceAttrPair("scaleway_baremetal_server.base", "private_network.0.id", "scaleway_vpc_private_network.pn", "id"),
616+
resource.TestCheckResourceAttrSet("scaleway_baremetal_server.base", "private_ips.0.id"),
617+
resource.TestCheckResourceAttrSet("scaleway_baremetal_server.base", "private_ips.0.address"),
616618
),
617619
},
618620
},

internal/services/baremetal/testdata/server-add-another-private-network.cassette.yaml

Lines changed: 2110 additions & 1473 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-add-private-network.cassette.yaml

Lines changed: 1963 additions & 1277 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-create-server-with-private-network.cassette.yaml

Lines changed: 1588 additions & 1000 deletions
Large diffs are not rendered by default.

internal/services/baremetal/testdata/server-with-ipam-private-network.cassette.yaml

Lines changed: 2103 additions & 1711 deletions
Large diffs are not rendered by default.

internal/services/ipam/helpers.go

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package ipam
22

33
import (
4+
"context"
5+
"fmt"
46
"net"
57
"time"
68

@@ -65,3 +67,63 @@ func diffSuppressFuncStandaloneIPandCIDR(_, oldValue, newValue string, _ *schema
6567

6668
return false
6769
}
70+
71+
type GetResourcePrivateIPsOptions struct {
72+
ResourceType *ipam.ResourceType
73+
ResourceID *string
74+
ResourceName *string
75+
PrivateNetworkID *string
76+
}
77+
78+
// GetResourcePrivateIPs fetches the private IP addresses of a resource in a private network.
79+
func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region, opts *GetResourcePrivateIPsOptions) ([]map[string]interface{}, error) {
80+
ipamAPI := ipam.NewAPI(meta.ExtractScwClient(m))
81+
82+
req := &ipam.ListIPsRequest{
83+
Region: region,
84+
}
85+
86+
if opts != nil {
87+
if opts.PrivateNetworkID != nil {
88+
req.PrivateNetworkID = opts.PrivateNetworkID
89+
}
90+
91+
if opts.ResourceID != nil {
92+
req.ResourceID = opts.ResourceID
93+
}
94+
95+
if opts.ResourceName != nil {
96+
req.ResourceName = opts.ResourceName
97+
}
98+
99+
if opts.ResourceType != nil {
100+
req.ResourceType = *opts.ResourceType
101+
}
102+
}
103+
104+
resp, err := ipamAPI.ListIPs(req, scw.WithContext(ctx))
105+
if err != nil {
106+
return nil, fmt.Errorf("error fetching IPs from IPAM: %w", err)
107+
}
108+
109+
if len(resp.IPs) == 0 {
110+
return nil, nil
111+
}
112+
113+
ipList := make([]map[string]interface{}, 0, len(resp.IPs))
114+
115+
for _, ip := range resp.IPs {
116+
ipNet := ip.Address
117+
if ipNet.IP == nil {
118+
continue
119+
}
120+
121+
ipMap := map[string]interface{}{
122+
"id": regional.NewIDString(region, ip.ID),
123+
"address": ipNet.IP.String(),
124+
}
125+
ipList = append(ipList, ipMap)
126+
}
127+
128+
return ipList, nil
129+
}

0 commit comments

Comments
 (0)