test + cassettes + linter

Author: Mia-Cross

internal/services/ipam/helpers.go

@@ -87,12 +87,15 @@ func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region
 		if opts.PrivateNetworkID != nil {
 			req.PrivateNetworkID = opts.PrivateNetworkID
 		}
+
 		if opts.ResourceID != nil {
 			req.ResourceID = opts.ResourceID
 		}
+
 		if opts.ResourceName != nil {
 			req.ResourceName = opts.ResourceName
 		}
+
 		if opts.ResourceType != nil {
 			req.ResourceType = *opts.ResourceType
 		}
@@ -108,11 +111,13 @@ func GetResourcePrivateIPs(ctx context.Context, m interface{}, region scw.Region
 	}
 
 	ipList := make([]map[string]interface{}, 0, len(resp.IPs))
+
 	for _, ip := range resp.IPs {
 		ipNet := ip.Address
 		if ipNet.IP == nil {
 			continue
 		}
+
 		ipMap := map[string]interface{}{
 			"id":      regional.NewIDString(region, ip.ID),
 			"address": ipNet.IP.String(),

internal/services/vpcgw/helpers.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	ipamAPI "github.com/scaleway/scaleway-sdk-go/api/ipam/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
 	v2 "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v2"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -14,6 +15,7 @@ import (
 	"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/instance"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/ipam"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
 
@@ -301,6 +303,56 @@ func readVPCGWNetworkResourceDataV2(d *schema.ResourceData, gatewayNetwork *v2.G
 	return nil
 }
 
+func getPrivateIPsV1(ctx context.Context, gn *vpcgw.GatewayNetwork, m interface{}) interface{} {
+	var privateIPs []map[string]interface{}
+
+	resourceID := gn.ID
+
+	region, err := gn.Zone.Region()
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	resourceType := ipamAPI.ResourceTypeVpcGatewayNetwork
+	opts := &ipam.GetResourcePrivateIPsOptions{
+		ResourceID:       &resourceID,
+		ResourceType:     &resourceType,
+		PrivateNetworkID: &gn.PrivateNetworkID,
+	}
+
+	privateIPs, err = ipam.GetResourcePrivateIPs(ctx, m, region, opts)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	return privateIPs
+}
+
+func getPrivateIPsV2(ctx context.Context, gn *v2.GatewayNetwork, m interface{}) interface{} {
+	var privateIPs []map[string]interface{}
+
+	resourceID := gn.ID
+
+	region, err := gn.Zone.Region()
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	resourceType := ipamAPI.ResourceTypeVpcGatewayNetwork
+	opts := &ipam.GetResourcePrivateIPsOptions{
+		ResourceID:       &resourceID,
+		ResourceType:     &resourceType,
+		PrivateNetworkID: &gn.PrivateNetworkID,
+	}
+
+	privateIPs, err = ipam.GetResourcePrivateIPs(ctx, m, region, opts)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	return privateIPs
+}
+
 // updateGatewayV1 performs the update of the public gateway using the v1 API
 func updateGatewayV1(ctx context.Context, d *schema.ResourceData, apiV1 *vpcgw.API, zone scw.Zone, id string) error {
 	v1UpdateRequest := &vpcgw.UpdateGatewayRequest{

internal/services/vpcgw/network.go

@@ -125,6 +125,25 @@ func ResourceNetwork() *schema.Resource {
 				Computed:    true,
 				Description: "The mac address on this network",
 			},
+			"private_ips": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "List of private IPv4 addresses associated with the resource.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"id": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The ID of the IPv4 address resource.",
+						},
+						"address": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The private IPv4 address.",
+						},
+					},
+				},
+			},
 			"created_at": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -218,6 +237,10 @@ func ResourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData,
 				return diag.FromErr(err)
 			}
 
+			if gatewayNetwork.PrivateNetworkID != "" {
+				_ = d.Set("private_ips", getPrivateIPsV1(ctx, gatewayV1, m))
+			}
+
 			return readVPCGWNetworkResourceDataV1(d, gatewayV1)
 		} else if httperrors.Is404(err) {
 			d.SetId("")
@@ -228,6 +251,10 @@ func ResourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
+	if gatewayNetwork.PrivateNetworkID != "" {
+		_ = d.Set("private_ips", getPrivateIPsV2(ctx, gatewayNetwork, m))
+	}
+
 	return readVPCGWNetworkResourceDataV2(d, gatewayNetwork)
 }
 

internal/services/vpcgw/network_test.go

@@ -64,6 +64,8 @@ func TestAccVPCGatewayNetwork_WithIPAMConfig(t *testing.T) {
 					resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "ipam_config.0.push_default_route", "true"),
 					resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "ipam_config.0.ipam_ip_id"),
 					resource.TestCheckResourceAttr("scaleway_vpc_gateway_network.main", "enable_masquerade", "true"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "private_ips.0.id"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_gateway_network.main", "private_ips.0.address"),
 				),
 			},
 			{