handle detach and move + test

Author: yfodil

internal/services/ipam/ip.go

@@ -71,7 +71,6 @@ func ResourceIP() *schema.Resource {
 			"custom_resource": {
 				Type:        schema.TypeList,
 				Optional:    true,
-				ForceNew:    true,
 				Description: "The custom resource in which to book the IP",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -292,13 +291,32 @@ func ResourceIPAMIPUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 		return diag.FromErr(err)
 	}
 
-	_, err = ipamAPI.UpdateIP(&ipam.UpdateIPRequest{
-		IPID:   ID,
-		Region: region,
-		Tags:   types.ExpandUpdatedStringsPtr(d.Get("tags")),
-	}, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
+	if d.HasChange("custom_resource") {
+		oldCustomResourceRaw, newCustomResourceRaw := d.GetChange("custom_resource")
+		oldCustomResource := expandCustomResource(oldCustomResourceRaw)
+		newCustomResource := expandCustomResource(newCustomResourceRaw)
+
+		_, err = ipamAPI.MoveIP(&ipam.MoveIPRequest{
+			Region:       region,
+			IPID:         ID,
+			FromResource: oldCustomResource,
+			ToResource:   newCustomResource,
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+
+		}
+	}
+
+	if d.HasChange("tags") {
+		_, err = ipamAPI.UpdateIP(&ipam.UpdateIPRequest{
+			IPID:   ID,
+			Region: region,
+			Tags:   types.ExpandUpdatedStringsPtr(d.Get("tags")),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	return ResourceIPAMIPRead(ctx, d, m)
@@ -310,6 +328,17 @@ func ResourceIPAMIPDelete(ctx context.Context, d *schema.ResourceData, m interfa
 		return diag.FromErr(err)
 	}
 
+	if customResource, ok := d.GetOk("custom_resource"); ok {
+		_, err = ipamAPI.DetachIP(&ipam.DetachIPRequest{
+			Region:   region,
+			IPID:     ID,
+			Resource: expandCustomResource(customResource),
+		}, scw.WithContext(ctx))
+		if err != nil && !httperrors.Is404(err) {
+			return diag.FromErr(err)
+		}
+	}
+
 	err = ipamAPI.ReleaseIP(&ipam.ReleaseIPRequest{
 		Region: region,
 		IPID:   ID,

internal/services/ipam/ip_test.go

@@ -157,6 +157,96 @@ func TestAccIPAMIP_WithTags(t *testing.T) {
 	})
 }
 
+func TestAccIPAMIP_WithCustomResource(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      ipamchecks.CheckIPDestroy(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 {
+					  source {
+						private_network_id = scaleway_vpc_private_network.pn01.id
+				      }
+                      custom_resource {
+						mac_address = "bc:24:11:74:d0:5a"
+					  }
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIPAMIPExists(tt, "scaleway_ipam_ip.ip01"),
+					resource.TestCheckResourceAttr("scaleway_ipam_ip.ip01", "custom_resource.0.mac_address", "bc:24:11:74:d0:5a"),
+				),
+			},
+			{
+				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 {
+					  source {
+						private_network_id = scaleway_vpc_private_network.pn01.id
+				      }
+                      custom_resource {
+						mac_address = "bc:24:11:74:d0:5b"
+					  }
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIPAMIPExists(tt, "scaleway_ipam_ip.ip01"),
+					resource.TestCheckResourceAttr("scaleway_ipam_ip.ip01", "custom_resource.0.mac_address", "bc:24:11:74:d0:5b"),
+				),
+			},
+			{
+				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 {
+					  source {
+						private_network_id = scaleway_vpc_private_network.pn01.id
+				      }
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIPAMIPExists(tt, "scaleway_ipam_ip.ip01"),
+					resource.TestCheckNoResourceAttr("scaleway_ipam_ip.ip01", "custom_resource.0.mac_address"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckIPAMIPExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]