Support etcd

.travis.yml

@@ -7,24 +7,37 @@ services:
   - mysql
   - postgresql
   - memcached
+  - etcd
 env:
   global:
     - GO_REPO_FULLNAME="github.com/astaxie/beego"
   matrix:
     - ORM_DRIVER=sqlite3   ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db
     - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable"
+    - ORM_DRIVER=mysql export ORM_SOURCE="root:@/orm_test?charset=utf8"
 before_install:
-   # link the local repo with ${GOPATH}/src/<namespace>/<repo>
+  # link the local repo with ${GOPATH}/src/<namespace>/<repo>
- - GO_REPO_NAMESPACE=${GO_REPO_FULLNAME%/*}
+  - GO_REPO_NAMESPACE=${GO_REPO_FULLNAME%/*}
-   # relies on GOPATH to contain only one directory...
+  # relies on GOPATH to contain only one directory...
- - mkdir -p ${GOPATH}/src/${GO_REPO_NAMESPACE}
+  - mkdir -p ${GOPATH}/src/${GO_REPO_NAMESPACE}
- - ln -sv ${TRAVIS_BUILD_DIR} ${GOPATH}/src/${GO_REPO_FULLNAME}
+  - ln -sv ${TRAVIS_BUILD_DIR} ${GOPATH}/src/${GO_REPO_FULLNAME}
- - cd ${GOPATH}/src/${GO_REPO_FULLNAME}
+  - cd ${GOPATH}/src/${GO_REPO_FULLNAME}
-   # get and build ssdb
+  # get and build ssdb
- - git clone git://github.com/ideawu/ssdb.git
+  - git clone git://github.com/ideawu/ssdb.git
- - cd ssdb
+  - cd ssdb
- - make
+  - make
- - cd ..
+  - cd ..
+  #  - prepare for etcd unit tests
+  - git clone https://github.com/etcd-io/etcd.git
+  - cd etcd
+  - ./build
+  - ./bin/etcd
+  - ./bin/etcdctl put current.float 1.23
+  - ./bin/etcdctl put current.bool true
+  - ./bin/etcdctl put current.int 11
+  - ./bin/etcdctl put current.string hello
+  - ./bin/etcdctl put current.serialize.name test
+  - cd ..
 install:
   - go get github.com/lib/pq
   - go get github.com/go-sql-driver/mysql
@@ -52,6 +65,7 @@ install:
   - go get -u github.com/go-redis/redis
 before_script:
   - psql --version
+  #  - prepare for orm unit tests
   - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi"
   - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then mysql -u root -e 'create database orm_test;'; fi"
   - sh -c "if [ '$ORM_DRIVER' = 'sqlite' ]; then touch $TRAVIS_BUILD_DIR/orm_test.db; fi"

go.mod

@@ -7,6 +7,10 @@ require (
 	github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737
 	github.com/casbin/casbin v1.7.0
 	github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58
+	github.com/coreos/etcd v3.3.25+incompatible
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d
 	github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808 // indirect
 	github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a // indirect
@@ -16,13 +20,17 @@ require (
 	github.com/go-redis/redis v6.14.2+incompatible
 	github.com/go-redis/redis/v7 v7.4.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gogo/protobuf v1.1.1
+	github.com/gogo/protobuf v1.3.1
 	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible
+	github.com/google/go-cmp v0.5.0 // indirect
+	github.com/google/uuid v1.1.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/ledisdb/ledisdb v0.0.0-20200510135210-d35789ec47e6
 	github.com/lib/pq v1.0.0
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
+	github.com/mitchellh/mapstructure v1.3.3
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pelletier/go-toml v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1
@@ -32,9 +40,14 @@ require (
 	github.com/stretchr/testify v1.4.0
 	github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c // indirect
 	github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b // indirect
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
+	go.etcd.io/etcd v3.3.25+incompatible // indirect
+	go.uber.org/zap v1.15.0 // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
+	golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 // indirect
+	golang.org/x/text v0.3.3 // indirect
 	golang.org/x/tools v0.0.0-20200117065230-39095c1d176c
-	google.golang.org/grpc v1.31.0 // indirect
+	google.golang.org/grpc v1.26.0
 	gopkg.in/yaml.v2 v2.2.8
 	honnef.co/go/tools v0.0.1-2020.1.5 // indirect
 )

go.sum

@@ -28,6 +28,15 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/coreos/etcd v0.5.0-alpha.5 h1:0Qi6Jzjk2CDuuGlIeecpu+em2nrjhOgz2wsIwCmQHmc=
+github.com/coreos/etcd v3.3.25+incompatible h1:0GQEw6h3YnuOVdtwygkIfJ+Omx0tZ8/QkVyXI4LkbeY=
+github.com/coreos/etcd v3.3.25+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
+github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d h1:OMrhQqj1QCyDT2sxHCDjE+k8aMdn2ngTCGG7g4wrdLo=
 github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
 github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808 h1:8s2l8TVUwMXl6tZMe3+hPCRJ25nQXiA3d1x622JtOqc=
@@ -46,6 +55,7 @@ github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox
 github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
@@ -69,6 +79,8 @@ github.com/go-yaml/yaml v0.0.0-20180328195020-5420a8b6744d h1:xy93KVe+KrIIwWDEAf
 github.com/go-yaml/yaml v0.0.0-20180328195020-5420a8b6744d/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -80,6 +92,7 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -92,8 +105,13 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
@@ -101,6 +119,7 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
@@ -117,6 +136,8 @@ github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJK
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
+github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -187,6 +208,16 @@ github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b h1:0Ve0/CCjiAiyKddUM
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=
+go.etcd.io/etcd v0.5.0-alpha.5 h1:VOolFSo3XgsmnYDLozjvZ6JL6AAwIDu1Yx1y+4EYLDo=
+go.etcd.io/etcd v3.3.25+incompatible h1:V1RzkZJj9LqsJRy+TUBgpWSbZXITLB819lstuTFoZOY=
+go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
+go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=
+go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -198,6 +229,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
@@ -216,6 +248,8 @@ golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -236,15 +270,23 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM/fAoGlaiiHYiFYdm80=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4=
+golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200117065230-39095c1d176c h1:FodBYPZKH5tAN2O60HlglMwXGAeV/4k+NKbli79M/2c=
@@ -260,19 +302,34 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 h1:PDIOdWxZ8eRizhKa1AAvY53xsvLB1cWorMjslvY3VA8=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1 h1:SfXqXS5hkufcdZ/mHtYCh53P2b+92WQq/DZcKLgsFRs=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -293,5 +350,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k=
 honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=

pkg/client/orm/cmd_utils.go

@@ -69,7 +69,7 @@ checkColumn:
 		// the precision of sqlite is not implemented
 		if al.Driver == 2 || fi.timePrecision == nil {
 			col = T["time.Time"]
-		}else {
+		} else {
 			s := T["time.Time-precision"]
 			col = fmt.Sprintf(s, *fi.timePrecision)
 		}

pkg/client/orm/models_test.go

@@ -243,7 +243,7 @@ type UserBig struct {
 }
 
 type TM struct {
-	ID            int      `orm:"column(id)"`
+	ID           int       `orm:"column(id)"`
 	TMPrecision1 time.Time `orm:"type(datetime);precision(3)"`
 	TMPrecision2 time.Time `orm:"auto_now_add;type(datetime);precision(4)"`
 }

pkg/infrastructure/config/base_config_test.go

@@ -15,6 +15,7 @@
 package config
 
 import (
+	"context"
 	"errors"
 	"testing"
 
@@ -59,7 +60,7 @@ func TestBaseConfiger_DefaultStrings(t *testing.T) {
 
 func newBaseConfier(str1 string) *BaseConfiger {
 	return &BaseConfiger{
-		reader: func(key string) (string, error) {
+		reader: func(ctx context.Context, key string) (string, error) {
 			if key == "key1" {
 				return str1, nil
 			} else {

pkg/infrastructure/config/config.go

@@ -41,6 +41,7 @@
 package config
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -56,9 +57,9 @@ type Configer interface {
 	Set(key, val string) error
 
 	// support section::key type in key string when using ini and json type; Int,Int64,Bool,Float,DIY are same.
-	String(key string) string
+	String(key string) (string, error)
 	// get string slice
-	Strings(key string) []string
+	Strings(key string) ([]string, error)
 	Int(key string) (int, error)
 	Int64(key string) (int64, error)
 	Bool(key string) (bool, error)
@@ -72,11 +73,13 @@ type Configer interface {
 	DefaultBool(key string, defaultVal bool) bool
 	DefaultFloat(key string, defaultVal float64) float64
 	DIY(key string) (interface{}, error)
-	GetSection(section string) (map[string]string, error)
 
-	Unmarshaler(obj interface{}) error
+	GetSection(section string) (map[string]string, error)
+	GetSectionWithCtx(ctx context.Context, section string) (map[string]string, error)
+
+	Unmarshaler(ctx context.Context, prefix string, obj interface{}, opt ...DecodeOption) error
 	Sub(key string) (Configer, error)
-	OnChange(fn func(cfg Configer))
+	OnChange(ctx context.Context, key string, fn func(value string))
 	// GetByPrefix(prefix string) ([]byte, error)
 	// GetSerializer() Serializer
 	SaveConfigFile(filename string) error
@@ -84,11 +87,17 @@ type Configer interface {
 
 type BaseConfiger struct {
 	// The reader should support key like "a.b.c"
-	reader func(key string) (string, error)
+	reader func(ctx context.Context, key string) (string, error)
+}
+
+func NewBaseConfiger(reader func(ctx context.Context, key string) (string, error)) BaseConfiger {
+	return BaseConfiger{
+		reader: reader,
+	}
 }
 
 func (c *BaseConfiger) Int(key string) (int, error) {
-	res, err := c.reader(key)
+	res, err := c.reader(context.TODO(), key)
 	if err != nil {
 		return 0, err
 	}
@@ -96,7 +105,7 @@ func (c *BaseConfiger) Int(key string) (int, error) {
 }
 
 func (c *BaseConfiger) Int64(key string) (int64, error) {
-	res, err := c.reader(key)
+	res, err := c.reader(context.TODO(), key)
 	if err != nil {
 		return 0, err
 	}
@@ -104,30 +113,34 @@ func (c *BaseConfiger) Int64(key string) (int64, error) {
 }
 
 func (c *BaseConfiger) Bool(key string) (bool, error) {
-	res, err := c.reader(key)
+	res, err := c.reader(context.TODO(), key)
 	if err != nil {
 		return false, err
 	}
-	return strconv.ParseBool(res)
+	return ParseBool(res)
 }
 
 func (c *BaseConfiger) Float(key string) (float64, error) {
-	res, err := c.reader(key)
+	res, err := c.reader(context.TODO(), key)
 	if err != nil {
 		return 0, err
 	}
 	return strconv.ParseFloat(res, 64)
 }
 
+// DefaultString returns the string value for a given key.
+// if err != nil or value is empty return defaultval
 func (c *BaseConfiger) DefaultString(key string, defaultVal string) string {
-	if res := c.String(key); res != "" {
+	if res, err := c.String(key); res != "" && err != nil {
 		return res
 	}
 	return defaultVal
 }
 
+// DefaultStrings returns the []string value for a given key.
+// if err != nil return defaultval
 func (c *BaseConfiger) DefaultStrings(key string, defaultVal []string) []string {
-	if res := c.Strings(key); len(res) > 0 {
+	if res, err := c.Strings(key); len(res) > 0 && err != nil {
 		return res
 	}
 	return defaultVal
@@ -160,21 +173,27 @@ func (c *BaseConfiger) DefaultFloat(key string, defaultVal float64) float64 {
 	return defaultVal
 }
 
-func (c *BaseConfiger) String(key string) string {
+func (c *BaseConfiger) GetSectionWithCtx(ctx context.Context, section string) (map[string]string, error) {
-	res, _ := c.reader(key)
+	// TODO
-	return res
+	return nil, nil
 }
 
-func (c *BaseConfiger) Strings(key string) []string {
+func (c *BaseConfiger) String(key string) (string, error) {
-	res, err := c.reader(key)
+	return c.reader(context.TODO(), key)
+}
+
+// Strings returns the []string value for a given key.
+// Return nil if config value does not exist or is empty.
+func (c *BaseConfiger) Strings(key string) ([]string, error) {
+	res, err := c.String(key)
 	if err != nil || res == "" {
-		return nil
+		return nil, err
 	}
-	return strings.Split(res, ";")
+	return strings.Split(res, ";"), nil
 }
 
 // TODO remove this before release v2.0.0
-func (c *BaseConfiger) Unmarshaler(obj interface{}) error {
+func (c *BaseConfiger) Unmarshaler(ctx context.Context, prefix string, obj interface{}, opt ...DecodeOption) error {
 	return errors.New("unsupported operation")
 }
 
@@ -184,7 +203,7 @@ func (c *BaseConfiger) Sub(key string) (Configer, error) {
 }
 
 // TODO remove this before release v2.0.0
-func (c *BaseConfiger) OnChange(fn func(cfg Configer)) {
+func (c *BaseConfiger) OnChange(ctx context.Context, key string, fn func(value string)) {
 	// do nothing
 }
 
@@ -361,3 +380,8 @@ func ToString(x interface{}) string {
 	// Fallback to fmt package for anything else like numeric types
 	return fmt.Sprint(x)
 }
+
+type DecodeOption func(options decodeOptions)
+
+type decodeOptions struct {
+}

pkg/infrastructure/config/etcd/config.go

@@ -0,0 +1,219 @@
+// Copyright 2020
+//
+// Licensed 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.
+
+package etcd
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/coreos/etcd/clientv3"
+	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
+	"github.com/mitchellh/mapstructure"
+	"github.com/pkg/errors"
+	"google.golang.org/grpc"
+
+	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/infrastructure/logs"
+)
+
+const etcdOpts = "etcdOpts"
+
+type EtcdConfiger struct {
+	prefix string
+	client *clientv3.Client
+	config.BaseConfiger
+}
+
+func newEtcdConfiger(client *clientv3.Client, prefix string) *EtcdConfiger {
+	res := &EtcdConfiger{
+		client: client,
+		prefix: prefix,
+	}
+
+	res.BaseConfiger = config.NewBaseConfiger(res.reader)
+	return res
+}
+
+// reader is an general implementation that read config from etcd.
+func (e *EtcdConfiger) reader(ctx context.Context, key string) (string, error) {
+	resp, err := get(e.client, ctx, e.prefix+key)
+	if err != nil {
+		return "", err
+	}
+
+	if resp.Count > 0 {
+		return string(resp.Kvs[0].Value), nil
+	}
+
+	return "", nil
+}
+
+// Set do nothing and return an error
+// I think write data to remote config center is not a good practice
+func (e *EtcdConfiger) Set(key, val string) error {
+	return errors.New("Unsupported operation")
+}
+
+// DIY return the original response from etcd
+// be careful when you decide to use this
+func (e *EtcdConfiger) DIY(key string) (interface{}, error) {
+	return get(e.client, context.TODO(), key)
+}
+
+// GetSection in this implementation, we use section as prefix
+func (e *EtcdConfiger) GetSection(section string) (map[string]string, error) {
+	return e.GetSectionWithCtx(context.Background(), section)
+}
+
+func (e *EtcdConfiger) GetSectionWithCtx(ctx context.Context, section string) (map[string]string, error) {
+
+	var (
+		resp *clientv3.GetResponse
+		err  error
+	)
+
+	if opts, ok := ctx.Value(etcdOpts).([]clientv3.OpOption); ok {
+		opts = append(opts, clientv3.WithPrefix())
+		resp, err = e.client.Get(context.TODO(), e.prefix+section, opts...)
+	} else {
+		resp, err = e.client.Get(context.TODO(), e.prefix+section, clientv3.WithPrefix())
+	}
+
+	if err != nil {
+		return nil, errors.WithMessage(err, "GetSection failed")
+	}
+	res := make(map[string]string, len(resp.Kvs))
+	for _, kv := range resp.Kvs {
+		res[string(kv.Key)] = string(kv.Value)
+	}
+	return res, nil
+}
+
+func (e *EtcdConfiger) SaveConfigFile(filename string) error {
+	return errors.New("Unsupported operation")
+}
+
+// Unmarshaler is not very powerful because we lost the type information when we get configuration from etcd
+// for example, when we got "5", we are not sure whether it's int 5, or it's string "5"
+// TODO(support more complicated decoder)
+func (e *EtcdConfiger) Unmarshaler(ctx context.Context, prefix string, obj interface{}, opt ...config.DecodeOption) error {
+	res, err := e.GetSectionWithCtx(ctx, prefix)
+	if err != nil {
+		return errors.WithMessage(err, fmt.Sprintf("could not read config with prefix: %s", prefix))
+	}
+
+	prefixLen := len(e.prefix + prefix)
+	m := make(map[string]string, len(res))
+	for k, v := range res {
+		m[k[prefixLen:]] = v
+	}
+	return mapstructure.Decode(m, obj)
+}
+
+// Sub return an sub configer.
+func (e *EtcdConfiger) Sub(key string) (config.Configer, error) {
+	return newEtcdConfiger(e.client, e.prefix+key), nil
+}
+
+// TODO remove this before release v2.0.0
+func (e *EtcdConfiger) OnChange(ctx context.Context, key string, fn func(value string)) {
+
+	buildOptsFunc := func() []clientv3.OpOption {
+		if opts, ok := ctx.Value(etcdOpts).([]clientv3.OpOption); ok {
+			opts = append(opts, clientv3.WithCreatedNotify())
+			return opts
+		}
+		return []clientv3.OpOption{}
+	}
+
+	rch := e.client.Watch(ctx, e.prefix+key, buildOptsFunc()...)
+	go func() {
+		for {
+			for resp := range rch {
+				if err := resp.Err(); err != nil {
+					logs.Error("listen to key but got error callback", err)
+					break
+				}
+
+				for _, e := range resp.Events {
+					if e.Kv == nil {
+						continue
+					}
+					fn(string(e.Kv.Value))
+				}
+			}
+			time.Sleep(time.Second)
+			rch = e.client.Watch(ctx, e.prefix+key, buildOptsFunc()...)
+		}
+	}()
+
+}
+
+type EtcdConfigerProvider struct {
+}
+
+// Parse = ParseData([]byte(key))
+// key must be json
+func (provider *EtcdConfigerProvider) Parse(key string) (config.Configer, error) {
+	return provider.ParseData([]byte(key))
+}
+
+// ParseData try to parse key as clientv3.Config, using this to build etcdClient
+func (provider *EtcdConfigerProvider) ParseData(data []byte) (config.Configer, error) {
+	cfg := &clientv3.Config{}
+	err := json.Unmarshal(data, cfg)
+	if err != nil {
+		return nil, errors.WithMessage(err, "parse data to etcd config failed, please check your input")
+	}
+
+	cfg.DialOptions = []grpc.DialOption{
+		grpc.WithBlock(),
+		grpc.WithUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor),
+		grpc.WithStreamInterceptor(grpc_prometheus.StreamClientInterceptor),
+	}
+	client, err := clientv3.New(*cfg)
+	if err != nil {
+		return nil, errors.WithMessage(err, "create etcd client failed")
+	}
+
+	return newEtcdConfiger(client, ""), nil
+}
+
+func get(client *clientv3.Client, ctx context.Context, key string) (*clientv3.GetResponse, error) {
+	var (
+		resp *clientv3.GetResponse
+		err  error
+	)
+	if opts, ok := ctx.Value(etcdOpts).([]clientv3.OpOption); ok {
+		resp, err = client.Get(ctx, key, opts...)
+	} else {
+		resp, err = client.Get(ctx, key)
+	}
+
+	if err != nil {
+		return nil, errors.WithMessage(err, fmt.Sprintf("read config from etcd with key %s failed", key))
+	}
+	return resp, err
+}
+
+func WithEtcdOption(ctx context.Context, opts ...clientv3.OpOption) context.Context {
+	return context.WithValue(ctx, etcdOpts, opts)
+}
+
+func init() {
+	config.Register("json", &EtcdConfigerProvider{})
+}

pkg/infrastructure/config/etcd/config_test.go

@@ -0,0 +1,123 @@
+// Copyright 2020
+//
+// Licensed 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.
+
+package etcd
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/coreos/etcd/clientv3"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestWithEtcdOption(t *testing.T) {
+	ctx := WithEtcdOption(context.Background(), clientv3.WithPrefix())
+	assert.NotNil(t, ctx.Value(etcdOpts))
+}
+
+func TestEtcdConfigerProvider_Parse(t *testing.T) {
+	provider := &EtcdConfigerProvider{}
+	cfger, err := provider.Parse(readEtcdConfig())
+	assert.Nil(t, err)
+	assert.NotNil(t, cfger)
+}
+
+func TestEtcdConfiger(t *testing.T) {
+
+	provider := &EtcdConfigerProvider{}
+	cfger, _ := provider.Parse(readEtcdConfig())
+
+	subCfger, err := cfger.Sub("sub.")
+	assert.Nil(t, err)
+	assert.NotNil(t, subCfger)
+
+	subSubCfger, err := subCfger.Sub("sub.")
+	assert.NotNil(t, subSubCfger)
+	assert.Nil(t, err)
+
+	str, err := subSubCfger.String("key1")
+	assert.Nil(t, err)
+	assert.Equal(t, "sub.sub.key", str)
+
+	// we cannot test it
+	subSubCfger.OnChange(context.Background(), "watch", func(value string) {
+		// do nothing
+	})
+
+	defStr := cfger.DefaultString("not_exit", "default value")
+	assert.Equal(t, "default value", defStr)
+
+	defInt64 := cfger.DefaultInt64("not_exit", -1)
+	assert.Equal(t, int64(-1), defInt64)
+
+	defInt := cfger.DefaultInt("not_exit", -2)
+	assert.Equal(t, -2, defInt)
+
+	defFlt := cfger.DefaultFloat("not_exit", 12.3)
+	assert.Equal(t, 12.3, defFlt)
+
+	defBl := cfger.DefaultBool("not_exit", true)
+	assert.True(t, defBl)
+
+	defStrs := cfger.DefaultStrings("not_exit", []string{"hello"})
+	assert.Equal(t, []string{"hello"}, defStrs)
+
+	fl, err := cfger.Float("current.float")
+	assert.Nil(t, err)
+	assert.Equal(t, 1.23, fl)
+
+	bl, err := cfger.Bool("current.bool")
+	assert.Nil(t, err)
+	assert.True(t, bl)
+
+	it, err := cfger.Int("current.int")
+	assert.Nil(t, err)
+	assert.Equal(t, 11, it)
+
+	str, err = cfger.String("current.string")
+	assert.Nil(t, err)
+	assert.Equal(t, "hello", str)
+
+	tn := &TestEntity{}
+	err = cfger.Unmarshaler(context.Background(), "current.serialize.", tn)
+	assert.Nil(t, err)
+	assert.Equal(t, "test", tn.Name)
+}
+
+type TestEntity struct {
+	Name string    `yaml:"name"`
+	Sub  SubEntity `yaml:"sub"`
+}
+
+type SubEntity struct {
+	SubName string `yaml:"subName"`
+}
+
+func readEtcdConfig() string {
+	addr := os.Getenv("ETCD_ADDR")
+	if addr == "" {
+		addr = "localhost:2379"
+	}
+
+	obj := clientv3.Config{
+		Endpoints:   []string{addr},
+		DialTimeout: 3 * time.Second,
+	}
+	cfg, _ := json.Marshal(obj)
+	return string(cfg)
+}

pkg/infrastructure/config/fake.go

@@ -15,6 +15,7 @@
 package config
 
 import (
+	"context"
 	"errors"
 	"strconv"
 	"strings"
@@ -34,34 +35,6 @@ func (c *fakeConfigContainer) Set(key, val string) error {
 	return nil
 }
 
-func (c *fakeConfigContainer) String(key string) string {
-	return c.getData(key)
-}
-
-func (c *fakeConfigContainer) DefaultString(key string, defaultval string) string {
-	v := c.String(key)
-	if v == "" {
-		return defaultval
-	}
-	return v
-}
-
-func (c *fakeConfigContainer) Strings(key string) []string {
-	v := c.String(key)
-	if v == "" {
-		return nil
-	}
-	return strings.Split(v, ";")
-}
-
-func (c *fakeConfigContainer) DefaultStrings(key string, defaultval []string) []string {
-	v := c.Strings(key)
-	if v == nil {
-		return defaultval
-	}
-	return v
-}
-
 func (c *fakeConfigContainer) Int(key string) (int, error) {
 	return strconv.Atoi(c.getData(key))
 }
@@ -129,7 +102,11 @@ var _ Configer = new(fakeConfigContainer)
 
 // NewFakeConfig return a fake Configer
 func NewFakeConfig() Configer {
-	return &fakeConfigContainer{
+	res := &fakeConfigContainer{
 		data: make(map[string]string),
 	}
+	res.BaseConfiger = NewBaseConfiger(func(ctx context.Context, key string) (string, error) {
+		return res.getData(key), nil
+	})
+	return res
 }

pkg/infrastructure/config/ini.go

@@ -17,13 +17,14 @@ package config
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"os/user"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"sync"
 )
@@ -65,6 +66,9 @@ func (ini *IniConfig) parseData(dir string, data []byte) (*IniConfigContainer, e
 		keyComment:     make(map[string]string),
 		RWMutex:        sync.RWMutex{},
 	}
+	cfg.BaseConfiger = NewBaseConfiger(func(ctx context.Context, key string) (string, error) {
+		return cfg.getdata(key)
+	})
 	cfg.Lock()
 	defer cfg.Unlock()
 
@@ -90,7 +94,7 @@ func (ini *IniConfig) parseData(dir string, data []byte) (*IniConfigContainer, e
 				break
 			}
 
-			//It might be a good idea to throw a error on all unknonw errors?
+			// It might be a good idea to throw a error on all unknonw errors?
 			if _, ok := err.(*os.PathError); ok {
 				return nil, err
 			}
@@ -232,101 +236,6 @@ type IniConfigContainer struct {
 	sync.RWMutex
 }
 
-// Bool returns the boolean value for a given key.
-func (c *IniConfigContainer) Bool(key string) (bool, error) {
-	return ParseBool(c.getdata(key))
-}
-
-// DefaultBool returns the boolean value for a given key.
-// if err != nil return defaultval
-func (c *IniConfigContainer) DefaultBool(key string, defaultval bool) bool {
-	v, err := c.Bool(key)
-	if err != nil {
-		return defaultval
-	}
-	return v
-}
-
-// Int returns the integer value for a given key.
-func (c *IniConfigContainer) Int(key string) (int, error) {
-	return strconv.Atoi(c.getdata(key))
-}
-
-// DefaultInt returns the integer value for a given key.
-// if err != nil return defaultval
-func (c *IniConfigContainer) DefaultInt(key string, defaultval int) int {
-	v, err := c.Int(key)
-	if err != nil {
-		return defaultval
-	}
-	return v
-}
-
-// Int64 returns the int64 value for a given key.
-func (c *IniConfigContainer) Int64(key string) (int64, error) {
-	return strconv.ParseInt(c.getdata(key), 10, 64)
-}
-
-// DefaultInt64 returns the int64 value for a given key.
-// if err != nil return defaultval
-func (c *IniConfigContainer) DefaultInt64(key string, defaultval int64) int64 {
-	v, err := c.Int64(key)
-	if err != nil {
-		return defaultval
-	}
-	return v
-}
-
-// Float returns the float value for a given key.
-func (c *IniConfigContainer) Float(key string) (float64, error) {
-	return strconv.ParseFloat(c.getdata(key), 64)
-}
-
-// DefaultFloat returns the float64 value for a given key.
-// if err != nil return defaultval
-func (c *IniConfigContainer) DefaultFloat(key string, defaultval float64) float64 {
-	v, err := c.Float(key)
-	if err != nil {
-		return defaultval
-	}
-	return v
-}
-
-// String returns the string value for a given key.
-func (c *IniConfigContainer) String(key string) string {
-	return c.getdata(key)
-}
-
-// DefaultString returns the string value for a given key.
-// if err != nil return defaultval
-func (c *IniConfigContainer) DefaultString(key string, defaultval string) string {
-	v := c.String(key)
-	if v == "" {
-		return defaultval
-	}
-	return v
-}
-
-// Strings returns the []string value for a given key.
-// Return nil if config value does not exist or is empty.
-func (c *IniConfigContainer) Strings(key string) []string {
-	v := c.String(key)
-	if v == "" {
-		return nil
-	}
-	return strings.Split(v, ";")
-}
-
-// DefaultStrings returns the []string value for a given key.
-// if err != nil return defaultval
-func (c *IniConfigContainer) DefaultStrings(key string, defaultval []string) []string {
-	v := c.Strings(key)
-	if v == nil {
-		return defaultval
-	}
-	return v
-}
-
 // GetSection returns map for the given section
 func (c *IniConfigContainer) GetSection(section string) (map[string]string, error) {
 	if v, ok := c.data[section]; ok {
@@ -474,9 +383,9 @@ func (c *IniConfigContainer) DIY(key string) (v interface{}, err error) {
 }
 
 // section.key or key
-func (c *IniConfigContainer) getdata(key string) string {
+func (c *IniConfigContainer) getdata(key string) (string, error) {
 	if len(key) == 0 {
-		return ""
+		return "", errors.New("the key is empty")
 	}
 	c.RLock()
 	defer c.RUnlock()
@@ -494,10 +403,10 @@ func (c *IniConfigContainer) getdata(key string) string {
 	}
 	if v, ok := c.data[section]; ok {
 		if vv, ok := v[k]; ok {
-			return vv
+			return vv, nil
 		}
 	}
-	return ""
+	return "", errors.New(fmt.Sprintf("config not found: %s", key))
 }
 
 func init() {

pkg/infrastructure/config/ini_test.go

@@ -109,9 +109,9 @@ password = ${GOPATH}
 		case bool:
 			value, err = iniconf.Bool(k)
 		case []string:
-			value = iniconf.Strings(k)
+			value, err = iniconf.Strings(k)
 		case string:
-			value = iniconf.String(k)
+			value, err = iniconf.String(k)
 		default:
 			value, err = iniconf.DIY(k)
 		}
@@ -125,7 +125,8 @@ password = ${GOPATH}
 	if err = iniconf.Set("name", "astaxie"); err != nil {
 		t.Fatal(err)
 	}
-	if iniconf.String("name") != "astaxie" {
+	res, _ := iniconf.String("name")
+	if res != "astaxie" {
 		t.Fatal("get name error")
 	}
 

pkg/infrastructure/config/json/json.go

@@ -158,42 +158,14 @@ func (c *JSONConfigContainer) DefaultFloat(key string, defaultval float64) float
 }
 
 // String returns the string value for a given key.
-func (c *JSONConfigContainer) String(key string) string {
+func (c *JSONConfigContainer) String(key string) (string, error) {
 	val := c.getData(key)
 	if val != nil {
 		if v, ok := val.(string); ok {
-			return v
+			return v, nil
 		}
 	}
-	return ""
+	return "", errors.New(fmt.Sprintf("config not found or is not string, key: %s", key))
-}
-
-// DefaultString returns the string value for a given key.
-// if err != nil return defaultval
-func (c *JSONConfigContainer) DefaultString(key string, defaultval string) string {
-	// TODO FIXME should not use "" to replace non existence
-	if v := c.String(key); v != "" {
-		return v
-	}
-	return defaultval
-}
-
-// Strings returns the []string value for a given key.
-func (c *JSONConfigContainer) Strings(key string) []string {
-	stringVal := c.String(key)
-	if stringVal == "" {
-		return nil
-	}
-	return strings.Split(c.String(key), ";")
-}
-
-// DefaultStrings returns the []string value for a given key.
-// if err != nil return defaultval
-func (c *JSONConfigContainer) DefaultStrings(key string, defaultval []string) []string {
-	if v := c.Strings(key); v != nil {
-		return v
-	}
-	return defaultval
 }
 
 // GetSection returns map for the given section

pkg/infrastructure/config/json/json_test.go

@@ -163,9 +163,9 @@ func TestJson(t *testing.T) {
 		case bool:
 			value, err = jsonconf.Bool(k)
 		case []string:
-			value = jsonconf.Strings(k)
+			value, err = jsonconf.Strings(k)
 		case string:
-			value = jsonconf.String(k)
+			value, err = jsonconf.String(k)
 		default:
 			value, err = jsonconf.DIY(k)
 		}
@@ -179,7 +179,9 @@ func TestJson(t *testing.T) {
 	if err = jsonconf.Set("name", "astaxie"); err != nil {
 		t.Fatal(err)
 	}
-	if jsonconf.String("name") != "astaxie" {
+
+	res, _ := jsonconf.String("name")
+	if res != "astaxie" {
 		t.Fatal("get name error")
 	}
 
@@ -210,7 +212,7 @@ func TestJson(t *testing.T) {
 		t.Error("unknown keys should return an error when expecting an interface{}")
 	}
 
-	if val := jsonconf.String("unknown"); val != "" {
+	if val, _ := jsonconf.String("unknown"); val != "" {
 		t.Error("unknown keys should return an empty string when expecting a String")
 	}
 

pkg/infrastructure/config/xml/xml.go

@@ -26,7 +26,7 @@
 //
 //  cnf, err := config.NewConfig("xml", "config.xml")
 //
-//More docs http://beego.me/docs/module/config.md
+// More docs http://beego.me/docs/module/config.md
 package xml
 
 import (
@@ -36,11 +36,11 @@ import (
 	"io/ioutil"
 	"os"
 	"strconv"
-	"strings"
 	"sync"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
 	"github.com/beego/x2j"
+
+	"github.com/astaxie/beego/pkg/infrastructure/config"
 )
 
 // Config is a xml config parser and implements Config interface.
@@ -144,37 +144,18 @@ func (c *ConfigContainer) DefaultFloat(key string, defaultval float64) float64 {
 }
 
 // String returns the string value for a given key.
-func (c *ConfigContainer) String(key string) string {
+func (c *ConfigContainer) String(key string) (string, error) {
 	if v, ok := c.data[key].(string); ok {
-		return v
+		return v, nil
 	}
-	return ""
+	return "", errors.New(fmt.Sprintf("configuration not found or not string, key: %s", key))
 }
 
 // DefaultString returns the string value for a given key.
 // if err != nil return defaultval
 func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
-	v := c.String(key)
+	v, err := c.String(key)
-	if v == "" {
+	if v == "" || err != nil {
-		return defaultval
-	}
-	return v
-}
-
-// Strings returns the []string value for a given key.
-func (c *ConfigContainer) Strings(key string) []string {
-	v := c.String(key)
-	if v == "" {
-		return nil
-	}
-	return strings.Split(v, ";")
-}
-
-// DefaultStrings returns the []string value for a given key.
-// if err != nil return defaultval
-func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string {
-	v := c.Strings(key)
-	if v == nil {
 		return defaultval
 	}
 	return v

pkg/infrastructure/config/xml/xml_test.go

@@ -25,7 +25,7 @@ import (
 func TestXML(t *testing.T) {
 
 	var (
-		//xml parse should incluce in <config></config> tags
+		// xml parse should incluce in <config></config> tags
 		xmlcontext = `<?xml version="1.0" encoding="UTF-8"?>
 <config>
 <appname>beeapi</appname>
@@ -102,9 +102,9 @@ func TestXML(t *testing.T) {
 		case bool:
 			value, err = xmlconf.Bool(k)
 		case []string:
-			value = xmlconf.Strings(k)
+			value, err = xmlconf.Strings(k)
 		case string:
-			value = xmlconf.String(k)
+			value, err = xmlconf.String(k)
 		default:
 			value, err = xmlconf.DIY(k)
 		}
@@ -119,7 +119,9 @@ func TestXML(t *testing.T) {
 	if err = xmlconf.Set("name", "astaxie"); err != nil {
 		t.Fatal(err)
 	}
-	if xmlconf.String("name") != "astaxie" {
+
+	res, _ := xmlconf.String("name")
+	if res != "astaxie" {
 		t.Fatal("get name error")
 	}
 }

pkg/infrastructure/config/yaml/yaml.go

@@ -26,7 +26,7 @@
 //
 //  cnf, err := config.NewConfig("yaml", "config.yaml")
 //
-//More docs http://beego.me/docs/module/config.md
+// More docs http://beego.me/docs/module/config.md
 package yaml
 
 import (
@@ -40,8 +40,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
 	"github.com/beego/goyaml2"
+
+	"github.com/astaxie/beego/pkg/infrastructure/config"
 )
 
 // Config is a yaml config parser and implements Config interface.
@@ -209,39 +210,41 @@ func (c *ConfigContainer) DefaultFloat(key string, defaultval float64) float64 {
 }
 
 // String returns the string value for a given key.
-func (c *ConfigContainer) String(key string) string {
+func (c *ConfigContainer) String(key string) (string, error) {
 	if v, err := c.getData(key); err == nil {
 		if vv, ok := v.(string); ok {
-			return vv
+			return vv, nil
+		} else {
+			return "", errors.New(fmt.Sprintf("the value is not string, key: %s, value: %v", key, v))
 		}
 	}
-	return ""
+	return "", errors.New(fmt.Sprintf("configuration not found, key: %s", key))
 }
 
 // DefaultString returns the string value for a given key.
 // if err != nil return defaultval
 func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
-	v := c.String(key)
+	v, err := c.String(key)
-	if v == "" {
+	if v == "" || err != nil {
 		return defaultval
 	}
 	return v
 }
 
 // Strings returns the []string value for a given key.
-func (c *ConfigContainer) Strings(key string) []string {
+func (c *ConfigContainer) Strings(key string) ([]string, error) {
-	v := c.String(key)
+	v, err := c.String(key)
-	if v == "" {
+	if v == "" || err != nil {
-		return nil
+		return nil, err
 	}
-	return strings.Split(v, ";")
+	return strings.Split(v, ";"), nil
 }
 
 // DefaultStrings returns the []string value for a given key.
 // if err != nil return defaultval
 func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string {
-	v := c.Strings(key)
+	v, err := c.Strings(key)
-	if v == nil {
+	if v == nil || err != nil {
 		return defaultval
 	}
 	return v

pkg/infrastructure/config/yaml/yaml_test.go

@@ -70,7 +70,8 @@ func TestYaml(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if yamlconf.String("appname") != "beeapi" {
+	res, _ := yamlconf.String("appname")
+	if res != "beeapi" {
 		t.Fatal("appname not equal to beeapi")
 	}
 
@@ -91,9 +92,9 @@ func TestYaml(t *testing.T) {
 		case bool:
 			value, err = yamlconf.Bool(k)
 		case []string:
-			value = yamlconf.Strings(k)
+			value, err = yamlconf.Strings(k)
 		case string:
-			value = yamlconf.String(k)
+			value, err = yamlconf.String(k)
 		default:
 			value, err = yamlconf.DIY(k)
 		}
@@ -108,7 +109,8 @@ func TestYaml(t *testing.T) {
 	if err = yamlconf.Set("name", "astaxie"); err != nil {
 		t.Fatal(err)
 	}
-	if yamlconf.String("name") != "astaxie" {
+	res, _ = yamlconf.String("name")
+	if res != "astaxie" {
 		t.Fatal("get name error")
 	}
 

scripts/prepare_etcd.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+etcdctl put current.float 1.23
+etcdctl put current.bool true
+etcdctl put current.int 11
+etcdctl put current.string hello
+etcdctl put current.serialize.name test

scripts/test_docker_compose.yaml

@@ -36,4 +36,20 @@ services:
     image: memcached
     ports:
     - "11211:11211"
-
+  etcd:
+    command: >
+      sh -c "
+      etcdctl put current.float 1.23
+      && etcdctl put current.bool true
+      && etcdctl put current.int 11
+      && etcdctl put current.string hello
+      && etcdctl put current.serialize.name test
+      "
+    container_name: "beego-etcd"
+    environment:
+      - ALLOW_NONE_AUTHENTICATION=yes
+#      - ETCD_ADVERTISE_CLIENT_URLS=http://etcd:2379
+    image: bitnami/etcd
+    ports:
+    - "2379:2379"
+    - "2380:2380"