fix(*) remove blacklist/whitelist from schema (#8560)

Remove deprecated blacklists / whitelist etc. config fields from bot-detection, ip-restriction and ACL
Kong · Mar 22, 2022 · f9e6536 · f9e6536
1 parent 34e8f38
commit f9e6536
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 51 deletions.
diff --git a/kong/plugins/acl/schema.lua b/kong/plugins/acl/schema.lua
@@ -13,23 +13,6 @@ return {
           { deny = { type = "array", elements = { type = "string" }, }, },
           { hide_groups_header = { type = "boolean", required = true, default = false }, },
         },
-        shorthand_fields = {
-          -- deprecated forms, to be removed in Kong 3.0
-          { blacklist = {
-              type = "array",
-              elements = { type = "string", is_regex = true },
-              func = function(value)
-                return { deny = value }
-              end,
-          }, },
-          { whitelist = {
-              type = "array",
-              elements = { type = "string", is_regex = true },
-              func = function(value)
-                return { allow = value }
-              end,
-          }, },
-        },
       }
     }
   },

diff --git a/kong/plugins/bot-detection/schema.lua b/kong/plugins/bot-detection/schema.lua
@@ -19,23 +19,6 @@ return {
               default = {},
           }, },
         },
-        shorthand_fields = {
-          -- deprecated forms, to be removed in Kong 3.0
-          { blacklist = {
-              type = "array",
-              elements = { type = "string", is_regex = true },
-              func = function(value)
-                return { deny = value }
-              end,
-          }, },
-          { whitelist = {
-              type = "array",
-              elements = { type = "string", is_regex = true },
-              func = function(value)
-                return { allow = value }
-              end,
-          }, },
-        },
     }, },
   },
 }
diff --git a/kong/plugins/ip-restriction/schema.lua b/kong/plugins/ip-restriction/schema.lua
@@ -13,23 +13,6 @@ return {
           { status = { type = "number", required = false } },
           { message = { type = "string", required = false } },
         },
-        shorthand_fields = {
-          -- deprecated forms, to be removed in Kong 3.0
-          { blacklist = {
-              type = "array",
-              elements = { type = "string", is_regex = true },
-              func = function(value)
-                return { deny = value }
-              end,
-          }, },
-          { whitelist = {
-              type = "array",
-              elements = { type = "string", is_regex = true },
-              func = function(value)
-                return { allow = value }
-              end,
-          }, },
-        },
       },
     },
   },