You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2021/09/03 02:17:17 UTC
[GitHub] [apisix] spacewander opened a new pull request #4977: feat: allow route to inherit hosts from service
spacewander opened a new pull request #4977:
URL: https://github.com/apache/apisix/pull/4977
Signed-off-by: spacewander <sp...@gmail.com>
### What this PR does / why we need it:
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
### Pre-submission checklist:
* [x] Did you explain what problem does this PR solve? Or what new features have been added?
* [x] Have you added corresponding test cases?
* [x] Have you modified the corresponding document?
* [x] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix/tree/master#community) first**
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] nic-chen commented on a change in pull request #4977: feat: allow route to inherit hosts from service
Posted by GitBox <gi...@apache.org>.
nic-chen commented on a change in pull request #4977:
URL: https://github.com/apache/apisix/pull/4977#discussion_r702342499
##########
File path: t/router/radixtree-host-uri3.t
##########
@@ -0,0 +1,124 @@
+#
+# 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';
+
+our $yaml_config = <<_EOC_;
+apisix:
+ node_listen: 1984
+ router:
+ http: 'radixtree_host_uri'
+ admin_key: null
+_EOC_
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ $block->set_value("yaml_config", $yaml_config);
+
+ if (!$block->request) {
+ $block->set_value("request", "GET /t");
+ }
+
+ if (!$block->error_log && !$block->no_error_log &&
+ (defined $block->error_code && $block->error_code != 502))
+ {
+ $block->set_value("no_error_log", "[error]");
+ }
+
+ $block;
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: change hosts in services
+--- config
+ location /t {
+ content_by_lua_block {
+ local http = require "resty.http"
+ local uri = "http://127.0.0.1:" .. ngx.var.server_port
+ .. "/hello"
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "hosts": ["foo.com"]
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.1)
+
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "methods": ["GET"],
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "service_id": "1",
+ "uri": "/hello"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ local httpc = http.new()
+ local res, err = httpc:request_uri(uri, {headers = {Host = "foo.com"}})
+ if not res then
+ ngx.say(err)
+ return
+ end
+ ngx.print(res.body)
+
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "hosts": ["bar.com"]
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.1)
+
+ local httpc = http.new()
+ local res, err = httpc:request_uri(uri, {headers = {Host = "foo.com"}})
Review comment:
should be better if we have another test case without `Host`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander merged pull request #4977: feat: allow route to inherit hosts from service
Posted by GitBox <gi...@apache.org>.
spacewander merged pull request #4977:
URL: https://github.com/apache/apisix/pull/4977
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #4977: feat: allow route to inherit hosts from service
Posted by GitBox <gi...@apache.org>.
spacewander commented on a change in pull request #4977:
URL: https://github.com/apache/apisix/pull/4977#discussion_r702409735
##########
File path: t/router/radixtree-host-uri2.t
##########
@@ -376,3 +376,39 @@ GET /server_port
Host: test.com
--- no_error_log
[error]
+
+
+
+=== TEST 14: inherit hosts from services
+--- yaml_config eval: $::yaml_config
+--- apisix_yaml
+services:
+ - id: 1
+ hosts:
+ - bar.com
Review comment:
Yes, we test with unmatched. If the host doesn't take effect, the route will match and the response body is "hello1 world".
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] Donghui0 commented on pull request #4977: feat: allow route to inherit hosts from service
Posted by GitBox <gi...@apache.org>.
Donghui0 commented on pull request #4977:
URL: https://github.com/apache/apisix/pull/4977#issuecomment-927269933
in `plugin.merge_service_route` function, need to add processing for route.value.timeout. Otherwise, the timeout attribute of ApisixRoute will be invalid.
I have a question in the `merge service_route` method. Why not directly core.table.deepcopy(route_conf), assign the attribute of service to new_conf ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] tzssangglass commented on a change in pull request #4977: feat: allow route to inherit hosts from service
Posted by GitBox <gi...@apache.org>.
tzssangglass commented on a change in pull request #4977:
URL: https://github.com/apache/apisix/pull/4977#discussion_r702005542
##########
File path: t/router/radixtree-host-uri2.t
##########
@@ -376,3 +376,39 @@ GET /server_port
Host: test.com
--- no_error_log
[error]
+
+
+
+=== TEST 14: inherit hosts from services
+--- yaml_config eval: $::yaml_config
+--- apisix_yaml
+services:
+ - id: 1
+ hosts:
+ - bar.com
Review comment:
the service hosts here is `bar.com`, but the host in request is `www.foo.com`,how they match?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix] spacewander commented on a change in pull request #4977: feat: allow route to inherit hosts from service
Posted by GitBox <gi...@apache.org>.
spacewander commented on a change in pull request #4977:
URL: https://github.com/apache/apisix/pull/4977#discussion_r702410067
##########
File path: t/router/radixtree-host-uri3.t
##########
@@ -0,0 +1,124 @@
+#
+# 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';
+
+our $yaml_config = <<_EOC_;
+apisix:
+ node_listen: 1984
+ router:
+ http: 'radixtree_host_uri'
+ admin_key: null
+_EOC_
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ $block->set_value("yaml_config", $yaml_config);
+
+ if (!$block->request) {
+ $block->set_value("request", "GET /t");
+ }
+
+ if (!$block->error_log && !$block->no_error_log &&
+ (defined $block->error_code && $block->error_code != 502))
+ {
+ $block->set_value("no_error_log", "[error]");
+ }
+
+ $block;
+});
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: change hosts in services
+--- config
+ location /t {
+ content_by_lua_block {
+ local http = require "resty.http"
+ local uri = "http://127.0.0.1:" .. ngx.var.server_port
+ .. "/hello"
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "hosts": ["foo.com"]
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.1)
+
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "methods": ["GET"],
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "service_id": "1",
+ "uri": "/hello"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ local httpc = http.new()
+ local res, err = httpc:request_uri(uri, {headers = {Host = "foo.com"}})
+ if not res then
+ ngx.say(err)
+ return
+ end
+ ngx.print(res.body)
+
+ local code, body = t('/apisix/admin/services/1',
+ ngx.HTTP_PUT,
+ [[{
+ "hosts": ["bar.com"]
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.1)
+
+ local httpc = http.new()
+ local res, err = httpc:request_uri(uri, {headers = {Host = "foo.com"}})
Review comment:
Added.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org