Merge pull request #2486 from cloudflare/remove-ip-validation

cloudflare · May 31, 2023 · b43307a · b43307a
2 parents 7aa5cac + f866296
commit b43307a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/2486.txt b/.changelog/2486.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/cloudflare_list: remove `IsIPAddress` validation that doesn't take into account CIDR notation
+```
diff --git a/internal/sdkv2provider/schema_cloudflare_list.go b/internal/sdkv2provider/schema_cloudflare_list.go
@@ -53,9 +53,8 @@ var listItemElem = &schema.Resource{
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"ip": {
-						Type:         schema.TypeString,
-						Optional:     true,
-						ValidateFunc: validation.IsIPAddress,
+						Type:     schema.TypeString,
+						Optional: true,
 					},
 					"redirect": {
 						Type:     schema.TypeList,

diff --git a/internal/sdkv2provider/schema_cloudflare_list_item.go b/internal/sdkv2provider/schema_cloudflare_list_item.go
@@ -33,6 +33,7 @@ func resourceCloudflareListItemSchema() map[string]*schema.Schema {
 			Description:  "Autonomous system number to include in the list",
 			ExactlyOneOf: []string{"ip", "redirect", "hostname", "asn"},
 			ForceNew:     true,
+			ValidateFunc: validation.IntAtLeast(1),
 		},
 		"hostname": {
 			Type:         schema.TypeList,