fix(scaleway_lb_ip): add support to precise the zone in which the ip was reserved (#2803)

* fix: data.scaleway_lb_ip/zone is now a argument

Signed-off-by: Alban PRATS <[email protected]>

* record test

* fix

---------

Signed-off-by: Alban PRATS <[email protected]>
Co-authored-by: Yacine FODIL <[email protected]>

Author: al26p

internal/services/lb/data_source_lb_ip.go

@@ -17,6 +17,8 @@ func DataSourceIP() *schema.Resource {
 	// Generate datasource schema from resource
 	dsSchema := datasource.SchemaFromResourceSchema(ResourceIP().Schema)
 
+	datasource.AddOptionalFieldsToSchema(dsSchema, "project_id", "zone")
+
 	dsSchema["ip_address"] = &schema.Schema{
 		Type:          schema.TypeString,
 		Optional:      true,
@@ -30,7 +32,6 @@ func DataSourceIP() *schema.Resource {
 		ConflictsWith:    []string{"ip_address"},
 		ValidateDiagFunc: verify.IsUUIDorUUIDWithLocality(),
 	}
-	dsSchema["project_id"].Optional = true
 
 	return &schema.Resource{
 		ReadContext:   DataSourceLbIPRead,

internal/services/lb/data_source_lb_ip_test.go

@@ -21,18 +21,28 @@ func TestAccDataSourceIP_Basic(t *testing.T) {
 					resource "scaleway_lb_ip" "test" {
 					}
 					
+					resource "scaleway_lb_ip" "test_par_2" {
+					  zone = "fr-par-2"
+					}
+					
 					data "scaleway_lb_ip" "test" {
-						ip_address = "${scaleway_lb_ip.test.ip_address}"
+					  ip_address = scaleway_lb_ip.test.ip_address
 					}
 					
 					data "scaleway_lb_ip" "test2" {
-						ip_id = "${scaleway_lb_ip.test.id}"
+					  ip_id = scaleway_lb_ip.test.id
+					}
+					
+					data "scaleway_lb_ip" "test_another_zone" {
+					  ip_address = scaleway_lb_ip.test_par_2.ip_address
+					  zone       = "fr-par-2"
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					isIPPresent(tt, "data.scaleway_lb_ip.test"),
 					resource.TestCheckResourceAttrPair("data.scaleway_lb_ip.test", "ip_address", "scaleway_lb_ip.test", "ip_address"),
 					resource.TestCheckResourceAttrPair("data.scaleway_lb_ip.test2", "ip_address", "scaleway_lb_ip.test", "ip_address"),
+					resource.TestCheckResourceAttrPair("data.scaleway_lb_ip.test_another_zone", "ip_address", "scaleway_lb_ip.test_par_2", "ip_address"),
 				),
 			},
 		},