From b0934f9ed45ec352c3de09f59e6912a7ba71936e Mon Sep 17 00:00:00 2001
From: tzssangglass <tzssangglass@gmail.com>
Date: Tue, 16 Aug 2022 13:51:31 +0800
Subject: [PATCH] change: remove deprecated lua_shared_dicts (#7677)

---
 apisix/cli/ngx_tpl.lua    |  5 -----
 apisix/cli/ops.lua        |  5 -----
 t/cli/test_http_config.sh | 16 ----------------
 3 files changed, 26 deletions(-)

diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
index 0f5d84b17fed..db93cfdec7e8 100644
--- a/apisix/cli/ngx_tpl.lua
+++ b/apisix/cli/ngx_tpl.lua
@@ -302,11 +302,6 @@ http {
     lua_shared_dict {*cache_key*} {*cache_size*};
     {% end %}
     {% end %}
-    {% if http.lua_shared_dicts then %}
-    {% for cache_key, cache_size in pairs(http.lua_shared_dicts) do %}
-    lua_shared_dict {*cache_key*} {*cache_size*};
-    {% end %}
-    {% end %}
 
     {% if enabled_plugins["error-log-logger"] then %}
         lua_capture_error_log  10m;
diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
index 2cd72837adb3..72a58d8e5f43 100644
--- a/apisix/cli/ops.lua
+++ b/apisix/cli/ops.lua
@@ -651,11 +651,6 @@ Please modify "admin_key" in conf/config.yaml .
         sys_conf["worker_processes"] = floor(tonumber(env_worker_processes))
     end
 
-    if sys_conf["http"]["lua_shared_dicts"] then
-        stderr:write("lua_shared_dicts is deprecated, " ..
-                     "use custom_lua_shared_dict instead\n")
-    end
-
     local exported_vars = file.get_exported_vars()
     if exported_vars then
         if not sys_conf["envs"] then
diff --git a/t/cli/test_http_config.sh b/t/cli/test_http_config.sh
index 20837f65a069..4059ca69a712 100755
--- a/t/cli/test_http_config.sh
+++ b/t/cli/test_http_config.sh
@@ -39,22 +39,6 @@ echo "passed: define custom shdict"
 
 git checkout conf/config.yaml
 
-echo '
-nginx_config:
-  http:
-    lua_shared_dicts:
-      my_dict: 1m
-' > conf/config.yaml
-
-make init
-
-if ! grep "lua_shared_dict my_dict 1m;" conf/nginx.conf > /dev/null; then
-    echo "failed: define custom shdict in the old way"
-    exit 1
-fi
-
-echo "passed: define custom shdict in the old way"
-
 echo "
 plugins:
     - ip-restriction