Skip to content

Commit 0f310cd

Browse files
Fix: clustering compatibility for custom response for rate-limiting (#9632)
We should remove newly added config fields for older DP (compat support for #8930). Co-authored-by: Qi <[email protected]>
1 parent ec03f08 commit 0f310cd

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

kong/clustering/compat/removed_fields.lua

+8
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,12 @@ return {
6262
"redis_server_name",
6363
},
6464
},
65+
66+
-- Any dataplane older than 3.1.0
67+
[3000999999] = {
68+
rate_limiting = {
69+
"error_code",
70+
"error_message",
71+
},
72+
},
6573
}

spec/01-unit/19-hybrid/03-fields-removal_spec.lua

+27-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ describe("kong.clustering.control_plane", function()
6363
"trigger",
6464
},
6565
rate_limiting = {
66+
"error_code",
67+
"error_message",
6668
"redis_ssl",
6769
"redis_ssl_verify",
6870
"redis_server_name",
@@ -91,6 +93,8 @@ describe("kong.clustering.control_plane", function()
9193
"trigger",
9294
},
9395
rate_limiting = {
96+
"error_code",
97+
"error_message",
9498
"redis_ssl",
9599
"redis_ssl_verify",
96100
"redis_server_name",
@@ -119,6 +123,8 @@ describe("kong.clustering.control_plane", function()
119123
"trigger",
120124
},
121125
rate_limiting = {
126+
"error_code",
127+
"error_message",
122128
"redis_ssl",
123129
"redis_ssl_verify",
124130
"redis_server_name",
@@ -147,6 +153,8 @@ describe("kong.clustering.control_plane", function()
147153
"trigger",
148154
},
149155
rate_limiting = {
156+
"error_code",
157+
"error_message",
150158
"redis_ssl",
151159
"redis_ssl_verify",
152160
"redis_server_name",
@@ -165,6 +173,8 @@ describe("kong.clustering.control_plane", function()
165173
"trigger",
166174
},
167175
rate_limiting = {
176+
"error_code",
177+
"error_message",
168178
"redis_ssl",
169179
"redis_ssl_verify",
170180
"redis_server_name",
@@ -183,6 +193,8 @@ describe("kong.clustering.control_plane", function()
183193
"trigger",
184194
},
185195
rate_limiting = {
196+
"error_code",
197+
"error_message",
186198
"redis_ssl",
187199
"redis_ssl_verify",
188200
"redis_server_name",
@@ -191,13 +203,27 @@ describe("kong.clustering.control_plane", function()
191203

192204
assert.same({
193205
rate_limiting = {
206+
"error_code",
207+
"error_message",
194208
"redis_ssl",
195209
"redis_ssl_verify",
196210
"redis_server_name",
197211
},
198212
}, cp._get_removed_fields(2006000000))
199213

200-
assert.same(nil, cp._get_removed_fields(2007000000))
214+
assert.same({
215+
rate_limiting = {
216+
"error_code",
217+
"error_message",
218+
},
219+
}, cp._get_removed_fields(2007000000))
220+
assert.same({
221+
rate_limiting = {
222+
"error_code",
223+
"error_message",
224+
},
225+
}, cp._get_removed_fields(2008000000))
226+
assert.same(nil, cp._get_removed_fields(3001000000))
201227
end)
202228

203229
it("removing unknown fields", function()

0 commit comments

Comments
 (0)