shreemaan-abhishek commented on code in PR #10298:
URL: https://github.com/apache/apisix/pull/10298#discussion_r1349514409
##########
apisix/init.lua:
##########
@@ -1078,6 +1079,34 @@ function _M.stream_preread_phase()
api_ctx.matched_upstream = upstream
+ elseif matched_route.value.service_id then
+ local service = service_fetch(matched_route.value.service_id)
+ if not service then
+ core.log.error("failed to fetch service configuration by ",
+ "id: ", matched_route.value.service_id)
+ return core.response.exit(404)
+ end
+
+ matched_route = plugin.merge_service_stream_route(service,
matched_route)
+ api_ctx.matched_route = matched_route
+ api_ctx.conf_type = "stream_route&service"
+ api_ctx.conf_version = matched_route.modifiedIndex .. "&" ..
service.modifiedIndex
+ api_ctx.conf_id = matched_route.value.id .. "&" .. service.value.id
+ api_ctx.service_id = service.value.id
+ api_ctx.service_name = service.value.name
+ api_ctx.matched_upstream = matched_route.value.upstream
+ if matched_route.value.upstream_id and not
matched_route.value.upstream then
+ local upstream =
apisix_upstream.get_by_id(matched_route.value.upstream_id)
+ if not upstream then
+ if is_http then
+ return core.response.exit(502)
+ end
+
+ return ngx_exit(1)
Review Comment:
why `return ngx_exit(1)`
##########
apisix/plugin.lua:
##########
@@ -636,6 +639,47 @@ function _M.merge_service_route(service_conf, route_conf)
service_conf, route_conf)
end
+local function merge_service_stream_route(service_conf, route_conf)
+ -- because many fields in Service are not supported by stream route,
+ -- so we copy the stream route as base object
+ local new_conf = core.table.deepcopy(route_conf)
+ if service_conf.value.plugins then
+ for name, conf in pairs(service_conf.value.plugins) do
+ if not new_conf.value.plugins then
+ new_conf.value.plugins = {}
+ end
+
+ if not new_conf.value.plugins[name] then
+ new_conf.value.plugins[name] = conf
+ end
+ end
+ end
+
+ new_conf.value.service_id = nil
+
+ if not new_conf.value.upstream and service_conf.value.upstream then
+ new_conf.value.upstream = service_conf.value.upstream
+ end
+
+ if not new_conf.value.upstream_id and service_conf.value.upstream_id then
+ new_conf.value.upstream_id = service_conf.value.upstream_id
+ end
+
+ --core.log.info("merged stream_route conf : ",
require("inspect")(new_conf))
Review Comment:
remove this line
##########
apisix/http/service.lua:
##########
@@ -61,7 +61,7 @@ function _M.init_worker()
filter = filter,
})
if not services then
- error("failed to create etcd instance for fetching upstream: " .. err)
+ error("failed to create etcd instance for fetching /services: " .. err)
Review Comment:
```suggestion
error("failed to create etcd instance for fetching services: " ..
err)
```
--
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]
