add test

Author: yfodil

internal/services/lb/lb.go

@@ -109,6 +109,7 @@ func ResourceLb() *schema.Resource {
 			"private_network": {
 				Type:        schema.TypeSet,
 				Optional:    true,
+				Computed:    true,
 				MaxItems:    8,
 				Set:         lbPrivateNetworkSetHash,
 				Description: "List of private network to connect with your load balancer",

internal/services/lb/private_network.go

@@ -9,6 +9,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/cdf"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
@@ -19,7 +20,6 @@ func ResourcePrivateNetwork() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: resourceLbPrivateNetworkCreate,
 		ReadContext:   resourceLbPrivateNetworkRead,
-		UpdateContext: resourceLbPrivateNetworkUpdate,
 		DeleteContext: resourceLbPrivateNetworkDelete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
@@ -84,21 +84,33 @@ func resourceLbPrivateNetworkCreate(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
-	_, err = waitForLB(ctx, lbAPI, zone, zonal.ExpandID(d.Get("lb_id").(string)).ID, d.Timeout(schema.TimeoutCreate))
+	lbID := zonal.ExpandID(d.Get("lb_id").(string)).ID
+
+	_, err = waitForLB(ctx, lbAPI, zone, lbID, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
 	attach, err := lbAPI.AttachPrivateNetwork(&lb.ZonedAPIAttachPrivateNetworkRequest{
 		Zone:             zone,
-		LBID:             zonal.ExpandID(d.Get("lb_id").(string)).ID,
+		LBID:             lbID,
 		PrivateNetworkID: regional.ExpandID(d.Get("private_network_id").(string)).ID,
-		IpamIDs:          types.ExpandStrings(d.Get("ipam_ip_ids")),
+		IpamIDs:          locality.ExpandIDs(d.Get("ipam_ip_ids")),
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
+	_, err = waitForLB(ctx, lbAPI, zone, lbID, d.Timeout(schema.TimeoutUpdate))
+	if err != nil && !httperrors.Is404(err) {
+		return diag.FromErr(err)
+	}
+
+	_, err = waitForPrivateNetworks(ctx, lbAPI, zone, lbID, d.Timeout(schema.TimeoutUpdate))
+	if err != nil && !httperrors.Is404(err) {
+		return diag.FromErr(err)
+	}
+
 	d.SetId(
 		zonal.NewNestedIDString(
 			zone,
@@ -145,22 +157,23 @@ func resourceLbPrivateNetworkRead(ctx context.Context, d *schema.ResourceData, m
 		return nil
 	}
 
-	_ = d.Set("private_network_id", foundPN.PrivateNetworkID)
-	_ = d.Set("lb_id", foundPN.LB.ID)
-	_ = d.Set("ipam_ip_ids", foundPN.IpamIDs)
-	_ = d.Set("status", foundPN.Status)
-	_ = d.Set("created_at", foundPN.CreatedAt)
-	_ = d.Set("updated_at", foundPN.UpdatedAt)
+	region, err := zone.Region()
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	_ = d.Set("private_network_id", regional.NewIDString(region, foundPN.PrivateNetworkID))
+	_ = d.Set("lb_id", zonal.NewIDString(zone, foundPN.LB.ID))
+	_ = d.Set("ipam_ip_ids", regional.NewRegionalIDs(region, foundPN.IpamIDs))
+	_ = d.Set("status", foundPN.Status.String())
+	_ = d.Set("created_at", types.FlattenTime(foundPN.CreatedAt))
+	_ = d.Set("updated_at", types.FlattenTime(foundPN.UpdatedAt))
 	_ = d.Set("zone", zone)
 	_ = d.Set("project_id", foundPN.LB.ProjectID)
 
 	return nil
 }
 
-func resourceLbPrivateNetworkUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	return resourceLbPrivateNetworkRead(ctx, d, m)
-}
-
 func resourceLbPrivateNetworkDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	lbAPI, zone, err := lbAPIWithZone(d, m)
 	if err != nil {
@@ -181,5 +194,15 @@ func resourceLbPrivateNetworkDelete(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
+	_, err = waitForLB(ctx, lbAPI, zone, LBID, d.Timeout(schema.TimeoutUpdate))
+	if err != nil && !httperrors.Is404(err) {
+		return diag.FromErr(err)
+	}
+
+	_, err = waitForPrivateNetworks(ctx, lbAPI, zone, LBID, d.Timeout(schema.TimeoutUpdate))
+	if err != nil && !httperrors.Is404(err) {
+		return diag.FromErr(err)
+	}
+
 	return nil
 }

internal/services/lb/private_network_test.go

@@ -0,0 +1,64 @@
+package lb_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
+	lbchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/lb/testfuncs"
+)
+
+func TestAccLBPrivateNetwork_Basic(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_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-private-network"
+				  type = "LB-S"
+				}
+
+				resource "scaleway_lb_private_network" "lbpn01" {
+				  lb_id              = scaleway_lb.lb01.id
+				  private_network_id = scaleway_vpc_private_network.pn01.id
+				  ipam_ip_ids           = [scaleway_ipam_ip.ip01.id]
+				}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrPair(
+						"scaleway_lb.lb01", "id",
+						"scaleway_lb_private_network.lbpn01", "lb_id"),
+					resource.TestCheckResourceAttrPair(
+						"scaleway_vpc_private_network.pn01", "id",
+						"scaleway_lb_private_network.lbpn01", "private_network_id"),
+					resource.TestCheckResourceAttrPair(
+						"scaleway_ipam_ip.ip01", "id",
+						"scaleway_lb_private_network.lbpn01", "ipam_ip_ids.0"),
+				),
+			},
+		},
+	})
+}