spacewander commented on a change in pull request #5028:
URL: https://github.com/apache/apisix/pull/5028#discussion_r732382937
##########
File path: apisix/cli/ngx_tpl.lua
##########
@@ -209,16 +209,22 @@ http {
{% if enabled_plugins["proxy-cache"] then %}
# for proxy cache
{% for _, cache in ipairs(proxy_cache.zones) do %}
+ {% if cache.disk_path and cache.cache_levels and cache.disk_size then %}
Review comment:
We can check the cache attributes with schema, like:
https://github.com/apache/apisix/blob/b5d72cbf1315f1efc80689246a7dcf124c9e6443/apisix/cli/ops.lua#L154
##########
File path: t/plugin/proxy-cache-memory.t
##########
@@ -0,0 +1,733 @@
+#
+# 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.
+#
+BEGIN {
+ $ENV{TEST_NGINX_FORCE_RESTART_ON_TEST} = 0;
+}
+
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_shuffle();
+no_root_location();
+log_level('info');
+
+
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ my $http_config = $block->http_config // <<_EOC_;
+
+ # for proxy cache
+ proxy_cache_path /tmp/disk_cache_one levels=1:2
keys_zone=disk_cache_one:50m inactive=1d max_size=1G;
+ proxy_cache_path /tmp/disk_cache_two levels=1:2
keys_zone=disk_cache_two:50m inactive=1d max_size=1G;
+ lua_shared_dict memory_cache 50m;
+
+ # for proxy cache
+ map \$upstream_cache_zone \$upstream_cache_zone_info {
+ disk_cache_one /tmp/disk_cache_one,1:2;
+ disk_cache_two /tmp/disk_cache_two,1:2;
+ }
+
+ server {
+ listen 1986;
+ server_tokens off;
+
+ location / {
+ expires 60s;
+
+ if (\$arg_expires) {
+ expires \$arg_expires;
+ }
+
+ if (\$arg_cc) {
+ expires off;
+ add_header Cache-Control \$arg_cc;
+ }
+
+ return 200 "hello world!";
+ }
+
+ location /hello-not-found {
+ return 404;
+ }
+ }
+_EOC_
+
+ $block->set_value("http_config", $http_config);
+});
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: sanity check (invalid cache strategy)
+--- 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": {
+ "proxy-cache": {
+ "cache_strategy": "network",
+ "cache_key":["$host","$uri"],
+ "cache_zone": "disk_cache_one",
+ "cache_bypass": ["$arg_bypass"],
+ "cache_method": ["GET"],
+ "cache_http_status": [200],
+ "hide_cache_headers": true,
+ "no_cache": ["$arg_no_cache"]
+ }
+ },
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1986": 1
+ },
+ "type": "roundrobin"
+ },
+ "uri": "/hello*"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- error_code: 400
+--- response_body eval
+qr/failed to check the configuration of plugin proxy-cache err: property
\\"cache_strategy\\" validation failed: matches none of the enum values/
+--- no_error_log
Review comment:
We can check no_error_log by default like:
https://github.com/apache/apisix/blob/b5d72cbf1315f1efc80689246a7dcf124c9e6443/t/plugin/gzip.t#L40
##########
File path: t/plugin/proxy-cache-memory.t
##########
@@ -0,0 +1,733 @@
+#
Review comment:
Let's rename this test file to t/plugin/proxy-cache/memory.t. The origin
t/plugin/proxy-cache.t can be renamed to t/plugin/proxy-cache/disk.t
##########
File path: apisix/plugins/proxy-cache/memory.lua
##########
@@ -0,0 +1,70 @@
+--
+-- 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.
+--
+
+local ngx = ngx
+local ngx_shared = ngx.shared
+local setmetatable = setmetatable
+local cjson = require("cjson.safe")
Review comment:
Better to use `core.json`
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
