perf: allow skip body filter #8149
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,286 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| use t::APISIX 'no_plan'; | ||
|
|
||
| repeat_each(1); | ||
| log_level('info'); | ||
| worker_connections(256); | ||
| no_root_location(); | ||
| no_shuffle(); | ||
|
|
||
| add_block_preprocessor(sub { | ||
| my ($block) = @_; | ||
|
|
||
| if ((!defined $block->error_log) && (!defined $block->no_error_log)) { | ||
| $block->set_value("no_error_log", "[error]"); | ||
| } | ||
|
|
||
| if (!defined $block->request) { | ||
| $block->set_value("request", "GET /t"); | ||
| } | ||
|
|
||
| }); | ||
|
|
||
| run_tests(); | ||
|
|
||
| __DATA__ | ||
|
|
||
| === TEST 1: enable skip header and body filter | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local t = require("lib.test_admin").test | ||
| local code, body = t('/apisix/admin/routes/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "methods": ["GET"], | ||
| "upstream": { | ||
| "nodes": { | ||
| "127.0.0.1:1980": 1 | ||
| }, | ||
| "type": "roundrobin" | ||
| }, | ||
| "uri": "/hello" | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| ngx.say(body) | ||
| return | ||
| end | ||
| ngx.sleep(0.5) | ||
| local http = require "resty.http" | ||
| local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello" | ||
| local httpc = http.new() | ||
| local res, err = httpc:request_uri(uri) | ||
| assert(res.status == 200) | ||
| if not res then | ||
| ngx.log(ngx.ERR, err) | ||
| return | ||
| end | ||
| local headers = res.headers | ||
| ngx.say(headers["Server"]) | ||
| } | ||
| } | ||
| --- response_body eval | ||
| qr/openresty\/\d+/ | ||
|
|
||
|
|
||
|
|
||
| === TEST 2: route with plugin_config_id, disable skip header and body filter | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local t = require("lib.test_admin").test | ||
| local code, body = t('/apisix/admin/plugin_configs/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "plugins": { | ||
| "serverless-pre-function": { | ||
| "phase": "before_proxy", | ||
| "functions" : ["return function(conf, ctx) ngx.log(ngx.WARN, \"run before_proxy phase balancer_ip : \", ctx.balancer_ip) end"] | ||
| } | ||
| } | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| ngx.say(body) | ||
| return | ||
| end | ||
| ngx.sleep(0.5) | ||
|
|
||
| local code, body = t('/apisix/admin/routes/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "plugin_config_id": "1", | ||
| "upstream": { | ||
| "nodes": { | ||
| "127.0.0.1:1980": 1 | ||
| }, | ||
| "type": "roundrobin" | ||
| }, | ||
| "uri": "/hello" | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| ngx.say(body) | ||
| return | ||
| end | ||
| ngx.sleep(0.5) | ||
|
|
||
| local http = require "resty.http" | ||
| local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello" | ||
| local httpc = http.new() | ||
| local res, err = httpc:request_uri(uri) | ||
| assert(res.status == 200) | ||
| if not res then | ||
| ngx.log(ngx.ERR, err) | ||
| return | ||
| end | ||
| local headers = res.headers | ||
| ngx.say(headers["Server"]) | ||
| } | ||
| } | ||
| --- response_body eval | ||
| qr/APISIX\/\d+/ | ||
| --- error_log | ||
| run before_proxy phase balancer_ip : 127.0.0.1 | ||
| --- no_error_log | ||
| enable sample upstream | ||
|
|
||
|
|
||
|
|
||
| === TEST 3: route with plugins, disable skip header and body filter | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local t = require("lib.test_admin").test | ||
| local code, body = t('/apisix/admin/consumers', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "username": "new_consumer", | ||
| "plugins": { | ||
| "key-auth": { | ||
| "key": "auth-jack" | ||
| }, | ||
| "serverless-pre-function": { | ||
| "phase": "before_proxy", | ||
| "functions" : ["return function(conf, ctx) ngx.log(ngx.WARN, \"run before_proxy phase balancer_ip : \", ctx.balancer_ip) end"] | ||
| } | ||
| } | ||
| }]] | ||
| ) | ||
| ngx.sleep(0.5) | ||
|
|
||
| local code, body = t('/apisix/admin/routes/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "plugins": { | ||
| "key-auth": {} | ||
| }, | ||
| "upstream": { | ||
| "nodes": { | ||
| "127.0.0.1:1980": 1 | ||
| }, | ||
| "type": "roundrobin" | ||
| }, | ||
| "uri": "/hello" | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| ngx.say(body) | ||
| return | ||
| end | ||
| ngx.sleep(0.5) | ||
|
|
||
| local http = require "resty.http" | ||
| local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello" | ||
| local httpc = http.new() | ||
| local headers = { | ||
| ["apikey"] = "auth-jack" | ||
| } | ||
| local res, err = httpc:request_uri(uri, {headers = headers}) | ||
| assert(res.status == 200) | ||
| if not res then | ||
| ngx.log(ngx.ERR, err) | ||
| return | ||
| end | ||
| local headers = res.headers | ||
| ngx.say(headers["Server"]) | ||
| } | ||
| } | ||
| --- response_body eval | ||
| qr/APISIX\/\d+/ | ||
| --- error_log | ||
| run before_proxy phase balancer_ip : 127.0.0.1 | ||
| --- no_error_log | ||
| enable sample upstream | ||
|
|
||
|
|
||
|
|
||
| === TEST 4: one of route has plugins, disable skip header and body filter | ||
| --- config | ||
| location /t { | ||
| content_by_lua_block { | ||
| local t = require("lib.test_admin").test | ||
| local code, body = t('/apisix/admin/routes/1', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "plugins": { | ||
| "serverless-pre-function": { | ||
| "phase": "before_proxy", | ||
| "functions" : ["return function(conf, ctx) ngx.log(ngx.WARN, \"run before_proxy phase balancer_ip : \", ctx.balancer_ip) end"] | ||
| } | ||
| }, | ||
| "upstream": { | ||
| "nodes": { | ||
| "127.0.0.1:1980": 1 | ||
| }, | ||
| "type": "roundrobin" | ||
| }, | ||
| "uri": "/hello" | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| ngx.say(body) | ||
| return | ||
| end | ||
| ngx.sleep(0.5) | ||
|
|
||
| local code, body = t('/apisix/admin/routes/2', | ||
| ngx.HTTP_PUT, | ||
| [[{ | ||
| "upstream": { | ||
| "nodes": { | ||
| "127.0.0.1:1980": 1 | ||
| }, | ||
| "type": "roundrobin" | ||
| }, | ||
| "uri": "/hello1" | ||
| }]] | ||
| ) | ||
| if code >= 300 then | ||
| ngx.status = code | ||
| ngx.say(body) | ||
| return | ||
| end | ||
| ngx.sleep(0.5) | ||
|
|
||
| local http = require "resty.http" | ||
| local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello1" | ||
| local httpc = http.new() | ||
| local headers = { | ||
| ["apikey"] = "auth-jack" | ||
| } | ||
| local res, err = httpc:request_uri(uri, {headers = headers}) | ||
| assert(res.status == 200) | ||
| if not res then | ||
| ngx.log(ngx.ERR, err) | ||
| return | ||
| end | ||
| local headers = res.headers | ||
| ngx.say(headers["Server"]) | ||
| } | ||
| } | ||
| --- response_body eval | ||
| qr/APISIX\/\d+/ | ||
| --- no_error_log | ||
| enable sample upstream |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be a core API to get the version of APISIX runtime
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what do you thing? @spacewander
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean move
pcall(require, "resty.apisix.response")on apisix core level?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is possible but not valuable to do this, as we don't want to support multiple versions of APISIX-Base, only support the latest APISIX-Base. Maybe a simple API to detect if apisix-base / openresty is used is enough.