feat(baremetal): add ipv4 & ipv6 fields (#2003)

* feat(baremetal): add ipv4 & ipv6 fields

* update doc

* fix

* Update lbacl-basic.cassette.yaml

* Update lbacl-basic.cassette.yaml

* Update lbacl-basic.cassette.yaml

* Update docs/resources/baremetal_server.md

Co-authored-by: Nathanael Demacon <[email protected]>

* refactor

---------

Co-authored-by: Nathanael Demacon <[email protected]>

Author: yfodil

docs/resources/baremetal_server.md

@@ -166,6 +166,16 @@ In addition to all above arguments, the following attributes are exported:
     - `address` - The address of the IP.
     - `reverse` - The reverse of the IP.
     - `version` - The type of the IP.
+- `ipv4` - (List of) The IPv4 addresses of the server.
+    - `id` - The ID of the IPv4.
+    - `address` - The address of the IPv4.
+    - `reverse` - The reverse of the IPv4.
+    - `version` - The type of the IPv4.
+- `ipv6` - (List of) The IPv6 addresses of the server.
+    - `id` - The ID of the IPv6.
+    - `address` - The address of the IPv6.
+    - `reverse` - The reverse of the IPv6.
+    - `version` - The type of the IPv6.
 - `domain` - The domain of the server.
 - `organization_id` - The organization ID the server is associated with.
 

scaleway/helpers_baremetal.go

@@ -160,6 +160,42 @@ func flattenBaremetalIPs(ips []*baremetal.IP) interface{} {
 	return flattendIPs
 }
 
+func flattenBaremetalIPv4s(ips []*baremetal.IP) interface{} {
+	if ips == nil {
+		return nil
+	}
+	flattendIPs := []map[string]interface{}(nil)
+	for _, ip := range ips {
+		if ip.Version == baremetal.IPVersionIPv4 {
+			flattendIPs = append(flattendIPs, map[string]interface{}{
+				"id":      ip.ID,
+				"address": ip.Address.String(),
+				"reverse": ip.Reverse,
+				"version": ip.Version.String(),
+			})
+		}
+	}
+	return flattendIPs
+}
+
+func flattenBaremetalIPv6s(ips []*baremetal.IP) interface{} {
+	if ips == nil {
+		return nil
+	}
+	flattendIPs := []map[string]interface{}(nil)
+	for _, ip := range ips {
+		if ip.Version == baremetal.IPVersionIPv6 {
+			flattendIPs = append(flattendIPs, map[string]interface{}{
+				"id":      ip.ID,
+				"address": ip.Address.String(),
+				"reverse": ip.Reverse,
+				"version": ip.Version.String(),
+			})
+		}
+	}
+	return flattendIPs
+}
+
 func flattenBaremetalOptions(zone scw.Zone, options []*baremetal.ServerOption) interface{} {
 	if options == nil {
 		return nil

scaleway/resource_baremetal_server.go

@@ -132,32 +132,22 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
 			"organization_id": organizationIDSchema(),
 			"project_id":      projectIDSchema(),
 			"ips": {
-				Type:     schema.TypeList,
-				Computed: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"id": {
-							Type:        schema.TypeString,
-							Computed:    true,
-							Description: "The ID of the IP",
-						},
-						"version": {
-							Type:        schema.TypeString,
-							Computed:    true,
-							Description: "The version of the IP",
-						},
-						"address": {
-							Type:        schema.TypeString,
-							Computed:    true,
-							Description: "The IP address of the IP",
-						},
-						"reverse": {
-							Type:        schema.TypeString,
-							Computed:    true,
-							Description: "The Reverse of the IP",
-						},
-					},
-				},
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "IP addresses attached to the server.",
+				Elem:        resourceScalewayBaremetalServerIP(),
+			},
+			"ipv4": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "IPv4 addresses attached to the server",
+				Elem:        resourceScalewayBaremetalServerIP(),
+			},
+			"ipv6": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "IPv6 addresses attached to the server",
+				Elem:        resourceScalewayBaremetalServerIP(),
 			},
 			"domain": {
 				Type:     schema.TypeString,
@@ -235,6 +225,33 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
 	}
 }
 
+func resourceScalewayBaremetalServerIP() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The ID of the IPv6",
+			},
+			"version": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The version of the IPv6",
+			},
+			"address": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The IPv6 address",
+			},
+			"reverse": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The Reverse of the IPv6",
+			},
+		},
+	}
+}
+
 func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	baremetalAPI, zone, err := baremetalAPIWithZone(d, meta)
 	if err != nil {
@@ -396,6 +413,8 @@ func resourceScalewayBaremetalServerRead(ctx context.Context, d *schema.Resource
 	_ = d.Set("tags", server.Tags)
 	_ = d.Set("domain", server.Domain)
 	_ = d.Set("ips", flattenBaremetalIPs(server.IPs))
+	_ = d.Set("ipv4", flattenBaremetalIPv4s(server.IPs))
+	_ = d.Set("ipv6", flattenBaremetalIPv6s(server.IPs))
 	if server.Install != nil {
 		_ = d.Set("os", newZonedIDString(server.Zone, os.ID))
 		_ = d.Set("os_name", os.Name)

scaleway/resource_baremetal_server_test.go

@@ -212,6 +212,11 @@ func TestAccScalewayBaremetalServer_CreateServerWithOption(t *testing.T) {
 					testAccCheckScalewayBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
 					testAccCheckScalewayBaremetalServerHasOptions(tt, "scaleway_baremetal_server.base"),
 					resource.TestCheckResourceAttrPair("scaleway_baremetal_server.base", "options.0.id", "data.scaleway_baremetal_option.private_network", "option_id"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "ips.#", "2"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "ipv4.#", "1"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "ipv4.0.version", "IPv4"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "ipv6.#", "1"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "ipv6.0.version", "IPv6"),
 				),
 			},
 		},