feat(api): warn about non-empty WAF list item comments (#1022)

favonia · Jan 25, 2025 · 3a6454f · 3a6454f
1 parent c358727
commit 3a6454f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 13 deletions.
diff --git a/internal/api/cloudflare_waf.go b/internal/api/cloudflare_waf.go
@@ -188,6 +188,10 @@ func readWAFListItems(ppfmt pp.PP, list WAFList, rawItems []cloudflare.ListItem)
 				*rawItem.IP, list.Describe())
 			return nil, false
 		}
+		if rawItem.Comment != "" {
+			ppfmt.Noticef(pp.EmojiWarning, "The IP range/address %q in the list %s has a non-empty comment %q; the comment might be lost during an IP update.", //nolint:lll
+				*rawItem.IP, list.Describe(), rawItem.Comment)
+		}
 		items = append(items, WAFListItem{ID: ID(rawItem.ID), Prefix: p})
 	}
 	return items, true

diff --git a/internal/api/cloudflare_waf_test.go b/internal/api/cloudflare_waf_test.go
@@ -532,21 +532,24 @@ func TestFinalClearWAFListAsync(t *testing.T) {
 	}
 }
 
-type listItem = string
+type listItem struct {
+	IP      string
+	Comment string
+}
 
 func mockListItem(listItem listItem) cloudflare.ListItem {
 	var ip *string
-	if listItem != "" {
-		ip = &listItem
+	if listItem.IP != "" {
+		ip = &listItem.IP
 	}
 
 	return cloudflare.ListItem{
-		ID:         string(mockID(listItem, 0)),
+		ID:         string(mockID(listItem.IP, 0)),
 		IP:         ip,
 		Redirect:   nil,
 		Hostname:   nil,
 		ASN:        nil,
-		Comment:    "",
+		Comment:    listItem.Comment,
 		CreatedOn:  nil,
 		ModifiedOn: nil,
 	}
@@ -616,7 +619,7 @@ func TestListWAFListItems(t *testing.T) {
 			1,
 			emptyListMeta,
 			0,
-			[]listItem{"10.0.0.1", "2001:db8::/32", "10.0.0.0/20"},
+			[]listItem{{"10.0.0.1", ""}, {"2001:db8::/32", ""}, {"10.0.0.0/20", ""}},
 			1,
 			true, true,
 			[]api.WAFListItem{
@@ -666,7 +669,7 @@ func TestListWAFListItems(t *testing.T) {
 			1,
 			emptyListMeta,
 			0,
-			[]listItem{"10.0.0.1"},
+			[]listItem{{"10.0.0.1", ""}},
 			0,
 			false, false, nil,
 			func(ppfmt *mocks.MockPP) {
@@ -678,7 +681,7 @@ func TestListWAFListItems(t *testing.T) {
 			1,
 			emptyListMeta,
 			0,
-			[]listItem{"invalid item"},
+			[]listItem{{"invalid item", ""}},
 			1,
 			false, false, nil,
 			func(ppfmt *mocks.MockPP) {
@@ -694,7 +697,7 @@ func TestListWAFListItems(t *testing.T) {
 			1,
 			emptyListMeta,
 			0,
-			[]listItem{""},
+			[]listItem{{"", ""}},
 			1,
 			false, false, nil,
 			func(ppfmt *mocks.MockPP) {
@@ -703,6 +706,23 @@ func TestListWAFListItems(t *testing.T) {
 					"account456/list")
 			},
 		},
+		"comment": {
+			[]listMeta{{name: "list", size: 5, kind: cloudflare.ListTypeIP}},
+			1,
+			emptyListMeta,
+			0,
+			[]listItem{{"10.0.0.1", "hello"}},
+			1,
+			true, true,
+			[]api.WAFListItem{
+				{ID: (mockID("10.0.0.1", 0)), Prefix: netip.MustParsePrefix("10.0.0.1/32")},
+			},
+			func(ppfmt *mocks.MockPP) {
+				ppfmt.EXPECT().Noticef(pp.EmojiWarning,
+					"The IP range/address %q in the list %s has a non-empty comment %q; the comment might be lost during an IP update.",
+					"10.0.0.1", "account456/list", "hello")
+			},
+		},
 	} {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
@@ -837,7 +857,7 @@ func TestDeleteWAFListItems(t *testing.T) {
 			1,
 			[]api.ID{"id1", "id2", "id3"},
 			1,
-			[]listItem{"10.0.0.1/32", "2001:db8::/32", "10.0.0.0/20"},
+			[]listItem{{"10.0.0.1/32", ""}, {"2001:db8::/32", ""}, {"10.0.0.0/20", ""}},
 			1, true,
 			nil,
 		},
@@ -867,7 +887,7 @@ func TestDeleteWAFListItems(t *testing.T) {
 			1,
 			[]api.ID{"id1", "id2", "id3"},
 			1,
-			[]listItem{"10.0.0.1/32", "2001:db8::/32", "invalid item"},
+			[]listItem{{"10.0.0.1/32", ""}, {"2001:db8::/32", ""}, {"invalid item", ""}},
 			1,
 			false,
 			func(ppfmt *mocks.MockPP) {
@@ -1010,7 +1030,7 @@ func TestCreateWAFListItems(t *testing.T) {
 			1,
 			[]netip.Prefix{netip.MustParsePrefix("10.0.0.1/16"), netip.MustParsePrefix("2001:db8::/50")},
 			1,
-			[]listItem{"10.0.0.1/32", "2001:db8::/32", "10.0.0.0/20"},
+			[]listItem{{"10.0.0.1/32", ""}, {"2001:db8::/32", ""}, {"10.0.0.0/20", ""}},
 			1,
 			true,
 			nil,
@@ -1041,7 +1061,7 @@ func TestCreateWAFListItems(t *testing.T) {
 			1,
 			[]netip.Prefix{netip.MustParsePrefix("10.0.0.1/16"), netip.MustParsePrefix("2001:db8::/50")},
 			1,
-			[]listItem{"10.0.0.1/32", "2001:db8::/32", "invalid item"},
+			[]listItem{{"10.0.0.1/32", ""}, {"2001:db8::/32", ""}, {"invalid item", ""}},
 			1,
 			false,
 			func(ppfmt *mocks.MockPP) {