feat: make A/B test APISIX easier by removing "additionalProperties =…

… false" (#4797) Signed-off-by: spacewander <[email protected]>
apache · Aug 12, 2021 · 22ee20c · 22ee20c
1 parent cd34279
commit 22ee20c
Show file tree

Hide file tree

Showing 37 changed files with 155 additions and 611 deletions.
diff --git a/apisix/plugins/authz-casbin.lua b/apisix/plugins/authz-casbin.lua
@@ -36,7 +36,6 @@ local schema = {
         {required = {"model_path", "policy_path", "username"}},
         {required = {"model", "policy", "username"}}
     },
-    additionalProperties = false
 }
 
 local metadata_schema = {
@@ -46,7 +45,6 @@ local metadata_schema = {
         policy = {type = "string"},
     },
     required = {"model", "policy"},
-    additionalProperties = false
 }
 
 local _M = {

diff --git a/apisix/plugins/basic-auth.lua b/apisix/plugins/basic-auth.lua
@@ -31,7 +31,6 @@ local schema = {
     type = "object",
     title = "work with route or service object",
     properties = {},
-    additionalProperties = false,
 }
 
 local consumer_schema = {
@@ -42,7 +41,6 @@ local consumer_schema = {
         password = { type = "string" },
     },
     required = {"username", "password"},
-    additionalProperties = false,
 }
 
 local plugin_name = "basic-auth"

diff --git a/apisix/plugins/batch-requests.lua b/apisix/plugins/batch-requests.lua
@@ -37,12 +37,10 @@ local attr_schema = {
             default = default_uri
         }
     },
-    additionalProperties = false,
 }
 
 local schema = {
     type = "object",
-    additionalProperties = false,
 }
 
 local default_max_body_size = 1024 * 1024 -- 1MiB
@@ -56,7 +54,6 @@ local metadata_schema = {
             default = default_max_body_size,
         },
     },
-    additionalProperties = false,
 }
 
 local method_schema = core.table.clone(core.schema.method_schema)

diff --git a/apisix/plugins/echo.lua b/apisix/plugins/echo.lua
@@ -47,7 +47,6 @@ local schema = {
         {required = {"after_body"}}
     },
     minProperties = 1,
-    additionalProperties = false,
 }
 
 local plugin_name = "echo"

diff --git a/apisix/plugins/example-plugin.lua b/apisix/plugins/example-plugin.lua
@@ -38,7 +38,6 @@ local metadata_schema = {
         skey = {type = "string"},
     },
     required = {"ikey", "skey"},
-    additionalProperties = false,
 }
 
 local plugin_name = "example-plugin"

diff --git a/apisix/plugins/hmac-auth.lua b/apisix/plugins/hmac-auth.lua
@@ -45,7 +45,6 @@ local schema = {
     type = "object",
     title = "work with route or service object",
     properties = {},
-    additionalProperties = false,
 }
 
 local consumer_schema = {
@@ -83,7 +82,6 @@ local consumer_schema = {
         }
     },
     required = {"access_key", "secret_key"},
-    additionalProperties = false,
 }
 
 local _M = {

diff --git a/apisix/plugins/http-logger.lua b/apisix/plugins/http-logger.lua
@@ -56,7 +56,6 @@ local metadata_schema = {
     properties = {
         log_format = log_util.metadata_schema_log_format,
     },
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/ip-restriction/init.lua b/apisix/plugins/ip-restriction/init.lua
@@ -49,7 +49,6 @@ local schema = {
         {required = {"whitelist"}},
         {required = {"blacklist"}},
     },
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/jwt-auth.lua b/apisix/plugins/jwt-auth.lua
@@ -36,14 +36,12 @@ local lrucache = core.lrucache.new({
 
 local schema = {
     type = "object",
-    additionalProperties = false,
     properties = {},
 }
 
 local consumer_schema = {
     type = "object",
     -- can't use additionalProperties with dependencies
-    -- additionalProperties = false,
     properties = {
         key = {type = "string"},
         secret = {type = "string"},

diff --git a/apisix/plugins/kafka-logger.lua b/apisix/plugins/kafka-logger.lua
@@ -70,7 +70,6 @@ local metadata_schema = {
     properties = {
         log_format = log_util.metadata_schema_log_format,
     },
-    additionalProperties = false,
 }
 
 local _M = {

diff --git a/apisix/plugins/key-auth.lua b/apisix/plugins/key-auth.lua
@@ -26,7 +26,6 @@ local lrucache = core.lrucache.new({
 
 local schema = {
     type = "object",
-    additionalProperties = false,
     properties = {
         header = {
             type = "string",
@@ -41,7 +40,6 @@ local schema = {
 
 local consumer_schema = {
     type = "object",
-    additionalProperties = false,
     properties = {
         key = {type = "string"},
     },

diff --git a/apisix/plugins/log-rotate.lua b/apisix/plugins/log-rotate.lua
@@ -36,7 +36,6 @@ local MAX_KEPT = 24 * 7     -- max number of log files will be kept
 local schema = {
     type = "object",
     properties = {},
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/node-status.lua b/apisix/plugins/node-status.lua
@@ -25,7 +25,6 @@ local ipairs = ipairs
 
 local schema = {
     type = "object",
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/prometheus.lua b/apisix/plugins/prometheus.lua
@@ -30,7 +30,6 @@ local schema = {
             default = false
         }
     },
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/proxy-rewrite.lua b/apisix/plugins/proxy-rewrite.lua
@@ -62,7 +62,6 @@ local schema = {
         },
     },
     minProperties = 1,
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/referer-restriction.lua b/apisix/plugins/referer-restriction.lua
@@ -36,7 +36,6 @@ local schema = {
         },
     },
     required = {"whitelist"},
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/response-rewrite.lua b/apisix/plugins/response-rewrite.lua
@@ -50,7 +50,6 @@ local schema = {
         },
     },
     minProperties = 1,
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/server-info.lua b/apisix/plugins/server-info.lua
@@ -31,7 +31,6 @@ local default_report_ttl = 7200
 
 local schema = {
     type = "object",
-    additionalProperties = false,
 }
 local attr_schema = {
     type = "object",

diff --git a/apisix/plugins/skywalking.lua b/apisix/plugins/skywalking.lua
@@ -45,7 +45,6 @@ local attr_schema = {
             type = "integer",
         },
     },
-    additionalProperties = false,
 }
 
 local schema = {
@@ -58,7 +57,6 @@ local schema = {
             default = 1
         }
     },
-    additionalProperties = false,
 }
 
 

diff --git a/apisix/plugins/traffic-split.lua b/apisix/plugins/traffic-split.lua
@@ -85,11 +85,9 @@ local schema = {
                     match = match_schema,
                     weighted_upstreams = upstreams_schema
                 },
-                additionalProperties = false
             }
         }
     },
-    additionalProperties = false
 }
 
 local plugin_name = "traffic-split"

diff --git a/apisix/plugins/ua-restriction.lua b/apisix/plugins/ua-restriction.lua
@@ -49,7 +49,6 @@ local schema = {
             default = "Not allowed"
         },
     },
-    additionalProperties = false,
 }
 
 local plugin_name = "ua-restriction"

diff --git a/apisix/schema_def.lua b/apisix/schema_def.lua
@@ -280,7 +280,6 @@ local health_checker = {
             }
         }
     },
-    additionalProperties = false,
     anyOf = {
         {required = {"active"}},
         {required = {"active", "passive"}},
@@ -642,7 +641,6 @@ _M.route = {
             {required = {"script", "plugin_config_id"}},
         }
     },
-    additionalProperties = false,
 }
 
 
@@ -665,7 +663,6 @@ _M.service = {
         },
 
     },
-    additionalProperties = false,
 }
 
 
@@ -683,7 +680,6 @@ _M.consumer = {
         desc = desc_def,
     },
     required = {"username"},
-    additionalProperties = false,
 }
 
 
@@ -748,7 +744,6 @@ _M.ssl = {
         {required = {"sni", "key", "cert"}},
         {required = {"snis", "key", "cert"}}
     },
-    additionalProperties = false,
 }
 
 
@@ -765,7 +760,6 @@ _M.proto = {
         }
     },
     required = {"content"},
-    additionalProperties = false,
 }
 
 
@@ -778,7 +772,6 @@ _M.global_rule = {
         update_time = timestamp_def
     },
     required = {"plugins"},
-    additionalProperties = false,
 }
 
 
@@ -823,7 +816,6 @@ _M.plugins = {
             stream = {
                 type = "boolean"
             },
-            additionalProperties = false,
         },
         required = {"name"}
     }
@@ -841,7 +833,6 @@ _M.plugin_config = {
         update_time = timestamp_def
     },
     required = {"id", "plugins"},
-    additionalProperties = false,
 }
 
 

diff --git a/docs/en/latest/plugin-develop.md b/docs/en/latest/plugin-develop.md
@@ -227,7 +227,6 @@ local metadata_schema = {
         skey = {type = "string"},
     },
     required = {"ikey", "skey"},
-    additionalProperties = false,
 }
 
 local plugin_name = "example-plugin"
@@ -268,7 +267,6 @@ To validate the configuration, the plugin uses a schema like this:
 ```lua
 local consumer_schema = {
     type = "object",
-    additionalProperties = false,
     properties = {
         key = {type = "string"},
     },

diff --git a/docs/zh/latest/plugin-develop.md b/docs/zh/latest/plugin-develop.md
@@ -173,7 +173,6 @@ local metadata_schema = {
         skey = {type = "string"},
     },
     required = {"ikey", "skey"},
-    additionalProperties = false,
 }
 
 local plugin_name = "example-plugin"
@@ -214,7 +213,6 @@ local _M = {
 ```lua
 local consumer_schema = {
     type = "object",
-    additionalProperties = false,
     properties = {
         key = {type = "string"},
     },