Fix

Author: remyleone

scaleway/helpers_lb.go

@@ -71,10 +71,13 @@ func expandLbACL(i interface{}) *lb.ACL {
 	return acl
 }
 func flattenLbACLAction(action *lb.ACLAction) interface{} {
-	return map[string]interface{}{
-		"type": action.Type,
+	return []map[string]interface{}{
+		{
+			"type": action.Type,
+		},
 	}
 }
+
 func expandLbACLAction(raw interface{}) *lb.ACLAction {
 	if raw == nil || len(raw.([]interface{})) != 1 {
 		return nil
@@ -85,13 +88,16 @@ func expandLbACLAction(raw interface{}) *lb.ACLAction {
 	}
 }
 func flattenLbACLMatch(match *lb.ACLMatch) interface{} {
-	return map[string]interface{}{
-		"ip_subnet":         flattenSliceStringPtr(match.IPSubnet),
-		"http_filter":       match.HTTPFilter.String(),
-		"http_filter_value": flattenSliceStringPtr(match.HTTPFilterValue),
-		"invert":            match.Invert,
+	return []map[string]interface{}{
+		{
+			"ip_subnet":         flattenSliceStringPtr(match.IPSubnet),
+			"http_filter":       match.HTTPFilter.String(),
+			"http_filter_value": flattenSliceStringPtr(match.HTTPFilterValue),
+			"invert":            match.Invert,
+		},
 	}
 }
+
 func expandLbACLMatch(raw interface{}) *lb.ACLMatch {
 	if raw == nil || len(raw.([]interface{})) != 1 {
 		return nil

scaleway/resource_lb_backend_beta_test.go

@@ -34,6 +34,7 @@ func TestAccScalewayLbBackend_Basic(t *testing.T) {
 						name = "bkd01"
 						forward_protocol = "tcp"
 						forward_port = 80
+						proxy_protocol = "none"
 						server_ips = [ scaleway_instance_ip.ip01.address ]
 					}
 				`,

scaleway/resource_lb_certificate_beta.go

@@ -80,9 +80,18 @@ func resourceScalewayLbCertificateBeta() *schema.Resource {
 				Description: "The main domain name of the certificate",
 			},
 			"subject_alternative_name": {
-				Type:        schema.TypeString,
+				Type:        schema.TypeList,
 				Computed:    true,
 				Description: "The alternative domain names of the certificate",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"name": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "The domain name",
+						},
+					},
+				},
 			},
 			"fingerprint": {
 				Type:        schema.TypeString,

scaleway/resource_lb_frontend_beta.go

@@ -218,18 +218,23 @@ func resourceScalewayLbFrontendBetaRead(ctx context.Context, d *schema.ResourceD
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	sort.Slice(resACL.ACLs, func(i, j int) bool {
-		return resACL.ACLs[i].Index < resACL.ACLs[j].Index
-	})
-	stateAcls := make([]interface{}, 0, len(resACL.ACLs))
-	for _, apiACL := range resACL.ACLs {
-		stateAcls = append(stateAcls, flattenLbACL(apiACL))
-	}
-	_ = d.Set("acl", stateAcls)
+
+	_ = d.Set("acl", flattenLBACLs(resACL.ACLs))
 
 	return nil
 }
 
+func flattenLBACLs(ACLs []*lb.ACL) interface{} {
+	sort.Slice(ACLs, func(i, j int) bool {
+		return ACLs[i].Index < ACLs[j].Index
+	})
+	rawACLs := make([]interface{}, 0, len(ACLs))
+	for _, apiACL := range ACLs {
+		rawACLs = append(rawACLs, flattenLbACL(apiACL))
+	}
+	return rawACLs
+}
+
 func resourceScalewayLbFrontendBetaUpdateACL(ctx context.Context, d *schema.ResourceData, lbAPI *lb.API, region scw.Region, frontendID string) diag.Diagnostics {
 	//Fetch existing acl from the api. and convert it to a hashmap with index as key
 	resACL, err := lbAPI.ListACLs(&lb.ListACLsRequest{
@@ -245,10 +250,7 @@ func resourceScalewayLbFrontendBetaUpdateACL(ctx context.Context, d *schema.Reso
 	}
 
 	//convert state acl and sanitize them a bit
-	newACL := make([]*lb.ACL, 0)
-	for _, rawACL := range d.Get("acl").([]interface{}) {
-		newACL = append(newACL, expandLbACL(rawACL))
-	}
+	newACL := expandsLBACLs(d.Get("acl"))
 
 	//loop
 	for index, stateACL := range newACL {
@@ -304,6 +306,15 @@ func resourceScalewayLbFrontendBetaUpdateACL(ctx context.Context, d *schema.Reso
 	return nil
 }
 
+func expandsLBACLs(raw interface{}) []*lb.ACL {
+	d := raw.([]interface{})
+	newACL := make([]*lb.ACL, 0)
+	for _, rawACL := range d {
+		newACL = append(newACL, expandLbACL(rawACL))
+	}
+	return newACL
+}
+
 func resourceScalewayLbFrontendBetaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	lbAPI, region, ID, err := lbAPIWithRegionAndID(m, d.Id())
 	if err != nil {

scaleway/resource_lb_frontend_beta_test.go

@@ -31,6 +31,7 @@ func TestAccScalewayLbFrontend_Basic(t *testing.T) {
 						lb_id = scaleway_lb_beta.lb01.id
 						forward_protocol = "tcp"
 						forward_port = 80
+						proxy_protocol = "none"
 					}
 					resource scaleway_lb_frontend_beta frt01 {
 						lb_id = scaleway_lb_beta.lb01.id
@@ -56,6 +57,7 @@ func TestAccScalewayLbFrontend_Basic(t *testing.T) {
 						lb_id = scaleway_lb_beta.lb01.id
 						forward_protocol = "tcp"
 						forward_port = 80
+						proxy_protocol = "none"
 					}
 					resource scaleway_lb_frontend_beta frt01 {
 						lb_id = scaleway_lb_beta.lb01.id
@@ -96,6 +98,7 @@ func TestAccScalewayLbAcl_Basic(t *testing.T) {
 						lb_id = scaleway_lb_beta.lb01.id
 						forward_protocol = "http"
 						forward_port = 80
+						proxy_protocol = "none"
 					}
 					resource scaleway_lb_frontend_beta frt01 {
 						lb_id = scaleway_lb_beta.lb01.id
@@ -214,6 +217,7 @@ func TestAccScalewayLbAcl_Basic(t *testing.T) {
 						lb_id = scaleway_lb_beta.lb01.id
 						forward_protocol = "http"
 						forward_port = 80
+						proxy_protocol = "none"
 					}
 					resource scaleway_lb_frontend_beta frt01 {
 						lb_id = scaleway_lb_beta.lb01.id

scaleway/resource_lb_ip_beta.go

@@ -89,10 +89,9 @@ func resourceScalewayLbIPBetaRead(ctx context.Context, d *schema.ResourceData, m
 	_ = 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)
-	_ = d.Set("lb_ip", flattenStringPtr(res.LBID))
+	_ = d.Set("lb_id", flattenStringPtr(res.LBID))
 
 	return nil
 }