feat(ipam): add address_cidr field

Author: yfodil

docs/resources/ipam_ip.md

@@ -126,6 +126,7 @@ The following arguments are supported:
 In addition to all arguments above, the following attributes are exported:
 
 - `id` - The ID of the IP in IPAM.
+- `address_cidr` - the IP address in CIDR notation.
 - `resource` - The IP resource.
     - `id` - The ID of the resource that the IP is attached to.
     - `type` - The type of resource the IP is attached to.

internal/services/ipam/ip.go

@@ -40,6 +40,11 @@ func ResourceIP() *schema.Resource {
 				ValidateFunc:     validation.IsIPAddress,
 				DiffSuppressFunc: dsf.DiffSuppressFuncStandaloneIPandCIDR,
 			},
+			"address_cidr": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The IP address with a CIDR notation",
+			},
 			"source": {
 				Type:        schema.TypeList,
 				Required:    true,
@@ -269,12 +274,14 @@ func ResourceIPAMIPRead(ctx context.Context, d *schema.ResourceData, m any) diag
 		}
 	}
 
-	address, err := types.FlattenIPNet(res.Address)
+	addressCidr, err := types.FlattenIPNet(res.Address)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
+	address := res.Address.IP.String()
 	_ = d.Set("address", address)
+	_ = d.Set("address_cidr", addressCidr)
 	_ = d.Set("source", flattenIPSource(res.Source, privateNetworkID))
 	_ = d.Set("resource", flattenIPResource(res.Resource))
 	_ = d.Set("project_id", res.ProjectID)

internal/services/ipam/ip_test.go

@@ -45,6 +45,7 @@ func TestAccIPAMIP_Basic(t *testing.T) {
 					acctest.CheckResourceRawIDMatches("scaleway_ipam_ip.ip01", "source.0.private_network_id", "scaleway_vpc_private_network.pn01", "id"),
 					resource.TestCheckResourceAttrSet("scaleway_ipam_ip.ip01", "source.0.subnet_id"),
 					resource.TestCheckResourceAttrSet("scaleway_ipam_ip.ip01", "address"),
+					resource.TestCheckResourceAttrSet("scaleway_ipam_ip.ip01", "address_cidr"),
 					resource.TestCheckResourceAttrSet("scaleway_ipam_ip.ip01", "created_at"),
 					resource.TestCheckResourceAttrSet("scaleway_ipam_ip.ip01", "updated_at"),
 				),
@@ -83,7 +84,8 @@ func TestAccIPAMIP_WithStandaloneAddress(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckIPAMIPExists(tt, "scaleway_ipam_ip.ip01"),
-					resource.TestCheckResourceAttr("scaleway_ipam_ip.ip01", "address", "172.16.32.7/22"),
+					resource.TestCheckResourceAttr("scaleway_ipam_ip.ip01", "address", "172.16.32.7"),
+					resource.TestCheckResourceAttr("scaleway_ipam_ip.ip01", "address_cidr", "172.16.32.7/22"),
 				),
 			},
 		},