fix(lb): resolve unnecessary plan changes for LB private network (#2315)

Author: yfodil

scaleway/helpers_lb.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"reflect"
-	"strconv"
 	"strings"
 	"time"
 
@@ -144,7 +143,7 @@ func expandPrivateNetworks(data interface{}) ([]*lbSDK.PrivateNetwork, error) {
 		rawPn := pn.(map[string]interface{})
 		privateNetwork := &lbSDK.PrivateNetwork{}
 		privateNetwork.PrivateNetworkID = expandID(rawPn["private_network_id"].(string))
-		if staticConfig, hasStaticConfig := rawPn["static_config"]; hasStaticConfig {
+		if staticConfig, hasStaticConfig := rawPn["static_config"]; hasStaticConfig && len(staticConfig.([]interface{})) > 0 {
 			privateNetwork.StaticConfig = expandLbPrivateNetworkStaticConfig(staticConfig)
 		} else {
 			privateNetwork.DHCPConfig = expandLbPrivateNetworkDHCPConfig(rawPn["dhcp_config"])
@@ -617,15 +616,11 @@ func lbPrivateNetworkSetHash(v interface{}) int {
 		buf.WriteString(expandID(pnID))
 	}
 
-	if staticConfig, ok := m["static_config"]; ok {
+	if staticConfig, ok := m["static_config"]; ok && len(staticConfig.([]interface{})) > 0 {
 		for _, item := range staticConfig.([]interface{}) {
 			buf.WriteString(item.(string))
 		}
 	}
 
-	if dhcpConfig, ok := m["dhcp_config"]; ok {
-		buf.WriteString(strconv.FormatBool(dhcpConfig.(bool)))
-	}
-
 	return StringHashcode(buf.String())
 }

scaleway/resource_lb_test.go

@@ -651,6 +651,47 @@ func TestAccScalewayLbLb_WithPrivateNetworksOnDHCPConfig(t *testing.T) {
 	})
 }
 
+func TestAccScalewayLbLb_WithoutPNConfig(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayLbDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource "scaleway_lb_ip" "ip01" {}
+
+					resource "scaleway_vpc_private_network" "pn" {
+						name = "pn-with-lb-static"
+					}
+
+					resource "scaleway_lb" "lb01" {
+					    ip_id = scaleway_lb_ip.ip01.id
+						name = "test-lb-with-pn-static-cidr"
+						type = "LB-S"
+						private_network {
+							private_network_id = scaleway_vpc_private_network.pn.id
+						}
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayLbExists(tt, "scaleway_lb.lb01"),
+					testAccCheckScalewayLbIPExists(tt, "scaleway_lb_ip.ip01"),
+					resource.TestCheckResourceAttrPair(
+						"scaleway_lb.lb01", "private_network.0.private_network_id",
+						"scaleway_vpc_private_network.pn", "id"),
+					resource.TestCheckResourceAttr("scaleway_lb.lb01",
+						"private_network.0.status", lbSDK.PrivateNetworkStatusReady.String()),
+					resource.TestCheckResourceAttr("scaleway_lb.lb01",
+						"private_network.0.dhcp_config", "true"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccScalewayLbLb_DifferentLocalityIPID(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()