Merge branch 'feature/grpc-proxy' of github.com:nic-chen/apisix into …

…feature/grpc-proxy

# Conflicts:
#	lua/apisix/plugins/grpc-proxy/proto.lua

lua/apisix/admin/routes.lua

@@ -27,7 +27,7 @@ local function check_conf(id, conf, need_id)
         return nil, {error_msg = "wrong route id"}
     end
 
-    core.log.info("schema: ", core.json.delay_encode(core.schema.route))
+    core.log.info("schema: ", core.schema.route)
     core.log.info("conf  : ", core.json.delay_encode(conf))
     local ok, err = core.schema.check(core.schema.route, conf)
     if not ok then

lua/apisix/http/router.lua

@@ -10,6 +10,7 @@ function _M.init_worker()
     local conf = local_conf()
     local router_http_name = "r3_uri"
     local router_ssl_name = "r3_sni"
+
     if conf and conf.apisix and conf.apisix.router then
         router_http_name = conf.apisix.router.http or router_http_name
         router_ssl_name = conf.apisix.router.ssl or router_ssl_name
@@ -22,10 +23,6 @@ function _M.init_worker()
     local router_ssl = require("apisix.http.router." .. router_ssl_name)
     router_ssl:init_worker()
     _M.router_ssl = router_ssl
-
-    local proto = require("apisix.plugins.grpc-proxy.proto")
-    proto:init_worker()
-
 end
 
 

lua/apisix/plugins/grpc-proxy.lua

@@ -13,12 +13,17 @@ local schema = {
 
 local _M = {
     version = 0.1,
-    priority = 500,
+    priority = 506,
     name = plugin_name,
     schema = schema,
 }
 
 
+function _M.init()
+    proto.init()
+end
+
+
 function _M.check_schema(conf)
     local ok, err = core.schema.check(schema, conf)
     if not ok then
@@ -33,7 +38,7 @@ function _M.access(conf, ctx)
     local proto_id = conf.proto_id
     if not proto_id then
         ngx.log(ngx.ERR, ("proto id miss: %s"):format(proto_id))
-        return    
+        return
     end
 
     local p, err = proto.new(proto_id)
@@ -60,7 +65,7 @@ function _M.body_filter(conf, ctx)
     local proto_id = conf.proto_id
     if not proto_id then
         ngx.log(ngx.ERR, ("proto id miss: %s"):format(proto_id))
-        return    
+        return
     end
 
     local p, err = proto.new(proto_id)

lua/apisix/plugins/grpc-proxy/util.lua

@@ -64,7 +64,7 @@ _M.map_message = function(field, default_values)
     end
 
     local request = {}
-    local sub, err 
+    local sub, err
     for name, _, field_type in pb.fields(field) do
         if field_type:sub(1, 1) == "." then
             sub, err = _M.map_message(field_type, default_values)
@@ -79,4 +79,4 @@ _M.map_message = function(field, default_values)
     return request, nil
 end
 
-return _M
+return _M

t/admin/plugins.t

@@ -14,6 +14,6 @@ __DATA__
 --- request
 GET /apisix/admin/plugins/list
 --- response_body_like eval
-qr/\["limit-req","limit-count","limit-conn","key-auth","prometheus","node-status","jwt-auth","zipkin"\]/
+qr/\["limit-req","limit-count","limit-conn","key-auth","prometheus","node-status","jwt-auth","zipkin","grpc-proxy"\]/
 --- no_error_log
 [error]

t/admin/schema.t

@@ -14,7 +14,7 @@ __DATA__
 --- request
 GET /apisix/admin/schema/route
 --- response_body eval
-qr/"plugins": \{"type":"object"}/
+qr/"plugins":\{"type":"object"}/
 --- no_error_log
 [error]
 

t/debug-mode.t

@@ -45,6 +45,7 @@ loaded plugin and sort by priority: 1003 name: limit-conn
 loaded plugin and sort by priority: 1002 name: limit-count
 loaded plugin and sort by priority: 1001 name: limit-req
 loaded plugin and sort by priority: 1000 name: node-status
+loaded plugin and sort by priority: 506 name: grpc-proxy
 loaded plugin and sort by priority: 500 name: prometheus
 loaded plugin and sort by priority: 0 name: example-plugin
 loaded plugin and sort by priority: -1000 name: zipkin