resolve conflicts (#2507)

Author: yfodil

docs/resources/lb.md

@@ -18,9 +18,9 @@ resource "scaleway_lb_ip" "main" {
 }
 
 resource "scaleway_lb" "base" {
-  ip_id  = scaleway_lb_ip.main.id
-  zone   = scaleway_lb_ip.main.zone
-  type   = "LB-S"
+  ip_ids  = [scaleway_lb_ip.main.id]
+  zone    = scaleway_lb_ip.main.zone
+  type    = "LB-S"
 }
 ```
 
@@ -29,13 +29,27 @@ resource "scaleway_lb" "base" {
 ```terraform
 
 resource "scaleway_lb" "base" {
-  ip_id  = scaleway_lb_ip.main.id
-  zone   = scaleway_lb_ip.main.zone
-  type   = "LB-S"
+  name               = "private-lb"
+  type               = "LB-S"
   assign_flexible_ip = false
 }
 ```
 
+### With IPv6
+
+```terraform
+resource "scaleway_lb_ip" "v4" {
+}
+resource "scaleway_lb_ip" "v6" {
+  is_ipv6 = true
+}
+resource scaleway_lb main {
+  ip_ids = [scaleway_lb_ip.v4.id, scaleway_lb_ip.v6.id]
+  name   = "ipv6-lb"
+  type   = "LB-S"
+}
+```
+
 ### Multiple configurations
 
 ```terraform
@@ -113,7 +127,9 @@ resource scaleway_lb main {
 
 The following arguments are supported:
 
-- `ip_id` - (Optional) The ID of the associated LB IP. See below.
+- `ip_ids` - (Optional) The List of IP IDs to attach to the Load Balancer.
+
+- `ip_id` - (Deprecated) The ID of the associated LB IP. See below.
 
 ~> **Important:** Updates to `ip_id` will recreate the load-balancer.
 
@@ -145,7 +161,8 @@ In addition to all arguments above, the following attributes are exported:
 
 ~> **Important:** Load-Balancers' IDs are [zoned](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
 
-- `ip_address` -  The load-balance public IP Address
+- `ip_address` -  The load-balancer public IPv4 Address.
+- `ipv6_address` -  The load-balancer public IPv6 Address.
 - `organization_id` - The organization ID the load-balancer is associated with.
 
 ~> **Important:** `release_ip` will not be supported. This prevents the destruction of the IP from releasing a LBs.

docs/resources/lb_ip.md

@@ -18,13 +18,22 @@ resource "scaleway_lb_ip" "ip" {
 }
 ```
 
+### With IPv6
+
+```terraform
+resource "scaleway_lb_ip" "ipv6" {
+    is_ipv6 = true
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
 
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the IP should be reserved.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the IP is associated with.
 - `reverse` - (Optional) The reverse domain associated with this IP.
+- `is_ipv6` - (Optional) If true, creates a Flexible IP with an IPv6 address.
 
 ## Attributes Reference
 

internal/services/lb/helpers_lb.go

@@ -237,3 +237,34 @@ func GetKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Typ
 	}
 	return nil, false
 }
+
+func customizeDiffLBIPIDs(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error {
+	oldIPIDs, newIPIDs := diff.GetChange("ip_ids")
+	oldIPIDsSet := make(map[string]struct{})
+	newIPIDsSet := make(map[string]struct{})
+
+	for _, id := range oldIPIDs.([]interface{}) {
+		oldIPIDsSet[id.(string)] = struct{}{}
+	}
+
+	for _, id := range newIPIDs.([]interface{}) {
+		newIPIDsSet[id.(string)] = struct{}{}
+	}
+
+	// Check if any IP ID is being removed
+	for id := range oldIPIDsSet {
+		if _, ok := newIPIDsSet[id]; !ok {
+			return diff.ForceNew("ip_ids")
+		}
+	}
+
+	return nil
+}
+
+func customizeDiffAssignFlexibleIPv6(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error {
+	oldValue, newValue := diff.GetChange("assign_flexible_ipv6")
+	if oldValue.(bool) && !newValue.(bool) {
+		return diff.ForceNew("assign_flexible_ipv6")
+	}
+	return nil
+}

internal/services/lb/ip.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	lbSDK "github.com/scaleway/scaleway-sdk-go/api/lb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -55,6 +55,13 @@ func ResourceIP() *schema.Resource {
 				Computed:    true,
 				Description: "The ID of the load balancer attached to this IP, if any",
 			},
+			"is_ipv6": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				ForceNew:    true,
+				Default:     false,
+				Description: "If true, creates a Flexible IP with an IPv6 address",
+			},
 			"region": regional.ComputedSchema(),
 		},
 	}
@@ -75,6 +82,7 @@ func resourceLbIPCreate(ctx context.Context, d *schema.ResourceData, m interface
 		Zone:      zone,
 		ProjectID: types.ExpandStringPtr(d.Get("project_id")),
 		Reverse:   types.ExpandStringPtr(d.Get("reverse")),
+		IsIPv6:    d.Get("is_ipv6").(bool),
 	}
 
 	res, err := lbAPI.CreateIP(createReq, scw.WithContext(ctx))
@@ -141,16 +149,16 @@ func resourceLbIPUpdate(ctx context.Context, d *schema.ResourceData, m interface
 	}
 
 	var ip *lbSDK.IP
-	err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
+	err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutUpdate), func() *retry.RetryError {
 		res, errGet := lbAPI.GetIP(&lbSDK.ZonedAPIGetIPRequest{
 			Zone: zone,
 			IPID: ID,
 		}, scw.WithContext(ctx))
 		if err != nil {
 			if httperrors.Is403(errGet) {
-				return resource.RetryableError(errGet)
+				return retry.RetryableError(errGet)
 			}
-			return resource.NonRetryableError(errGet)
+			return retry.NonRetryableError(errGet)
 		}
 
 		ip = res
@@ -210,16 +218,16 @@ func resourceLbIPDelete(ctx context.Context, d *schema.ResourceData, m interface
 	}
 
 	var ip *lbSDK.IP
-	err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
+	err = retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError {
 		res, errGet := lbAPI.GetIP(&lbSDK.ZonedAPIGetIPRequest{
 			Zone: zone,
 			IPID: ID,
 		}, scw.WithContext(ctx))
 		if err != nil {
 			if httperrors.Is403(errGet) {
-				return resource.RetryableError(errGet)
+				return retry.RetryableError(errGet)
 			}
-			return resource.NonRetryableError(errGet)
+			return retry.NonRetryableError(errGet)
 		}
 
 		ip = res

internal/services/lb/ip_test.go

@@ -113,6 +113,29 @@ func TestAccIP_Basic(t *testing.T) {
 	})
 }
 
+func TestAccIP_IPv6(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      lbchecks.IsIPDestroyed(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_lb_ip ipv6 {
+						is_ipv6 = true
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isIPPresent(tt, "scaleway_lb_ip.ipv6"),
+					acctest.CheckResourceAttrIPv6("scaleway_lb_ip.ipv6", "ip_address"),
+				),
+			},
+		},
+	})
+}
+
 func isIPPresent(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[n]