feature: support etcd v3, by mocking v2 API

.travis/linux_apisix_current_luarocks_runner.sh

@@ -51,6 +51,7 @@ script() {
     mkdir -p ~/etcd-data
     /usr/bin/etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
     etcd --version
+    export ETCDCTL_API=3
     sleep 5
 
     sudo rm -rf /usr/local/apisix

.travis/linux_apisix_master_luarocks_runner.sh

@@ -51,6 +51,7 @@ script() {
     mkdir -p ~/etcd-data
     /usr/bin/etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
     etcd --version
+    export ETCDCTL_API=3
     sleep 5
 
     sudo rm -rf /usr/local/apisix

.travis/linux_openresty_mtls_runner.sh

@@ -95,6 +95,7 @@ script() {
     mkdir -p ~/etcd-data
     /usr/bin/etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
     etcd --version
+    export ETCDCTL_API=3
     sleep 5
 
 

.travis/linux_openresty_runner.sh

@@ -132,6 +132,7 @@ script() {
     mkdir -p ~/etcd-data
     /usr/bin/etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
     etcd --version
+    export ETCDCTL_API=3
     sleep 5
 
     ./build-cache/grpc_server_example &

.travis/linux_tengine_runner.sh

@@ -245,6 +245,7 @@ do_install() {
     rm -rf luarocks-2.4.4
 
     export GO111MOUDULE=on
+    export ETCDCTL_API=3
 
     if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
         create_lua_deps
@@ -285,6 +286,7 @@ script() {
     mkdir -p ~/etcd-data
     /usr/bin/etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
     etcd --version
+    export ETCDCTL_API=3
     sleep 5
 
     ./build-cache/grpc_server_example &

.travis/osx_openresty_runner.sh

@@ -66,6 +66,7 @@ script() {
 
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
+    export ETCDCTL_API=3
 
     etcd --enable-v2=true &
     sleep 1

Makefile

@@ -72,6 +72,7 @@ lint: utils
 ### init:             Initialize the runtime environment
 .PHONY: init
 init: default
+	export ETCDCTL_API=3
 	./bin/apisix init
 	./bin/apisix init_etcd
 

apisix/core.lua

@@ -19,7 +19,9 @@ local local_conf = require("apisix.core.config_local").local_conf()
 
 local config_center = local_conf.apisix and local_conf.apisix.config_center
                       or "etcd"
+local etcd_version = local_conf.etcd.version == "v3" and "_v3" or ""
 log.info("use config_center: ", config_center)
+log.info("etcd version: ", etcd_version)
 
 return {
     version  = require("apisix.core.version"),
@@ -35,7 +37,7 @@ return {
     timer    = require("apisix.core.timer"),
     id       = require("apisix.core.id"),
     utils    = require("apisix.core.utils"),
-    etcd     = require("apisix.core.etcd"),
+    etcd     = require("apisix.core.etcd" .. etcd_version),
     http     = require("apisix.core.http"),
     tablepool= require("tablepool"),
     empty_tab= {},

apisix/core/config_etcd.lua

@@ -17,6 +17,7 @@
 local config_local = require("apisix.core.config_local")
 local log          = require("apisix.core.log")
 local json         = require("apisix.core.json")
+local etcd_v3      = require("apisix.core.etcd_v3")
 local etcd         = require("resty.etcd")
 local new_tab      = require("table.new")
 local clone_tab    = require("table.clone")
@@ -48,14 +49,15 @@ local mt = {
         return " etcd key: " .. self.key
     end
 }
+local etcd_version = _M.local_conf().etcd.version or "v2"
 
 
 local function getkey(etcd_cli, key)
     if not etcd_cli then
         return nil, "not inited"
     end
 
-    local res, err = etcd_cli:get(key)
+    local res, err = etcd_cli:readdir(key)
     if not res then
         -- log.error("failed to get key from etcd: ", err)
         return nil, err
@@ -65,6 +67,13 @@ local function getkey(etcd_cli, key)
         return nil, "failed to get key from etcd"
     end
 
+    if(etcd_version == "v3") then
+        res, err = etcd_v3.postget(res, key)
+        if not res then
+            return nil, err
+        end
+    end
+
     return res
 end
 
@@ -74,7 +83,7 @@ local function readdir(etcd_cli, key)
         return nil, nil, "not inited"
     end
 
-    local res, err = etcd_cli:readdir(key, true)
+    local res, err = etcd_cli:readdir(key)
     if not res then
         -- log.error("failed to get key from etcd: ", err)
         return nil, nil, err
@@ -84,6 +93,13 @@ local function readdir(etcd_cli, key)
         return nil, "failed to read etcd dir"
     end
 
+    if(etcd_version == "v3") then
+        res, err = etcd_v3.postget(res, key .. "/")
+        if not res then
+            return nil, err
+        end
+    end
+
     return res
 end
 
@@ -92,12 +108,33 @@ local function waitdir(etcd_cli, key, modified_index, timeout)
         return nil, nil, "not inited"
     end
 
-    local res, err = etcd_cli:waitdir(key, modified_index, timeout)
+    local res, err
+    if etcd_version == "v3" then
+        local opts = {}
+        opts.start_revision = modified_index
+        opts.timeout = timeout
+        local res_fun, fun_err = etcd_cli:watchdir(key, opts)
+        if not res_fun then
+            return nil, fun_err
+        end
+        res_fun() -- skip create info
+        res, err = res_fun()
+    else
+        res, err = etcd_cli:waitdir(key, modified_index, timeout)
+    end
+
     if not res then
         -- log.error("failed to get key from etcd: ", err)
         return nil, err
     end
 
+    if etcd_version == "v3" then
+        if type(res.result) ~= "table" then
+            return nil, "failed to read etcd dir"
+        end
+        return etcd_v3.postwatch(res)
+    end
+
     if type(res.body) ~= "table" then
         return nil, "failed to read etcd dir"
     end
@@ -430,6 +467,8 @@ function _M.new(key, opts)
     etcd_conf.http_host = etcd_conf.host
     etcd_conf.host = nil
     etcd_conf.prefix = nil
+    etcd_conf.protocol = etcd_conf.version
+    etcd_conf.version = nil
 
     local etcd_cli
     etcd_cli, err = etcd.new(etcd_conf)