feat(lb): add support for project_id in lb (#608)

Author: remyleone

docs/data-sources/lb_ip_beta.md

@@ -34,6 +34,8 @@ data "scaleway_lb_ip_beta" "my_ip" {
 
 - `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the LB IP is associated with.
 
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the LB IP is associated with.
+
 ## Attributes Reference
 
 In addition to all above arguments, the following attributes are exported:

docs/resources/lb_beta.md

@@ -45,6 +45,8 @@ The following arguments are supported:
 
 - `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the load-balancer is associated with.
 
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the load-balancer is associated with.
+
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:

scaleway/data_source_lb_ip_beta.go

@@ -40,8 +40,10 @@ func dataSourceScalewayLbIPBetaRead(d *schema.ResourceData, m interface{}) error
 	ipID, ok := d.GetOk("ip_id")
 	if !ok { // Get IP by region and IP address.
 		res, err := api.ListIPs(&lb.ListIPsRequest{
-			Region:    region,
-			IPAddress: expandStringPtr(d.Get("ip_address")),
+			Region:         region,
+			IPAddress:      expandStringPtr(d.Get("ip_address")),
+			OrganizationID: expandStringPtr(d.Get("organization_id")),
+			ProjectID:      expandStringPtr(d.Get("project_id")),
 		})
 		if err != nil {
 			return err

scaleway/resource_lb_beta.go

@@ -54,6 +54,7 @@ func resourceScalewayLbBeta() *schema.Resource {
 			},
 			"region":          regionSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }
@@ -68,6 +69,7 @@ func resourceScalewayLbBetaCreate(d *schema.ResourceData, m interface{}) error {
 		Region:         region,
 		IPID:           expandStringPtr(expandID(d.Get("ip_id"))),
 		OrganizationID: expandStringPtr(d.Get("organization_id")),
+		ProjectID:      expandStringPtr(d.Get("project_id")),
 		Name:           expandOrGenerateString(d.Get("name"), "lb"),
 		Type:           d.Get("type").(string),
 	}
@@ -118,6 +120,7 @@ func resourceScalewayLbBetaRead(d *schema.ResourceData, m interface{}) error {
 	_ = d.Set("name", res.Name)
 	_ = d.Set("region", string(region))
 	_ = d.Set("organization_id", res.OrganizationID)
+	_ = d.Set("project_id", res.ProjectID)
 	_ = d.Set("tags", res.Tags)
 	// For now API return lowercase lb type. This should be fix in a near future on the API side
 	_ = d.Set("type", strings.ToUpper(res.Type))

scaleway/resource_lb_ip_beta.go

@@ -24,6 +24,7 @@ func resourceScalewayLbIPBeta() *schema.Resource {
 			},
 			"region":          regionSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 			// Computed
 			"ip_address": {
 				Type:        schema.TypeString,
@@ -48,6 +49,7 @@ func resourceScalewayLbIPBetaCreate(d *schema.ResourceData, m interface{}) error
 	createReq := &lb.CreateIPRequest{
 		Region:         region,
 		OrganizationID: expandStringPtr(d.Get("organization_id")),
+		ProjectID:      expandStringPtr(d.Get("project_id")),
 		Reverse:        expandStringPtr(d.Get("reverse")),
 	}
 
@@ -82,6 +84,7 @@ func resourceScalewayLbIPBetaRead(d *schema.ResourceData, m interface{}) error {
 
 	_ = d.Set("region", string(region))
 	_ = d.Set("organization_id", res.OrganizationID)
+	_ = d.Set("project_id", res.ProjectID)
 	_ = d.Set("ip_id", res.ID)
 	_ = d.Set("ip_address", res.IPAddress)
 	_ = d.Set("reverse", res.Reverse)