fix

Author: yfodil

docs/data-sources/lb_acls.md

@@ -54,4 +54,5 @@ In addition to all arguments above, the following attributes are exported:
         - `http_filter` - The HTTP filter to match.
         - `http_filter_value` - The possible values to match for a given HTTP filter.
         - `http_filter_option` - A list of possible values for the HTTP filter based on the HTTP header.
-        - `invert` -  The condition will be of type "unless" if invert is set to `true`
+        - `invert` - The condition will be of type "unless" if invert is set to `true`
+        - `ips_edge_services` - Defines whether Edge Services IPs should be matched.

internal/services/lb/acl.go

@@ -110,7 +110,6 @@ func ResourceACL() *schema.Resource {
 							Optional:         true,
 							Description:      "A list of IPs or CIDR v4/v6 addresses of the client of the session to match",
 							DiffSuppressFunc: diffSuppressFunc32SubnetMask,
-							ConflictsWith:    []string{"ips_edge_services"},
 						},
 						"http_filter": {
 							Type:             schema.TypeString,
@@ -138,10 +137,9 @@ func ResourceACL() *schema.Resource {
 							Description: `If set to true, the condition will be of type "unless"`,
 						},
 						"ips_edge_services": {
-							Type:          schema.TypeBool,
-							Optional:      true,
-							Description:   `Defines whether Edge Services IPs should be matched`,
-							ConflictsWith: []string{"ip_subnet"},
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Description: `Defines whether Edge Services IPs should be matched`,
 						},
 					},
 				},

internal/services/lb/types.go

@@ -98,11 +98,12 @@ func expandLbACLMatch(d *schema.ResourceData, raw any) *lb.ACLMatch {
 	ipSubnetConfigured := isIPSubnetConfigured(d)
 
 	var ipSubnet []*string
-	if ipsEdgeServices {
+	switch {
+	case ipsEdgeServices:
 		ipSubnet = nil
-	} else if ipSubnetConfigured {
+	case ipSubnetConfigured:
 		ipSubnet = types.ExpandSliceStringPtr(rawMap["ip_subnet"].([]any))
-	} else {
+	default:
 		ipSubnet = []*string{types.ExpandStringPtr("0.0.0.0/0")}
 	}