fix(DHCP-reservation) update static ip and add test for update case (#1222)

Author: Monitob

scaleway/resource_vpc_public_gateway_dhcp_reservation.go

@@ -150,11 +150,21 @@ func resourceScalewayVPCPublicGatewayDHCPReservationUpdate(ctx context.Context,
 		return diag.FromErr(err)
 	}
 
-	if d.HasChangesExcept("ip_address") {
+	if d.HasChanges("ip_address") {
 		ip := net.ParseIP(d.Get("ip_address").(string))
 		if ip == nil {
 			return diag.FromErr(fmt.Errorf("could not parse ip_address"))
 		}
+
+		gatewayNetworkID := expandID(d.Get("gateway_network_id"))
+		_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
+			GatewayNetworkID: gatewayNetworkID,
+			Zone:             zone,
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
 		req := &vpcgw.UpdateDHCPEntryRequest{
 			DHCPEntryID: ID,
 			Zone:        zone,
@@ -165,6 +175,14 @@ func resourceScalewayVPCPublicGatewayDHCPReservationUpdate(ctx context.Context,
 		if err != nil {
 			return diag.FromErr(err)
 		}
+
+		_, err = vpcgwAPI.WaitForGatewayNetwork(&vpcgw.WaitForGatewayNetworkRequest{
+			GatewayNetworkID: gatewayNetworkID,
+			Zone:             zone,
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	return resourceScalewayVPCPublicGatewayDHCPReservationRead(ctx, d, meta)

scaleway/resource_vpc_public_gateway_dhcp_reservation_test.go

@@ -74,6 +74,62 @@ func TestAccScalewayVPCPublicGatewayDHCPEntry_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_dhcp_reservation.main", "type"),
 				),
 			},
+			{
+				Config: `
+					resource scaleway_vpc_private_network main {
+						name = "pn_test_network"
+					}
+
+					resource "scaleway_instance_server" "main" {
+						image = "ubuntu_focal"
+						type  = "DEV1-S"
+						zone = "fr-par-1"
+
+						private_network {
+							pn_id = scaleway_vpc_private_network.main.id
+						}
+					}
+
+					resource scaleway_vpc_public_gateway_ip main {
+					}
+
+					resource scaleway_vpc_public_gateway_dhcp main {
+						subnet = "192.168.1.0/24"
+					}
+
+					resource scaleway_vpc_public_gateway main {
+						name = "foobar"
+						type = "VPC-GW-S"
+						ip_id = scaleway_vpc_public_gateway_ip.main.id
+					}
+
+					resource scaleway_vpc_gateway_network main {
+						gateway_id = scaleway_vpc_public_gateway.main.id
+						private_network_id = scaleway_vpc_private_network.main.id
+						dhcp_id = scaleway_vpc_public_gateway_dhcp.main.id
+						cleanup_dhcp = true
+						enable_masquerade = true
+						depends_on = [scaleway_vpc_public_gateway_ip.main, scaleway_vpc_private_network.main]
+					}
+
+					resource scaleway_vpc_public_gateway_dhcp_reservation main {
+						gateway_network_id = scaleway_vpc_gateway_network.main.id
+						mac_address = scaleway_instance_server.main.private_network.0.mac_address
+						ip_address = "192.168.1.2"
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayVPCPublicGatewayDHCPReservationExists(tt, "scaleway_vpc_public_gateway_dhcp_reservation.main"),
+					resource.TestCheckResourceAttrPair("scaleway_vpc_public_gateway_dhcp_reservation.main",
+						"mac_address", "scaleway_instance_server.main", "private_network.0.mac_address"),
+					resource.TestCheckResourceAttrPair("scaleway_vpc_public_gateway_dhcp_reservation.main", "gateway_network_id",
+						"scaleway_vpc_gateway_network.main", "id"),
+					resource.TestCheckResourceAttr("scaleway_vpc_public_gateway_dhcp_reservation.main", "ip_address", "192.168.1.2"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_dhcp_reservation.main", "created_at"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_dhcp_reservation.main", "updated_at"),
+					resource.TestCheckResourceAttrSet("scaleway_vpc_public_gateway_dhcp_reservation.main", "type"),
+				),
+			},
 		},
 	})
 }