feat(lb): add ipam ids config on private network (#2650)

* bump sdk go

* add support for ipam ids

* add doc

* fix

* fix

---------

Co-authored-by: Rémy Léone <[email protected]>

Author: yfodil

docs/resources/lb.md

@@ -51,6 +51,42 @@ resource scaleway_lb main {
 }
 ```
 
+### With IPAM IDs
+
+```terraform
+resource "scaleway_vpc" "vpc01" {
+  name = "my vpc"
+}
+
+resource "scaleway_vpc_private_network" "pn01" {
+  vpc_id = scaleway_vpc.vpc01.id
+  ipv4_subnet {
+    subnet = "172.16.32.0/22"
+  }
+}
+
+resource "scaleway_ipam_ip" "ip01" {
+  address = "172.16.32.7"
+  source {
+    private_network_id = scaleway_vpc_private_network.pn01.id
+  }
+}
+
+resource "scaleway_lb_ip" "v4" {
+}
+
+resource scaleway_lb main {
+  ip_ids = [scaleway_lb_ip.v4.id]
+  name   = "my-lb"
+  type   = "LB-S"
+
+  private_network {
+    private_network_id = scaleway_vpc_private_network.pn01.id
+    ipam_ids = [scaleway_ipam_ip.ip01.id]
+  }
+}
+```
+
 ### Multiple configurations
 
 ```terraform
@@ -206,11 +242,11 @@ resource "scaleway_lb" "main" {
 
 - ~> **Important:** Updates to `private_network` will recreate the attachment.
 
-- `static_config` - (Deprecated) Please use `dhcp_config`. Define a local ip address of your choice for the load balancer instance.
+- `ipam_ids` - (Optional) IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network.
 
 - `dhcp_config` - (Optional) Set to `true` if you want to let DHCP assign IP addresses. See below.
 
-~> **Important:**  Only dhcp_config may be set.
+- `static_config` - (Deprecated) Please use `ipam_ids`. Define a local ip address of your choice for the load balancer instance.
 
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the Private Network was created.
 

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.5.7
 	github.com/nats-io/nats.go v1.36.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240627072537-5f842364d6c9
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240701163427-0792fd8679cc
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.24.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

@@ -242,8 +242,8 @@ github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXq
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240627072537-5f842364d6c9 h1:Gt4xayTKi0W7t5tC+O+/L8lm99rCMjyM0orOwE3fKNw=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240627072537-5f842364d6c9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240701163427-0792fd8679cc h1:8qXfdtlHHpk7rATrznSV0yy9KUIMP3YqijMdz64OO9Q=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.28.0.20240701163427-0792fd8679cc/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=

internal/locality/ids.go

@@ -8,3 +8,15 @@ func ExpandID(id interface{}) string {
 	}
 	return ID
 }
+
+func ExpandIDs(data interface{}) []string {
+	expandedIDs := make([]string, 0, len(data.([]interface{})))
+	for _, s := range data.([]interface{}) {
+		if s == nil {
+			s = ""
+		}
+		expandedID := ExpandID(s.(string))
+		expandedIDs = append(expandedIDs, expandedID)
+	}
+	return expandedIDs
+}

internal/services/flexibleip/data_source_flexible_ips.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	flexibleip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
+	"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/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
@@ -133,7 +134,7 @@ func DataSourceFlexibleIPsRead(ctx context.Context, d *schema.ResourceData, m in
 
 	res, err := fipAPI.ListFlexibleIPs(&flexibleip.ListFlexibleIPsRequest{
 		Zone:      zone,
-		ServerIDs: expandServerIDs(d.Get("server_ids")),
+		ServerIDs: locality.ExpandIDs(d.Get("server_ids")),
 		ProjectID: types.ExpandStringPtr(d.Get("project_id")),
 		Tags:      types.ExpandStrings(d.Get("tags")),
 	}, scw.WithContext(ctx))

internal/services/flexibleip/types.go

@@ -2,7 +2,6 @@ package flexibleip
 
 import (
 	flexibleip "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
 
@@ -22,15 +21,3 @@ func flattenFlexibleIPMacAddress(mac *flexibleip.MACAddress) interface{} {
 		},
 	}
 }
-
-func expandServerIDs(data interface{}) []string {
-	expandedIDs := make([]string, 0, len(data.([]interface{})))
-	for _, s := range data.([]interface{}) {
-		if s == nil {
-			s = ""
-		}
-		expandedID := locality.ExpandID(s.(string))
-		expandedIDs = append(expandedIDs, expandedID)
-	}
-	return expandedIDs
-}

internal/services/lb/lb.go

@@ -143,6 +143,16 @@ func ResourceLb() *schema.Resource {
 							Optional:    true,
 							Computed:    true,
 						},
+						"ipam_ids": {
+							Type: schema.TypeList,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+							MaxItems:    1,
+							Optional:    true,
+							Computed:    true,
+							Description: "IPAM ID of a pre-reserved IP address to assign to the Load Balancer on this Private Network",
+						},
 						// Readonly attributes
 						"status": {
 							Type:        schema.TypeString,

internal/services/lb/lb_test.go

@@ -460,6 +460,72 @@ func TestAccLB_WithPrivateNetworksOnDHCPConfig(t *testing.T) {
 	})
 }
 
+func TestAccLB_WithPrivateNetworksIPAMIDs(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			isLbDestroyed(tt),
+			vpcchecks.CheckPrivateNetworkDestroy(tt),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+				resource "scaleway_vpc" "vpc01" {
+				  name = "my vpc"
+				}
+				
+				resource "scaleway_vpc_private_network" "pn01" {
+				  vpc_id = scaleway_vpc.vpc01.id
+				  ipv4_subnet {
+					subnet = "172.16.32.0/22"
+				  }
+				}
+				
+				resource "scaleway_ipam_ip" "ip01" {
+				  address = "172.16.32.7"
+				  source {
+					private_network_id = scaleway_vpc_private_network.pn01.id
+				  }
+				}
+				
+				resource scaleway_lb lb01 {
+				  name = "test-lb-with-private-network-ipam"
+				  type = "LB-S"
+				
+				  private_network {
+				    private_network_id = scaleway_vpc_private_network.pn01.id
+				    ipam_ids = [scaleway_ipam_ip.ip01.id]
+				  }	
+				}
+
+				data "scaleway_ipam_ip" "by_name" {
+				  resource {
+					name = scaleway_lb.lb01.name
+					type = "lb_server"
+				  }
+				  type = "ipv4"
+				}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isLbPresent(tt, "scaleway_lb.lb01"),
+					resource.TestCheckResourceAttrPair(
+						"scaleway_lb.lb01", "private_network.0.private_network_id",
+						"scaleway_vpc_private_network.pn01", "id"),
+					resource.TestCheckResourceAttrPair(
+						"scaleway_lb.lb01", "private_network.0.ipam_ids.0",
+						"scaleway_ipam_ip.ip01", "id"),
+					resource.TestCheckResourceAttrPair(
+						"scaleway_ipam_ip.ip01", "address",
+						"data.scaleway_ipam_ip.by_name", "address_cidr"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccLB_WithoutPNConfig(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()