feat(ipam): add address_cidr field (#3468)

* feat(ipam): add address_cidr field

* update cassettes

---------

Co-authored-by: Jonathan R. <jremy@scaleway.com>
Co-authored-by: Rémy Léone <rleone@scaleway.com>

Author: 3 people

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/baremetal/server_test.go

@@ -996,7 +996,7 @@ func TestAccServer_WithIPAMPrivateNetwork(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
 					testAccCheckBaremetalServerHasPrivateNetwork(tt, "scaleway_baremetal_server.base"),
-					resource.TestCheckResourceAttrPair("scaleway_ipam_ip.ip01", "address", "data.scaleway_ipam_ip.base", "address_cidr"),
+					resource.TestCheckResourceAttrPair("scaleway_ipam_ip.ip01", "address_cidr", "data.scaleway_ipam_ip.base", "address_cidr"),
 				),
 			},
 			{
@@ -1328,7 +1328,7 @@ func testIPAMIPs(_ *acctest.TestTools, ipamResourcePrefix, ipamDataSource string
 				break
 			}
 
-			ip := rs.Primary.Attributes["address"]
+			ip := rs.Primary.Attributes["address_cidr"]
 			if !expectedIPs[ip] {
 				return fmt.Errorf("IP %q from resource %s not found in data source %s", ip, resourceName, ipamDataSource)
 			}

internal/services/baremetal/testdata/server-with-ipam-private-network.cassette.yaml

@@ -218,7 +218,7 @@ func TestAccPrivateNIC_WithIPAM(t *testing.T) {
 						"scaleway_instance_private_nic.pnic01", "ipam_ip_ids.0",
 						"scaleway_ipam_ip.ip01", "id"),
 					resource.TestCheckResourceAttrPair(
-						"scaleway_ipam_ip.ip01", "address",
+						"scaleway_ipam_ip.ip01", "address_cidr",
 						"data.scaleway_ipam_ip.by_id", "address_cidr"),
 				),
 			},

internal/services/instance/private_nic_test.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/instance/testdata/private-nic-with-ipam.cassette.yaml

@@ -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"),
 				),
 			},
 		},

internal/services/ipam/ip.go

@@ -417,7 +417,7 @@ func TestAccLB_WithPrivateNetworksIPAMIDs(t *testing.T) {
 						"scaleway_lb.lb01", "private_network.0.ipam_ids.0",
 						"scaleway_ipam_ip.ip01", "id"),
 					resource.TestCheckResourceAttrPair(
-						"scaleway_ipam_ip.ip01", "address",
+						"scaleway_ipam_ip.ip01", "address_cidr",
 						"data.scaleway_ipam_ip.by_name", "address_cidr"),
 					resource.TestCheckResourceAttrSet("scaleway_lb.lb01", "private_ips.0.id"),
 					resource.TestCheckResourceAttrSet("scaleway_lb.lb01", "private_ips.0.address"),