You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/09/07 03:16:48 UTC

[apisix] branch master updated: chore: avoid injecting ip-restriction twice to interceptors_schema (#4939)

This is an automated email from the ASF dual-hosted git repository.

spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new d3e104e  chore: avoid injecting ip-restriction twice to interceptors_schema (#4939)
d3e104e is described below

commit d3e104e8e139b1d6fdac29bfb96a3034f71100ef
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Tue Sep 7 11:16:44 2021 +0800

    chore: avoid injecting ip-restriction twice to interceptors_schema (#4939)
    
    Signed-off-by: spacewander <sp...@gmail.com>
---
 apisix/admin/plugin_metadata.lua | 2 +-
 apisix/api_router.lua            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apisix/admin/plugin_metadata.lua b/apisix/admin/plugin_metadata.lua
index df1c93a..5cb4dd4 100644
--- a/apisix/admin/plugin_metadata.lua
+++ b/apisix/admin/plugin_metadata.lua
@@ -69,7 +69,7 @@ local function check_conf(plugin_name, conf)
     schema.properties.interceptors = api_router.interceptors_schema
 
     core.log.info("schema: ", core.json.delay_encode(schema))
-    core.log.info("conf  : ", core.json.delay_encode(conf))
+    core.log.info("conf: ", core.json.delay_encode(conf))
 
     local ok, err
     if schema['$comment'] == injected_mark
diff --git a/apisix/api_router.lua b/apisix/api_router.lua
index 7d2628b..9f63acd 100644
--- a/apisix/api_router.lua
+++ b/apisix/api_router.lua
@@ -46,7 +46,7 @@ _M.interceptors_schema = {
         properties = {
             name = {
                 type = "string",
-                enum = {"ip-restriction"},
+                enum = {},
             },
             conf = {
                 type = "object",