diff --git a/CHANGE.md b/CHANGE.md
index ea2fe351cfffb81e0f89f340f402ce218b32fbf1..ad8bc594cd92ea0c72a284a262cc0cb3630cbeac 100644
--- a/CHANGE.md
+++ b/CHANGE.md
@@ -1,6 +1,34 @@
# Release Notes
---
+## 1.4.0
+### New Features
+
+- [Condition router](https://github.com/apache/dubbo-go/pull/294)
+- [Context support](https://github.com/apache/dubbo-go/pull/330)
+- [Opentracing & transfer context end to end for jsonrpc protocol](https://github.com/apache/dubbo-go/pull/335)
+- [Opentracing & transfer context end to end for dubbo protocol](https://github.com/apache/dubbo-go/pull/344)
+- [Nacos config center](https://github.com/apache/dubbo-go/pull/357)
+- [Prometheus support](https://github.com/apache/dubbo-go/pull/342)
+- [Support sign and auth for request](https://github.com/apache/dubbo-go/pull/323)
+- [Healthy instance first router](https://github.com/apache/dubbo-go/pull/389)
+- [User can add attachments for dubbo protocol](https://github.com/apache/dubbo-go/pull/398)
+- [K8s as registry](https://github.com/apache/dubbo-go/pull/400)
+- [Rest protocol](https://github.com/apache/dubbo-go/pull/352)
+
+### Enhancement
+
+- [Reduce the scope of lock in zk listener](https://github.com/apache/dubbo-go/pull/346)
+- [Trace error of getGettyRpcClient](https://github.com/apache/dubbo-go/pull/384)
+- [Refactor to add base_registry](https://github.com/apache/dubbo-go/pull/348)
+- [Do not listen to directory event if zkPath ends with providers/ or consumers/](https://github.com/apache/dubbo-go/pull/359)
+
+### Bugfixes
+
+- [Handle the panic when invoker was destroyed](https://github.com/apache/dubbo-go/pull/358)
+- [HessianCodec failed to check package header length](https://github.com/apache/dubbo-go/pull/381)
+
+
## 1.3.0
### New Features
diff --git a/README.md b/README.md
index 2975ce9de0236a0274b378ffac0bd1d301907452..e43b1e9aed6b82b2e367edf43728aee24a521d68 100644
--- a/README.md
+++ b/README.md
@@ -52,16 +52,22 @@ Finished List:
* Dubbo
* Jsonrpc2.0
* [gRPC](https://github.com/apache/dubbo-go/pull/311)
+ * [RESTful](https://github.com/apache/dubbo-go/pull/352)
+
+- Router
+ * [Condition router](https://github.com/apache/dubbo-go/pull/294)
- Registry
* ZooKeeper
* [etcd v3](https://github.com/apache/dubbo-go/pull/148)
* [nacos](https://github.com/apache/dubbo-go/pull/151)
* [consul](https://github.com/apache/dubbo-go/pull/121)
+ * [k8s](https://github.com/apache/dubbo-go/pull/400)
- Dynamic Configure Center & Service Management Configurator
* Zookeeper
* [apollo](https://github.com/apache/dubbo-go/pull/250)
+ * [nacos](https://github.com/apache/dubbo-go/pull/357)
- Cluster Strategy
* Failover
@@ -88,6 +94,10 @@ Finished List:
- Invoke
* [generic invoke](https://github.com/apache/dubbo-go/pull/122)
+
+- Monitor
+ * Opentracing API
+ * Prometheus
- Others:
* start check
@@ -99,13 +109,12 @@ Finished List:
Working List:
-- Registry: k8s
- Metadata Center (dubbo v2.7.x)
-- Metrics: Opentracing/Promethus(dubbo v2.7.x)
+- Service Discovery (dubbo v2.7.x)
You can know more about dubbo-go by its [roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap).
-
+
## Document
diff --git a/README_CN.md b/README_CN.md
index 62c5b06575343474636906c3aee57c643cc9d5d2..e70e6786313d6a012f377f2e349880740b30c50b 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -51,16 +51,22 @@ Apache License, Version 2.0
* Dubbo
* Jsonrpc2.0
* [gRPC](https://github.com/apache/dubbo-go/pull/311)
-
+ * [RESTful](https://github.com/apache/dubbo-go/pull/352)
+
+- 路由器
+ * [Condition router](https://github.com/apache/dubbo-go/pull/294)
+
- 注册中心
* ZooKeeper
* [etcd v3](https://github.com/apache/dubbo-go/pull/148)
* [nacos](https://github.com/apache/dubbo-go/pull/151)
* [consul](https://github.com/apache/dubbo-go/pull/121)
+ * [k8s](https://github.com/apache/dubbo-go/pull/400)
- 动态配置中心与服务治理配置器
* Zookeeper
* [apollo](https://github.com/apache/dubbo-go/pull/250)
+ * [nacos](https://github.com/apache/dubbo-go/pull/357)
- 集群策略
* Failover
@@ -86,6 +92,10 @@ Apache License, Version 2.0
- 调用
* [泛化调用](https://github.com/apache/dubbo-go/pull/122)
+
+- 监控
+ * Opentracing API
+ * Prometheus
- 其他功能支持:
* 启动时检查
@@ -97,13 +107,12 @@ Apache License, Version 2.0
开发中列表:
-- 注册中心: k8s
- 元数据中心 (dubbo v2.7.x)
-- Metrics: Opentracing/Promethus(dubbo v2.7.x)
+- 服务发现 (dubbo v2.7.x)
你可以通过访问 [roadmap](https://github.com/apache/dubbo-go/wiki/Roadmap) 知道更多关于 dubbo-go 的信息。
-
+
## 文档
diff --git a/before_ut.bat b/before_ut.bat
index abe7fc250ef44bf01396ae20c4dacc9db3f60ce2..5e1c877af229b2b30bffc8b802cc35b6aab6c80a 100644
--- a/before_ut.bat
+++ b/before_ut.bat
@@ -14,10 +14,10 @@
:: See the License for the specific language governing permissions and
:: limitations under the License.
-set zkJarName="zookeeper-3.4.9-fatjar.jar"
+set zkJarName=zookeeper-3.4.9-fatjar.jar
set remoteJarUrl="https://github.com/dubbogo/resources/raw/master/zookeeper-4unitest/contrib/fatjar/%zkJarName%"
-set zkJarPath="remoting/zookeeper/zookeeper-4unittest/contrib/fatjar"
-set zkJar="%zkJarPath%/%zkJarName%"
+set zkJarPath=remoting/zookeeper/zookeeper-4unittest/contrib/fatjar
+set zkJar=%zkJarPath%/%zkJarName%
if not exist "%zkJar%" (
md %zkJarPath%
diff --git a/common/constant/default.go b/common/constant/default.go
index 8ed645e84a724531080eff6efe5fdb0df5479e80..3c889158e460031f06b9401008c80f55200a46e4 100644
--- a/common/constant/default.go
+++ b/common/constant/default.go
@@ -41,6 +41,8 @@ const (
DEFAULT_FAILBACK_TIMES = "3"
DEFAULT_FAILBACK_TIMES_INT = 3
DEFAULT_FAILBACK_TASKS = 100
+ DEFAULT_REST_CLIENT = "resty"
+ DEFAULT_REST_SERVER = "go-restful"
)
const (
diff --git a/common/constant/key.go b/common/constant/key.go
index 49306d0e77f57a52e7b54a1a70dce72ae9839169..5769ccfe6c8d2e296de190259d85821dd92dd8f4 100644
--- a/common/constant/key.go
+++ b/common/constant/key.go
@@ -175,21 +175,36 @@ const (
)
const (
- CONSUMER_SIGN_FILTER = "sign"
- PROVIDER_AUTH_FILTER = "auth"
- SERVICE_AUTH_KEY = "auth"
- AUTHENTICATOR_KEY = "authenticator"
- DEFAULT_AUTHENTICATOR = "accesskeys"
- DEFAULT_ACCESS_KEY_STORAGE = "urlstorage"
- ACCESS_KEY_STORAGE_KEY = "accessKey.storage"
- REQUEST_TIMESTAMP_KEY = "timestamp"
- REQUEST_SIGNATURE_KEY = "signature"
- AK_KEY = "ak"
- SIGNATURE_STRING_FORMAT = "%s#%s#%s#%s"
+ // name of consumer sign filter
+ CONSUMER_SIGN_FILTER = "sign"
+ // name of consumer sign filter
+ PROVIDER_AUTH_FILTER = "auth"
+ // name of service filter
+ SERVICE_AUTH_KEY = "auth"
+ // key of authenticator
+ AUTHENTICATOR_KEY = "authenticator"
+ // name of default authenticator
+ DEFAULT_AUTHENTICATOR = "accesskeys"
+ // name of default url storage
+ DEFAULT_ACCESS_KEY_STORAGE = "urlstorage"
+ // key of storage
+ ACCESS_KEY_STORAGE_KEY = "accessKey.storage"
+ // key of request timestamp
+ REQUEST_TIMESTAMP_KEY = "timestamp"
+ // key of request signature
+ REQUEST_SIGNATURE_KEY = "signature"
+ // AK key
+ AK_KEY = "ak"
+ // signature format
+ SIGNATURE_STRING_FORMAT = "%s#%s#%s#%s"
+ // key whether enable signature
PARAMTER_SIGNATURE_ENABLE_KEY = "param.sign"
- CONSUMER = "consumer"
- ACCESS_KEY_ID_KEY = "accessKeyId"
- SECRET_ACCESS_KEY_KEY = "secretAccessKey"
+ // consumer
+ CONSUMER = "consumer"
+ // key of access key id
+ ACCESS_KEY_ID_KEY = "accessKeyId"
+ // key of secret access key
+ SECRET_ACCESS_KEY_KEY = "secretAccessKey"
)
// metadata report
diff --git a/common/constant/time.go b/common/constant/time.go
index be1baaca67f474aa92e86e529d03400948ef4612..3bb339229ba6e7ab470cbe2964312bd8cefa022b 100644
--- a/common/constant/time.go
+++ b/common/constant/time.go
@@ -22,5 +22,7 @@ import (
)
var (
+ // The value will be 10^6
+ // 1ms = 10^6ns
MsToNanoRate = int64(time.Millisecond / time.Nanosecond)
)
diff --git a/common/extension/auth.go b/common/extension/auth.go
index e57e22f660b6d4dec63f8b4a06c25b05bd5c8d72..a35fc509dae5b77a4e80fdd04171f90f337c668b 100644
--- a/common/extension/auth.go
+++ b/common/extension/auth.go
@@ -9,10 +9,13 @@ var (
accesskeyStorages = make(map[string]func() filter.AccessKeyStorage)
)
+// SetAuthenticator put the fcn into map with name
func SetAuthenticator(name string, fcn func() filter.Authenticator) {
authenticators[name] = fcn
}
+// GetAuthenticator find the Authenticator with name
+// if not found, it will panic
func GetAuthenticator(name string) filter.Authenticator {
if authenticators[name] == nil {
panic("authenticator for " + name + " is not existing, make sure you have import the package.")
@@ -20,10 +23,13 @@ func GetAuthenticator(name string) filter.Authenticator {
return authenticators[name]()
}
+// SetAccesskeyStorages will set the fcn into map with this name
func SetAccesskeyStorages(name string, fcn func() filter.AccessKeyStorage) {
accesskeyStorages[name] = fcn
}
+// GetAccesskeyStorages find the storage with the name.
+// If not found, it will panic.
func GetAccesskeyStorages(name string) filter.AccessKeyStorage {
if accesskeyStorages[name] == nil {
panic("accesskeyStorages for " + name + " is not existing, make sure you have import the package.")
diff --git a/common/extension/config_reader.go b/common/extension/config_reader.go
new file mode 100644
index 0000000000000000000000000000000000000000..aced5b0281ff9313461425e5ec6d70d562c6c947
--- /dev/null
+++ b/common/extension/config_reader.go
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 extension
+
+import (
+ "github.com/apache/dubbo-go/config/interfaces"
+)
+
+var (
+ configReaders = make(map[string]func() interfaces.ConfigReader)
+ defaults = make(map[string]string)
+)
+
+// SetConfigReaders set a creator of config reader.
+func SetConfigReaders(name string, v func() interfaces.ConfigReader) {
+ configReaders[name] = v
+}
+
+// GetConfigReaders get a config reader by name.
+func GetConfigReaders(name string) interfaces.ConfigReader {
+ if configReaders[name] == nil {
+ panic("config reader for " + name + " is not existing, make sure you have imported the package.")
+ }
+ return configReaders[name]()
+}
+
+// SetDefaultConfigReader set {name} to default config reader for {module}
+func SetDefaultConfigReader(module, name string) {
+ defaults[module] = name
+}
+
+// GetDefaultConfigReader
+func GetDefaultConfigReader() map[string]string {
+ return defaults
+}
diff --git a/common/extension/rest_client.go b/common/extension/rest_client.go
new file mode 100644
index 0000000000000000000000000000000000000000..514d1fdfd2efb5c291fdb47df4dd69da26fa90b1
--- /dev/null
+++ b/common/extension/rest_client.go
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 extension
+
+import (
+ "github.com/apache/dubbo-go/protocol/rest/client"
+)
+
+var (
+ restClients = make(map[string]func(restOptions *client.RestOptions) client.RestClient, 8)
+)
+
+func SetRestClient(name string, fun func(restOptions *client.RestOptions) client.RestClient) {
+ restClients[name] = fun
+}
+
+func GetNewRestClient(name string, restOptions *client.RestOptions) client.RestClient {
+ if restClients[name] == nil {
+ panic("restClient for " + name + " is not existing, make sure you have import the package.")
+ }
+ return restClients[name](restOptions)
+}
diff --git a/common/extension/rest_server.go b/common/extension/rest_server.go
new file mode 100644
index 0000000000000000000000000000000000000000..fa8d435a5c976a4c95b036810fa2916a327a73b9
--- /dev/null
+++ b/common/extension/rest_server.go
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 extension
+
+import (
+ "github.com/apache/dubbo-go/protocol/rest/server"
+)
+
+var (
+ restServers = make(map[string]func() server.RestServer, 8)
+)
+
+func SetRestServer(name string, fun func() server.RestServer) {
+ restServers[name] = fun
+}
+
+func GetNewRestServer(name string) server.RestServer {
+ if restServers[name] == nil {
+ panic("restServer for " + name + " is not existing, make sure you have import the package.")
+ }
+ return restServers[name]()
+}
diff --git a/common/yaml/testdata/config.yml b/common/yaml/testdata/config.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b5c2ca8ad14310f3a173f0bad9ee25cd65e9a3b3
--- /dev/null
+++ b/common/yaml/testdata/config.yml
@@ -0,0 +1,7 @@
+
+intTest: 11
+booleanTest: false
+strTest: "strTest"
+
+child:
+ strTest: "childStrTest"
\ No newline at end of file
diff --git a/common/yaml/yaml.go b/common/yaml/yaml.go
new file mode 100644
index 0000000000000000000000000000000000000000..7c31d71c35fff547d2ed0a765e8245717148a451
--- /dev/null
+++ b/common/yaml/yaml.go
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 yaml
+
+import (
+ "io/ioutil"
+ "path"
+)
+
+import (
+ perrors "github.com/pkg/errors"
+ "gopkg.in/yaml.v2"
+)
+
+// loadYMLConfig Load yml config byte from file
+func LoadYMLConfig(confProFile string) ([]byte, error) {
+ if len(confProFile) == 0 {
+ return nil, perrors.Errorf("application configure(provider) file name is nil")
+ }
+
+ if path.Ext(confProFile) != ".yml" {
+ return nil, perrors.Errorf("application configure file name{%v} suffix must be .yml", confProFile)
+ }
+
+ return ioutil.ReadFile(confProFile)
+}
+
+// unmarshalYMLConfig Load yml config byte from file , then unmarshal to object
+func UnmarshalYMLConfig(confProFile string, out interface{}) ([]byte, error) {
+ confFileStream, err := LoadYMLConfig(confProFile)
+ if err != nil {
+ return confFileStream, perrors.Errorf("ioutil.ReadFile(file:%s) = error:%v", confProFile, perrors.WithStack(err))
+ }
+ return confFileStream, yaml.Unmarshal(confFileStream, out)
+}
diff --git a/common/yaml/yaml_test.go b/common/yaml/yaml_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..45eee59048c1c074b9c386e26cc7a2252896e6ea
--- /dev/null
+++ b/common/yaml/yaml_test.go
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 yaml
+
+import (
+ "path/filepath"
+ "testing"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+func TestUnmarshalYMLConfig(t *testing.T) {
+ conPath, err := filepath.Abs("./testdata/config.yml")
+ assert.NoError(t, err)
+ c := &Config{}
+ _, err = UnmarshalYMLConfig(conPath, c)
+ assert.NoError(t, err)
+ assert.Equal(t, "strTest", c.StrTest)
+ assert.Equal(t, 11, c.IntTest)
+ assert.Equal(t, false, c.BooleanTest)
+ assert.Equal(t, "childStrTest", c.ChildConfig.StrTest)
+}
+
+func TestUnmarshalYMLConfig_Error(t *testing.T) {
+ c := &Config{}
+ _, err := UnmarshalYMLConfig("./testdata/config", c)
+ assert.Error(t, err)
+ _, err = UnmarshalYMLConfig("", c)
+ assert.Error(t, err)
+}
+
+type Config struct {
+ StrTest string `yaml:"strTest" default:"default" json:"strTest,omitempty" property:"strTest"`
+ IntTest int `default:"109" yaml:"intTest" json:"intTest,omitempty" property:"intTest"`
+ BooleanTest bool `yaml:"booleanTest" default:"true" json:"booleanTest,omitempty"`
+ ChildConfig ChildConfig `yaml:"child" json:"child,omitempty"`
+}
+
+type ChildConfig struct {
+ StrTest string `default:"strTest" default:"default" yaml:"strTest" json:"strTest,omitempty"`
+}
diff --git a/config/base_config.go b/config/base_config.go
index 6d5ec7e2498ba65b2a6833b6c9cefcb3394e60df..93c0ce6a6692193e7ea7b1b9f2f74e9eaed0c858 100644
--- a/config/base_config.go
+++ b/config/base_config.go
@@ -18,8 +18,7 @@
package config
import (
- "io/ioutil"
- "path"
+ "bytes"
"reflect"
"strconv"
"strings"
@@ -27,7 +26,6 @@ import (
import (
perrors "github.com/pkg/errors"
- "gopkg.in/yaml.v2"
)
import (
@@ -50,6 +48,8 @@ type BaseConfig struct {
fatherConfig interface{}
MetricConfig *MetricConfig `yaml:"metrics" json:"metrics,omitempty"`
+
+ fileStream *bytes.Buffer
}
// startConfigCenter will start the config center.
@@ -364,27 +364,4 @@ func initializeStruct(t reflect.Type, v reflect.Value) {
}
}
-
-}
-
-// loadYMLConfig Load yml config byte from file
-func loadYMLConfig(confProFile string) ([]byte, error) {
- if len(confProFile) == 0 {
- return nil, perrors.Errorf("application configure(provider) file name is nil")
- }
-
- if path.Ext(confProFile) != ".yml" {
- return nil, perrors.Errorf("application configure file name{%v} suffix must be .yml", confProFile)
- }
-
- return ioutil.ReadFile(confProFile)
-}
-
-// unmarshalYMLConfig Load yml config byte from file , then unmarshal to object
-func unmarshalYMLConfig(confProFile string, out interface{}) error {
- confFileStream, err := loadYMLConfig(confProFile)
- if err != nil {
- return perrors.Errorf("ioutil.ReadFile(file:%s) = error:%v", confProFile, perrors.WithStack(err))
- }
- return yaml.Unmarshal(confFileStream, out)
}
diff --git a/config/base_config_test.go b/config/base_config_test.go
index 6973a4a18b5e3a78d9039bc818a5a2a046613783..d16b2420922ece60ef2135729cd47d5aa73a3760 100644
--- a/config/base_config_test.go
+++ b/config/base_config_test.go
@@ -18,7 +18,6 @@ package config
import (
"fmt"
- "path/filepath"
"reflect"
"testing"
)
@@ -518,13 +517,3 @@ func Test_initializeStruct(t *testing.T) {
return consumerConfig.References != nil
})
}
-
-func TestUnmarshalYMLConfig(t *testing.T) {
- conPath, err := filepath.Abs("./testdata/consumer_config_with_configcenter.yml")
- assert.NoError(t, err)
- c := &ConsumerConfig{}
- assert.NoError(t, unmarshalYMLConfig(conPath, c))
- assert.Equal(t, "default", c.ProxyFactory)
- assert.Equal(t, "dubbo.properties", c.ConfigCenterConfig.ConfigFile)
- assert.Equal(t, "100ms", c.Connect_Timeout)
-}
diff --git a/config/condition_router_config.go b/config/condition_router_config.go
index a95b2d2b1265a4c069abd8cbc682a9474c15f454..87e835108efd2ccac4f829386ec44a3916339f85 100644
--- a/config/condition_router_config.go
+++ b/config/condition_router_config.go
@@ -25,12 +25,13 @@ import (
"github.com/apache/dubbo-go/cluster/directory"
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/common/yaml"
)
//RouterInit Load config file to init router config
func RouterInit(confRouterFile string) error {
fileRouterFactories := extension.GetFileRouterFactories()
- bytes, err := loadYMLConfig(confRouterFile)
+ bytes, err := yaml.LoadYMLConfig(confRouterFile)
if err != nil {
return perrors.Errorf("ioutil.ReadFile(file:%s) = error:%v", confRouterFile, perrors.WithStack(err))
}
diff --git a/config/config_loader.go b/config/config_loader.go
index 437f4d7323e66afcf62808b3c8d6bf51cc5bce88..c0687d8fc162331afc5098e347d4bbba6a1750c6 100644
--- a/config/config_loader.go
+++ b/config/config_loader.go
@@ -24,9 +24,14 @@ import (
"time"
)
+import (
+ perrors "github.com/pkg/errors"
+)
+
import (
"github.com/apache/dubbo-go/common"
"github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/common/logger"
)
@@ -78,6 +83,7 @@ func checkApplicationName(config *ApplicationConfig) {
// Load Dubbo Init
func Load() {
+
// init router
if confRouterFile != "" {
if errPro := RouterInit(confRouterFile); errPro != nil {
@@ -89,6 +95,18 @@ func Load() {
if consumerConfig == nil {
logger.Warnf("consumerConfig is nil!")
} else {
+ // init other consumer config
+ conConfigType := consumerConfig.ConfigType
+ for key, value := range extension.GetDefaultConfigReader() {
+ if conConfigType == nil {
+ if v, ok := conConfigType[key]; ok {
+ value = v
+ }
+ }
+ if err := extension.GetConfigReaders(value).ReadConsumerConfig(consumerConfig.fileStream); err != nil {
+ logger.Errorf("ReadConsumerConfig error: %#v for %s", perrors.WithStack(err), value)
+ }
+ }
metricConfig = consumerConfig.MetricConfig
applicationConfig = consumerConfig.ApplicationConfig
@@ -150,6 +168,18 @@ func Load() {
if providerConfig == nil {
logger.Warnf("providerConfig is nil!")
} else {
+ // init other provider config
+ proConfigType := providerConfig.ConfigType
+ for key, value := range extension.GetDefaultConfigReader() {
+ if proConfigType != nil {
+ if v, ok := proConfigType[key]; ok {
+ value = v
+ }
+ }
+ if err := extension.GetConfigReaders(value).ReadProviderConfig(providerConfig.fileStream); err != nil {
+ logger.Errorf("ReadProviderConfig error: %#v for %s", perrors.WithStack(err), value)
+ }
+ }
// so, you should know that the consumer's config will be override
metricConfig = providerConfig.MetricConfig
diff --git a/config/consumer_config.go b/config/consumer_config.go
index aaa3f1021cadfa2adc6f0e21259f6f324c4dd842..debcd79fa281c40e5526f60f5c5cdb66688688f4 100644
--- a/config/consumer_config.go
+++ b/config/consumer_config.go
@@ -18,6 +18,7 @@
package config
import (
+ "bytes"
"time"
)
@@ -30,6 +31,7 @@ import (
import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/common/yaml"
)
/////////////////////////
@@ -58,6 +60,7 @@ type ConsumerConfig struct {
ProtocolConf interface{} `yaml:"protocol_conf" json:"protocol_conf,omitempty" property:"protocol_conf"`
FilterConf interface{} `yaml:"filter_conf" json:"filter_conf,omitempty" property:"filter_conf" `
ShutdownConfig *ShutdownConfig `yaml:"shutdown_conf" json:"shutdown_conf,omitempty" property:"shutdown_conf" `
+ ConfigType map[string]string `yaml:"config_type" json:"config_type,omitempty" property:"config_type"`
}
// UnmarshalYAML ...
@@ -87,13 +90,12 @@ func ConsumerInit(confConFile string) error {
if confConFile == "" {
return perrors.Errorf("application configure(consumer) file name is nil")
}
-
consumerConfig = &ConsumerConfig{}
- err := unmarshalYMLConfig(confConFile, consumerConfig)
+ fileStream, err := yaml.UnmarshalYMLConfig(confConFile, consumerConfig)
if err != nil {
- return perrors.Errorf("yaml.Unmarshal() = error:%v", perrors.WithStack(err))
+ return perrors.Errorf("unmarshalYmlConfig error %v", perrors.WithStack(err))
}
-
+ consumerConfig.fileStream = bytes.NewBuffer(fileStream)
//set method interfaceId & interfaceName
for k, v := range consumerConfig.References {
//set id for reference
@@ -118,6 +120,7 @@ func ConsumerInit(confConFile string) error {
}
logger.Debugf("consumer config{%#v}\n", consumerConfig)
+
return nil
}
@@ -141,5 +144,6 @@ func configCenterRefreshConsumer() error {
return perrors.WithMessagef(err, "time.ParseDuration(Connect_Timeout{%#v})", consumerConfig.Connect_Timeout)
}
}
- return err
+
+ return nil
}
diff --git a/config/interfaces/config_reader.go b/config/interfaces/config_reader.go
new file mode 100644
index 0000000000000000000000000000000000000000..23f2225e1bd670d43065f3b6eca08385a5c964a2
--- /dev/null
+++ b/config/interfaces/config_reader.go
@@ -0,0 +1,9 @@
+package interfaces
+
+import "bytes"
+
+// ConfigReader
+type ConfigReader interface {
+ ReadConsumerConfig(reader *bytes.Buffer) error
+ ReadProviderConfig(reader *bytes.Buffer) error
+}
diff --git a/config/provider_config.go b/config/provider_config.go
index 56023bc957efb8c650fb4dd2d84b2a60eb34612d..79569917455773653750d1d5921a722daf079b0a 100644
--- a/config/provider_config.go
+++ b/config/provider_config.go
@@ -17,6 +17,10 @@
package config
+import (
+ "bytes"
+)
+
import (
"github.com/creasty/defaults"
perrors "github.com/pkg/errors"
@@ -25,6 +29,7 @@ import (
import (
"github.com/apache/dubbo-go/common/constant"
"github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/common/yaml"
)
/////////////////////////
@@ -47,6 +52,7 @@ type ProviderConfig struct {
ProtocolConf interface{} `yaml:"protocol_conf" json:"protocol_conf,omitempty" property:"protocol_conf" `
FilterConf interface{} `yaml:"filter_conf" json:"filter_conf,omitempty" property:"filter_conf" `
ShutdownConfig *ShutdownConfig `yaml:"shutdown_conf" json:"shutdown_conf,omitempty" property:"shutdown_conf" `
+ ConfigType map[string]string `yaml:"config_type" json:"config_type,omitempty" property:"config_type"`
}
// UnmarshalYAML ...
@@ -76,13 +82,13 @@ func ProviderInit(confProFile string) error {
if len(confProFile) == 0 {
return perrors.Errorf("application configure(provider) file name is nil")
}
-
providerConfig = &ProviderConfig{}
- err := unmarshalYMLConfig(confProFile, providerConfig)
+ fileStream, err := yaml.UnmarshalYMLConfig(confProFile, providerConfig)
if err != nil {
- return perrors.Errorf("yaml.Unmarshal() = error:%v", perrors.WithStack(err))
+ return perrors.Errorf("unmarshalYmlConfig error %v", perrors.WithStack(err))
}
+ providerConfig.fileStream = bytes.NewBuffer(fileStream)
//set method interfaceId & interfaceName
for k, v := range providerConfig.Services {
//set id for reference
diff --git a/config_center/nacos/client.go b/config_center/nacos/client.go
index 1bf61a942ba9f7530b495a57465c4ee6cb0c98c1..d3373e249bf99873dd3aa05b7488b0e7f38730ec 100644
--- a/config_center/nacos/client.go
+++ b/config_center/nacos/client.go
@@ -157,7 +157,7 @@ func newNacosClient(name string, nacosAddrs []string, timeout time.Duration) (*N
},
}
- svrConfList := []nacosconst.ServerConfig{}
+ svrConfList := make([]nacosconst.ServerConfig, 0, len(n.NacosAddrs))
for _, nacosAddr := range n.NacosAddrs {
split := strings.Split(nacosAddr, ":")
port, err := strconv.ParseUint(split[1], 10, 64)
diff --git a/config_center/nacos/facade.go b/config_center/nacos/facade.go
index fc83e14eac7fcc51025b54f6daff2553f309312c..77a79ed091461ea5184cb2531d985c233ccd92e9 100644
--- a/config_center/nacos/facade.go
+++ b/config_center/nacos/facade.go
@@ -46,15 +46,10 @@ type nacosClientFacade interface {
common.Node
}
-func timeSecondDuration(sec int) time.Duration {
- return time.Duration(sec) * time.Second
-}
-
// HandleClientRestart Restart client handler
func HandleClientRestart(r nacosClientFacade) {
var (
- err error
-
+ err error
failTimes int
)
@@ -79,7 +74,7 @@ LOOP:
case <-r.GetDone():
logger.Warnf("(NacosProviderRegistry)reconnectZkRegistry goroutine exit now...")
break LOOP
- case <-getty.GetTimeWheel().After(timeSecondDuration(failTimes * connDelay)): // Prevent crazy reconnection nacos.
+ case <-getty.GetTimeWheel().After(time.Duration(failTimes*connDelay) * time.Second): // Prevent crazy reconnection nacos.
}
err = ValidateNacosClient(r, WithNacosName(nacosName))
logger.Infof("NacosProviderRegistry.validateNacosClient(nacosAddr{%s}) = error{%#v}",
diff --git a/config_center/parser/configuration_parser.go b/config_center/parser/configuration_parser.go
index f342dc62e765f8d38c9e64ba3be03f3362f0bf61..f33b4ba866da69e1d23b493f42152bbb0f437878 100644
--- a/config_center/parser/configuration_parser.go
+++ b/config_center/parser/configuration_parser.go
@@ -233,18 +233,10 @@ func getParamString(item ConfigItem) (string, error) {
"you want to change in the rule.")
}
for k, v := range params {
- retStr = retStr + "&"
- retStr = retStr + k
- retStr = retStr + "="
- retStr = retStr + v
+ retStr += "&" + k + "=" + v
}
- if len(item.ProviderAddresses) >= 0 {
- retStr = retStr + "&"
- retStr = retStr + constant.OVERRIDE_PROVIDERS_KEY
- retStr = retStr + "="
- retStr = retStr + strings.Join(item.ProviderAddresses, ",")
- }
+ retStr += "&" + constant.OVERRIDE_PROVIDERS_KEY + "=" + strings.Join(item.ProviderAddresses, ",")
return retStr, nil
}
diff --git a/doc/pic/arch/dubbo-go-arch.png b/doc/pic/arch/dubbo-go-arch.png
index 8f8f19957b2a8639470e5c59a676a22762cc9778..87726d88484c23d6395023bb10e86009d59a1fd7 100644
Binary files a/doc/pic/arch/dubbo-go-arch.png and b/doc/pic/arch/dubbo-go-arch.png differ
diff --git a/go.mod b/go.mod
index a4294a62ddd56b8f874ca93ec5d6b012c014c3f7..be84af853a66a3500e1d306df667cdd646534765 100644
--- a/go.mod
+++ b/go.mod
@@ -15,8 +15,10 @@ require (
github.com/dubbogo/getty v1.3.3
github.com/dubbogo/go-zookeeper v1.0.0
github.com/dubbogo/gost v1.7.0
+ github.com/emicklei/go-restful/v3 v3.0.0
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
github.com/go-errors/errors v1.0.1 // indirect
+ github.com/go-resty/resty/v2 v2.1.0
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/mock v1.3.1
github.com/golang/protobuf v1.3.2
@@ -55,6 +57,10 @@ require (
go.uber.org/zap v1.10.0
google.golang.org/grpc v1.22.1
gopkg.in/yaml.v2 v2.2.2
+ k8s.io/api v0.0.0-20190325185214-7544f9db76f6
+ k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841
+ k8s.io/client-go v8.0.0+incompatible
+ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
)
go 1.13
diff --git a/go.sum b/go.sum
index 6dc55c634c3b887c56f2670c1c69760c90fcf96d..d4f8a367b0e5e184e9a608b5e5a485f985f5c5dd 100644
--- a/go.sum
+++ b/go.sum
@@ -14,10 +14,13 @@ github.com/Jeffail/gabs v1.1.0 h1:kw5zCcl9tlJNHTDme7qbi21fDHZmXrnjMoXos3Jw/NI=
github.com/Jeffail/gabs v1.1.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
github.com/Microsoft/go-winio v0.4.3 h1:M3NHMuPgMSUPdE5epwNUHlRPSVzHs8HpRTrVXhR0myo=
github.com/Microsoft/go-winio v0.4.3/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
github.com/NYTimes/gziphandler v1.0.1 h1:iLrQrdwjDd52kHDA5op2UBJFjmOb9g+7scBan4RN8F0=
github.com/NYTimes/gziphandler v1.0.1/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
+github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/SAP/go-hdb v0.12.0 h1:5hBQZ2jjyZ268qjDmoDZJuCyLzR6oRLI60eYzmTW9m4=
github.com/SAP/go-hdb v0.12.0/go.mod h1:etBT+FAi1t5k3K3tf5vQTnosgYmhDkRi8jEnQqCnxF0=
github.com/SermoDigital/jose v0.0.0-20180104203859-803625baeddc h1:LkkwnbY+S8WmwkWq1SVyRWMH9nYWO1P5XN3OD1tts/w=
@@ -86,6 +89,7 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbp
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/creasty/defaults v1.3.0 h1:uG+RAxYbJgOPCOdKEcec9ZJXeva7Y6mj/8egdzwmLtw=
github.com/creasty/defaults v1.3.0/go.mod h1:CIEEvs7oIVZm30R8VxtFJs+4k201gReYyuYHJxZc68I=
+github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -106,7 +110,6 @@ github.com/dubbogo/getty v1.3.3 h1:8m4zZBqFHO+NmhH7rMPlFuuYRVjcPD7cUhumevqMZZs=
github.com/dubbogo/getty v1.3.3/go.mod h1:U92BDyJ6sW9Jpohr2Vlz8w2uUbIbNZ3d+6rJvFTSPp0=
github.com/dubbogo/go-zookeeper v1.0.0 h1:RsYdlGwhDW+iKXM3eIIcvt34P2swLdmQfuIJxsHlGoM=
github.com/dubbogo/go-zookeeper v1.0.0/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c=
-github.com/dubbogo/gost v1.5.1 h1:oG5dzaWf1KYynBaBoUIOkgT+YD0niHV6xxI0Odq7hDg=
github.com/dubbogo/gost v1.5.1/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8=
github.com/dubbogo/gost v1.5.2 h1:ri/03971hdpnn3QeCU+4UZgnRNGDXLDGDucR/iozZm8=
github.com/dubbogo/gost v1.5.2/go.mod h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8=
@@ -116,6 +119,10 @@ github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74 h1:2MIh
github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74/go.mod h1:UqXY1lYT/ERa4OEAywUqdok1T4RCRdArkhic1Opuavo=
github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0 h1:ZoRgc53qJCfSLimXqJDrmBhnt5GChDsExMCK7t48o0Y=
github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw=
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful/v3 v3.0.0 h1:Duxxa4x0WIHW3bYEDmoAPNjmy8Rbqn+utcF74dlF/G8=
+github.com/emicklei/go-restful/v3 v3.0.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.8.0 h1:uE6Fp4fOcAJdc1wTQXLJ+SYistkbG1dNoi6Zs1+Ybvk=
github.com/envoyproxy/go-control-plane v0.8.0/go.mod h1:GSSbY9P1neVhdY7G4wu+IK1rk/dqhiCC/4ExuWJZVuk=
github.com/envoyproxy/protoc-gen-validate v0.0.14 h1:YBW6/cKy9prEGRYLnaGa4IDhzxZhRCtKsax8srGKDnM=
@@ -126,7 +133,9 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/structs v0.0.0-20180123065059-ebf56d35bba7 h1:bGT+Ub6bpzHl7AAYQhBrZ5nYTAH2SF/848WducU0Ao4=
github.com/fatih/structs v0.0.0-20180123065059-ebf56d35bba7/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
@@ -140,6 +149,12 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E=
github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
+github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
+github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
+github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
+github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-resty/resty/v2 v2.1.0 h1:Z6IefCpUMfnvItVJaJXWv/pMiiD11So35QgwEELsldE=
+github.com/go-resty/resty/v2 v2.1.0/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8=
github.com/go-sql-driver/mysql v0.0.0-20180618115901-749ddf1598b4 h1:1LlmVz15APoKz9dnm5j2ePptburJlwEH+/v/pUuoxck=
github.com/go-sql-driver/mysql v0.0.0-20180618115901-749ddf1598b4/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -160,6 +175,7 @@ github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4er
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
@@ -178,9 +194,11 @@ github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4r
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca h1:wobTb8SE189AuxzEKClyYxiI4nUGWlpVtl13eLiFlOE=
@@ -279,6 +297,7 @@ github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443 h1:O/pT5C1Q3mVXMyu
github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod h1:bEpDU35nTu0ey1EXjwNwPjI9xErAsoOCmcMb9GKvyxo=
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ=
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -297,6 +316,7 @@ github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62 h1:JHCT6xuyPUrbbgAPE/3dqlvUKzRHMNuTBKKUb6OeR/k=
github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod h1:U+RSyWxWd04xTqnuOQxnai7XGS2PrPY2cfGoDKtMHjA=
+github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
@@ -327,6 +347,7 @@ github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 h1:it29sI2IM490luSc3RAhp5Wu
github.com/lib/pq v0.0.0-20180523175426-90697d60dd84/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
@@ -356,9 +377,11 @@ github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nacos-group/nacos-sdk-go v0.0.0-20190723125407-0242d42e3dbb h1:lbmvw8r9W55w+aQgWn35W1nuleRIECMoqUrmwAOAvoI=
github.com/nacos-group/nacos-sdk-go v0.0.0-20190723125407-0242d42e3dbb/go.mod h1:CEkSvEpoveoYjA81m4HNeYQ0sge0LFGKSEqO3JKHllo=
@@ -366,8 +389,12 @@ github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 h1:BQ1HW
github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod h1:TLb2Sg7HQcgGdloNxkrmtgDNR9uVYF3lfdFIN4Ro6Sk=
github.com/oklog/run v0.0.0-20180308005104-6934b124db28 h1:Hbr3fbVPXea52oPQeP7KLSxP52g6SFaNY1IqAmUyEW0=
github.com/oklog/run v0.0.0-20180308005104-6934b124db28/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -391,6 +418,7 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w=
@@ -433,7 +461,6 @@ github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod h1
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs=
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/smartystreets/goconvey v0.0.0-20190710185942-9d28bd7c0945 h1:N8Bg45zpk/UcpNGnfJt2y/3lRWASHNTUET8owPYCgYI=
github.com/smartystreets/goconvey v0.0.0-20190710185942-9d28bd7c0945/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@@ -441,16 +468,16 @@ github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d h1:bVQRCxQv
github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod h1:Cw4GTlQccdRGSEf6KiMju767x0NEHE0YIVPJSaXjlsw=
github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -483,12 +510,12 @@ go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -497,8 +524,9 @@ golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73r
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -507,6 +535,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -519,7 +548,7 @@ golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 h1:4y9KwBHBgBNwDbtu44R5o1fdOCQUEXhbk/P4A9WmJq0=
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
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=
@@ -528,11 +557,11 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZe
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/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-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
google.golang.org/api v0.0.0-20180829000535-087779f1d2c9 h1:z1TeLUmxf9ws9KLICfmX+KGXTs+rjm+aGWzfsv7MZ9w=
google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
@@ -545,13 +574,13 @@ google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
google.golang.org/grpc v1.22.1 h1:/7cs52RnTJmD43s3uxzlq2U7nqVTd/37viQwMrMNlOM=
google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
@@ -565,6 +594,7 @@ gopkg.in/ory-am/dockertest.v3 v3.3.4/go.mod h1:s9mmoLkaGeAh97qygnNj4xWkiN7e1SKek
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4=
gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -583,3 +613,9 @@ k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841 h1:Q4RZrHNtlC/mSdC1sTrcZ5
k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
k8s.io/client-go v8.0.0+incompatible h1:tTI4hRmb1DRMl4fG6Vclfdi6nTM82oIrTT7HfitmxC4=
k8s.io/client-go v8.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a h1:UcxjrRMyNx/i/y8G7kPvLyy7rfbeuf1PYyBf973pgyU=
+k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
+sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/protocol/rest/client/client_impl/resty_client.go b/protocol/rest/client/client_impl/resty_client.go
new file mode 100644
index 0000000000000000000000000000000000000000..aa6c23137dc68492948b85a85555a5340572ac49
--- /dev/null
+++ b/protocol/rest/client/client_impl/resty_client.go
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 client_impl
+
+import (
+ "context"
+ "net"
+ "net/http"
+ "path"
+ "time"
+)
+
+import (
+ "github.com/go-resty/resty/v2"
+ perrors "github.com/pkg/errors"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/protocol/rest/client"
+)
+
+func init() {
+ extension.SetRestClient(constant.DEFAULT_REST_CLIENT, NewRestyClient)
+}
+
+type RestyClient struct {
+ client *resty.Client
+}
+
+func NewRestyClient(restOption *client.RestOptions) client.RestClient {
+ client := resty.New()
+ client.SetTransport(
+ &http.Transport{
+ DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+ c, err := net.DialTimeout(network, addr, restOption.ConnectTimeout)
+ if err != nil {
+ return nil, err
+ }
+ err = c.SetDeadline(time.Now().Add(restOption.RequestTimeout))
+ if err != nil {
+ return nil, err
+ }
+ return c, nil
+ },
+ })
+ return &RestyClient{
+ client: client,
+ }
+}
+
+func (rc *RestyClient) Do(restRequest *client.RestRequest, res interface{}) error {
+ r, err := rc.client.R().
+ SetHeader("Content-Type", restRequest.Consumes).
+ SetHeader("Accept", restRequest.Produces).
+ SetPathParams(restRequest.PathParams).
+ SetQueryParams(restRequest.QueryParams).
+ SetHeaders(restRequest.Headers).
+ SetBody(restRequest.Body).
+ SetResult(res).
+ Execute(restRequest.Method, "http://"+path.Join(restRequest.Location, restRequest.Path))
+ if err != nil {
+ return perrors.WithStack(err)
+ }
+ if r.IsError() {
+ return perrors.New(r.String())
+ }
+ return nil
+}
diff --git a/protocol/rest/client/rest_client.go b/protocol/rest/client/rest_client.go
new file mode 100644
index 0000000000000000000000000000000000000000..7d020abc81c2bd44473ed25ffec4b2b657e7bcc0
--- /dev/null
+++ b/protocol/rest/client/rest_client.go
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 client
+
+import (
+ "time"
+)
+
+type RestOptions struct {
+ RequestTimeout time.Duration
+ ConnectTimeout time.Duration
+}
+
+type RestRequest struct {
+ Location string
+ Path string
+ Produces string
+ Consumes string
+ Method string
+ PathParams map[string]string
+ QueryParams map[string]string
+ Body interface{}
+ Headers map[string]string
+}
+
+type RestClient interface {
+ Do(request *RestRequest, res interface{}) error
+}
diff --git a/protocol/rest/config/reader/rest_config_reader.go b/protocol/rest/config/reader/rest_config_reader.go
new file mode 100644
index 0000000000000000000000000000000000000000..873af9924b5644158024b22c24aa9eebbf1bf187
--- /dev/null
+++ b/protocol/rest/config/reader/rest_config_reader.go
@@ -0,0 +1,158 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 reader
+
+import (
+ "bytes"
+ "strconv"
+ "strings"
+)
+
+import (
+ perrors "github.com/pkg/errors"
+ "gopkg.in/yaml.v2"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/config/interfaces"
+ "github.com/apache/dubbo-go/protocol/rest/config"
+)
+
+const REST = "rest"
+
+func init() {
+ extension.SetConfigReaders(REST, NewRestConfigReader)
+ extension.SetDefaultConfigReader(REST, REST)
+}
+
+type RestConfigReader struct {
+}
+
+func NewRestConfigReader() interfaces.ConfigReader {
+ return &RestConfigReader{}
+}
+
+// ReadConsumerConfig read consumer config for rest protocol
+func (cr *RestConfigReader) ReadConsumerConfig(reader *bytes.Buffer) error {
+ restConsumerConfig := &config.RestConsumerConfig{}
+ err := yaml.Unmarshal(reader.Bytes(), restConsumerConfig)
+ if err != nil {
+ return perrors.Errorf("[Rest Config] unmarshal Consumer error %#v", perrors.WithStack(err))
+ }
+
+ restConsumerServiceConfigMap := make(map[string]*config.RestServiceConfig, len(restConsumerConfig.RestServiceConfigsMap))
+ for key, rc := range restConsumerConfig.RestServiceConfigsMap {
+ rc.Client = getNotEmptyStr(rc.Client, restConsumerConfig.Client, constant.DEFAULT_REST_CLIENT)
+ rc.RestMethodConfigsMap = initMethodConfigMap(rc, restConsumerConfig.Consumes, restConsumerConfig.Produces)
+ restConsumerServiceConfigMap[strings.TrimPrefix(key, "/")] = rc
+ }
+ config.SetRestConsumerServiceConfigMap(restConsumerServiceConfigMap)
+ return nil
+}
+
+// ReadProviderConfig read provider config for rest protocol
+func (cr *RestConfigReader) ReadProviderConfig(reader *bytes.Buffer) error {
+ restProviderConfig := &config.RestProviderConfig{}
+ err := yaml.Unmarshal(reader.Bytes(), restProviderConfig)
+ if err != nil {
+ return perrors.Errorf("[Rest Config] unmarshal Provider error %#v", perrors.WithStack(err))
+ }
+ restProviderServiceConfigMap := make(map[string]*config.RestServiceConfig, len(restProviderConfig.RestServiceConfigsMap))
+ for key, rc := range restProviderConfig.RestServiceConfigsMap {
+ rc.Server = getNotEmptyStr(rc.Server, restProviderConfig.Server, constant.DEFAULT_REST_SERVER)
+ rc.RestMethodConfigsMap = initMethodConfigMap(rc, restProviderConfig.Consumes, restProviderConfig.Produces)
+ restProviderServiceConfigMap[strings.TrimPrefix(key, "/")] = rc
+ }
+ config.SetRestProviderServiceConfigMap(restProviderServiceConfigMap)
+ return nil
+}
+
+// initProviderRestConfig ...
+func initMethodConfigMap(rc *config.RestServiceConfig, consumes string, produces string) map[string]*config.RestMethodConfig {
+ mcm := make(map[string]*config.RestMethodConfig, len(rc.RestMethodConfigs))
+ for _, mc := range rc.RestMethodConfigs {
+ mc.InterfaceName = rc.InterfaceName
+ mc.Path = rc.Path + mc.Path
+ mc.Consumes = getNotEmptyStr(mc.Consumes, rc.Consumes, consumes)
+ mc.Produces = getNotEmptyStr(mc.Produces, rc.Produces, produces)
+ mc.MethodType = getNotEmptyStr(mc.MethodType, rc.MethodType)
+ mc = transformMethodConfig(mc)
+ mcm[mc.MethodName] = mc
+ }
+ return mcm
+}
+
+// function will return first not empty string ..
+func getNotEmptyStr(args ...string) string {
+ var r string
+ for _, t := range args {
+ if len(t) > 0 {
+ r = t
+ break
+ }
+ }
+ return r
+}
+
+// transformMethodConfig
+func transformMethodConfig(methodConfig *config.RestMethodConfig) *config.RestMethodConfig {
+ if len(methodConfig.PathParamsMap) == 0 && len(methodConfig.PathParams) > 0 {
+ paramsMap, err := parseParamsString2Map(methodConfig.PathParams)
+ if err != nil {
+ logger.Warnf("[Rest Config] Path Param parse error:%v", err)
+ } else {
+ methodConfig.PathParamsMap = paramsMap
+ }
+ }
+ if len(methodConfig.QueryParamsMap) == 0 && len(methodConfig.QueryParams) > 0 {
+ paramsMap, err := parseParamsString2Map(methodConfig.QueryParams)
+ if err != nil {
+ logger.Warnf("[Rest Config] Argument Param parse error:%v", err)
+ } else {
+ methodConfig.QueryParamsMap = paramsMap
+ }
+ }
+ if len(methodConfig.HeadersMap) == 0 && len(methodConfig.Headers) > 0 {
+ headersMap, err := parseParamsString2Map(methodConfig.Headers)
+ if err != nil {
+ logger.Warnf("[Rest Config] Argument Param parse error:%v", err)
+ } else {
+ methodConfig.HeadersMap = headersMap
+ }
+ }
+ return methodConfig
+}
+
+// transform a string to a map
+// for example:
+// string "0:id,1:name" => map [0:id,1:name]
+func parseParamsString2Map(params string) (map[int]string, error) {
+ m := make(map[int]string, 8)
+ for _, p := range strings.Split(params, ",") {
+ pa := strings.Split(p, ":")
+ key, err := strconv.Atoi(pa[0])
+ if err != nil {
+ return nil, err
+ }
+ m[key] = pa[1]
+ }
+ return m, nil
+}
diff --git a/protocol/rest/config/reader/rest_config_reader_test.go b/protocol/rest/config/reader/rest_config_reader_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..d2dba40b9b85a6cd7772e0fee619720c79e91eb4
--- /dev/null
+++ b/protocol/rest/config/reader/rest_config_reader_test.go
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 reader
+
+import (
+ "bytes"
+ "testing"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/yaml"
+ "github.com/apache/dubbo-go/protocol/rest/config"
+)
+
+func TestRestConfigReader_ReadConsumerConfig(t *testing.T) {
+ bs, err := yaml.LoadYMLConfig("./testdata/consumer_config.yml")
+ assert.NoError(t, err)
+ configReader := NewRestConfigReader()
+ err = configReader.ReadConsumerConfig(bytes.NewBuffer(bs))
+ assert.NoError(t, err)
+ assert.NotEmpty(t, config.GetRestConsumerServiceConfigMap())
+}
+
+func TestRestConfigReader_ReadProviderConfig(t *testing.T) {
+ bs, err := yaml.LoadYMLConfig("./testdata/provider_config.yml")
+ assert.NoError(t, err)
+ configReader := NewRestConfigReader()
+ err = configReader.ReadProviderConfig(bytes.NewBuffer(bs))
+ assert.NoError(t, err)
+ assert.NotEmpty(t, config.GetRestProviderServiceConfigMap())
+}
diff --git a/protocol/rest/config/reader/testdata/consumer_config.yml b/protocol/rest/config/reader/testdata/consumer_config.yml
new file mode 100644
index 0000000000000000000000000000000000000000..27d7fdafeff017ef8ee2720cc06d954056f02f05
--- /dev/null
+++ b/protocol/rest/config/reader/testdata/consumer_config.yml
@@ -0,0 +1,74 @@
+# dubbo client yaml configure file
+
+filter: ""
+
+config_type:
+ rest: "rest"
+
+# client
+request_timeout : "100ms"
+# connect timeout
+connect_timeout : "100ms"
+check: true
+rest_server: "resty"
+rest_produces: "*/*"
+rest_consumes: "*/*"
+
+# application config
+application:
+ organization : "ikurento.com"
+ name : "BDTService"
+ module : "dubbogo user-info client"
+ version : "0.0.1"
+ owner : "ZX"
+ environment : "dev"
+
+registries :
+
+ "hangzhouzk":
+ protocol: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
+ "shanghaizk":
+ protocol: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
+
+references:
+ "UserProvider":
+ registry: "hangzhouzk,shanghaizk"
+ filter: ""
+ protocol : "rest"
+ version: "1.0"
+ group: "as"
+ interface : "com.ikurento.user.UserProvider"
+ url: "dubbo://127.0.0.1:20000/UserProvider"
+ cluster: "failover"
+ timeout: "3s"
+ rest_client: "resty1"
+ rest_produces: "application/xml"
+ rest_consumes: "application/xml"
+ methods :
+ - name: "GetUser"
+ retries: "3"
+ timeout: "5s"
+ rest_query_params: "1:userid,2:username"
+ rest_headers: "3:age"
+ rest_path_params: "4:time,2:name"
+ rest_body: 0
+ rest_produces: "application/xml"
+ rest_consumes: "application/xml"
+
+ params:
+ "serviceid":
+ "soa.com.ikurento.user.UserProvider"
+ "forks": 5
+
+shutdown_conf:
+ timeout: 60s
+ step_timeout: 10s
+
diff --git a/protocol/rest/config/reader/testdata/provider_config.yml b/protocol/rest/config/reader/testdata/provider_config.yml
new file mode 100644
index 0000000000000000000000000000000000000000..71d056e7277f1a0420536e282ea31d34dddf3e14
--- /dev/null
+++ b/protocol/rest/config/reader/testdata/provider_config.yml
@@ -0,0 +1,88 @@
+# dubbo server yaml configure file
+
+filter: ""
+
+config_type:
+ rest: "rest"
+
+# application config
+application:
+ organization : "ikurento.com"
+ name : "BDTService"
+ module : "dubbogo user-info server"
+ version : "0.0.1"
+ owner : "ZX"
+ environment : "dev"
+
+registries :
+ "hangzhouzk":
+ protocol: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2181"
+ username: ""
+ password: ""
+ "shanghaizk":
+ protocol: "zookeeper"
+ timeout : "3s"
+ address: "127.0.0.1:2182"
+ username: ""
+ password: ""
+
+rest_server: "go-restful"
+rest_produces: "*/*"
+rest_consumes: "*/*"
+
+services:
+ "UserProvider":
+ registry: "hangzhouzk,shanghaizk"
+ filter: ""
+ # the name of limiter
+ tps.limiter: "default"
+ # the time unit of interval is ms
+ tps.limit.interval: 60000
+ tps.limit.rate: 200
+ # the name of strategy
+ tps.limit.strategy: "slidingWindow"
+ # the name of RejectedExecutionHandler
+ tps.limit.rejected.handler: "default"
+ # the concurrent request limitation of this service
+ # if the value < 0, it will not be limited.
+ execute.limit: "200"
+ # the name of RejectedExecutionHandler
+ execute.limit.rejected.handler: "default"
+ protocol : "rest"
+ # equivalent to interface of dubbo.xml
+ interface : "com.ikurento.user.UserProvider"
+ loadbalance: "random"
+ version: "1.0"
+ group: "as"
+ warmup: "100"
+ cluster: "failover"
+ rest_server: "go-restful1"
+ rest_produces: "*/*"
+ rest_consumes: "*/*"
+ methods:
+ - name: "GetUser"
+ retries: 1
+ loadbalance: "random"
+ # the concurrent request limitation of this method
+ # if the value < 0, it will not be limited.
+ execute.limit: "200"
+ # the name of RejectedExecutionHandler
+ execute.limit.rejected.handler: "default"
+ rest_query_params: "1:userid,2:username"
+ rest_headers: "3:age"
+ rest_path_params: "4:time,2:name"
+ rest_body: 0
+ rest_produces: "application/xml"
+ rest_consumes: "application/xml"
+
+protocols:
+ "rest":
+ name: "rest"
+ ip : "127.0.0.1"
+ port : 20000
+
+
+
+
diff --git a/protocol/rest/config/rest_config.go b/protocol/rest/config/rest_config.go
new file mode 100644
index 0000000000000000000000000000000000000000..168ec8ce525fc7fd5d4a30d4f11ba7bf42d1c921
--- /dev/null
+++ b/protocol/rest/config/rest_config.go
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 config
+
+import (
+ "github.com/creasty/defaults"
+)
+
+var (
+ restConsumerServiceConfigMap map[string]*RestServiceConfig
+ restProviderServiceConfigMap map[string]*RestServiceConfig
+)
+
+// RestConsumerConfig ...
+type RestConsumerConfig struct {
+ Client string `default:"resty" yaml:"rest_client" json:"rest_client,omitempty" property:"rest_client"`
+ Produces string `default:"application/json" yaml:"rest_produces" json:"rest_produces,omitempty" property:"rest_produces"`
+ Consumes string `default:"application/json" yaml:"rest_consumes" json:"rest_consumes,omitempty" property:"rest_consumes"`
+ RestServiceConfigsMap map[string]*RestServiceConfig `yaml:"references" json:"references,omitempty" property:"references"`
+}
+
+// UnmarshalYAML ...
+func (c *RestConsumerConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+ if err := defaults.Set(c); err != nil {
+ return err
+ }
+ type plain RestConsumerConfig
+ if err := unmarshal((*plain)(c)); err != nil {
+ return err
+ }
+ return nil
+}
+
+// RestProviderConfig ...
+type RestProviderConfig struct {
+ Server string `default:"go-restful" yaml:"rest_server" json:"rest_server,omitempty" property:"rest_server"`
+ Produces string `default:"*/*" yaml:"rest_produces" json:"rest_produces,omitempty" property:"rest_produces"`
+ Consumes string `default:"*/*" yaml:"rest_consumes" json:"rest_consumes,omitempty" property:"rest_consumes"`
+ RestServiceConfigsMap map[string]*RestServiceConfig `yaml:"services" json:"services,omitempty" property:"services"`
+}
+
+// UnmarshalYAML ...
+func (c *RestProviderConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+ if err := defaults.Set(c); err != nil {
+ return err
+ }
+ type plain RestProviderConfig
+ if err := unmarshal((*plain)(c)); err != nil {
+ return err
+ }
+ return nil
+}
+
+// RestServiceConfig ...
+type RestServiceConfig struct {
+ InterfaceName string `required:"true" yaml:"interface" json:"interface,omitempty" property:"interface"`
+ Url string `yaml:"url" json:"url,omitempty" property:"url"`
+ Path string `yaml:"rest_path" json:"rest_path,omitempty" property:"rest_path"`
+ Produces string `yaml:"rest_produces" json:"rest_produces,omitempty" property:"rest_produces"`
+ Consumes string `yaml:"rest_consumes" json:"rest_consumes,omitempty" property:"rest_consumes"`
+ MethodType string `yaml:"rest_method" json:"rest_method,omitempty" property:"rest_method"`
+ Client string `yaml:"rest_client" json:"rest_client,omitempty" property:"rest_client"`
+ Server string `yaml:"rest_server" json:"rest_server,omitempty" property:"rest_server"`
+ RestMethodConfigs []*RestMethodConfig `yaml:"methods" json:"methods,omitempty" property:"methods"`
+ RestMethodConfigsMap map[string]*RestMethodConfig
+}
+
+// UnmarshalYAML ...
+func (c *RestServiceConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+ if err := defaults.Set(c); err != nil {
+ return err
+ }
+ type plain RestServiceConfig
+ if err := unmarshal((*plain)(c)); err != nil {
+ return err
+ }
+ return nil
+}
+
+// RestMethodConfig ...
+type RestMethodConfig struct {
+ InterfaceName string
+ MethodName string `required:"true" yaml:"name" json:"name,omitempty" property:"name"`
+ Url string `yaml:"url" json:"url,omitempty" property:"url"`
+ Path string `yaml:"rest_path" json:"rest_path,omitempty" property:"rest_path"`
+ Produces string `yaml:"rest_produces" json:"rest_produces,omitempty" property:"rest_produces"`
+ Consumes string `yaml:"rest_consumes" json:"rest_consumes,omitempty" property:"rest_consumes"`
+ MethodType string `yaml:"rest_method" json:"rest_method,omitempty" property:"rest_method"`
+ PathParams string `yaml:"rest_path_params" json:"rest_path_params,omitempty" property:"rest_path_params"`
+ PathParamsMap map[int]string
+ QueryParams string `yaml:"rest_query_params" json:"rest_query_params,omitempty" property:"rest_query_params"`
+ QueryParamsMap map[int]string
+ Body int `default:"-1" yaml:"rest_body" json:"rest_body,omitempty" property:"rest_body"`
+ Headers string `yaml:"rest_headers" json:"rest_headers,omitempty" property:"rest_headers"`
+ HeadersMap map[int]string
+}
+
+// UnmarshalYAML ...
+func (c *RestMethodConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
+ if err := defaults.Set(c); err != nil {
+ return err
+ }
+ type plain RestMethodConfig
+ if err := unmarshal((*plain)(c)); err != nil {
+ return err
+ }
+ return nil
+}
+
+// GetRestConsumerServiceConfig ...
+func GetRestConsumerServiceConfig(path string) *RestServiceConfig {
+ return restConsumerServiceConfigMap[path]
+}
+
+// GetRestProviderServiceConfig ...
+func GetRestProviderServiceConfig(path string) *RestServiceConfig {
+ return restProviderServiceConfigMap[path]
+}
+
+// SetRestConsumerServiceConfigMap ...
+func SetRestConsumerServiceConfigMap(configMap map[string]*RestServiceConfig) {
+ restConsumerServiceConfigMap = configMap
+}
+
+// SetRestProviderServiceConfigMap ...
+func SetRestProviderServiceConfigMap(configMap map[string]*RestServiceConfig) {
+ restProviderServiceConfigMap = configMap
+}
+
+// GetRestConsumerServiceConfigMap ...
+func GetRestConsumerServiceConfigMap() map[string]*RestServiceConfig {
+ return restConsumerServiceConfigMap
+}
+
+// GetRestProviderServiceConfigMap ...
+func GetRestProviderServiceConfigMap() map[string]*RestServiceConfig {
+ return restProviderServiceConfigMap
+}
diff --git a/protocol/rest/rest_exporter.go b/protocol/rest/rest_exporter.go
new file mode 100644
index 0000000000000000000000000000000000000000..470d525ad806687e7a732ce5681eb372eb431a63
--- /dev/null
+++ b/protocol/rest/rest_exporter.go
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 rest
+
+import (
+ "sync"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+)
+
+type RestExporter struct {
+ protocol.BaseExporter
+}
+
+func NewRestExporter(key string, invoker protocol.Invoker, exporterMap *sync.Map) *RestExporter {
+ return &RestExporter{
+ BaseExporter: *protocol.NewBaseExporter(key, invoker, exporterMap),
+ }
+}
+
+func (re *RestExporter) Unexport() {
+ serviceId := re.GetInvoker().GetUrl().GetParam(constant.BEAN_NAME_KEY, "")
+ re.BaseExporter.Unexport()
+ err := common.ServiceMap.UnRegister(REST, serviceId)
+ if err != nil {
+ logger.Errorf("[RestExporter.Unexport] error: %v", err)
+ }
+ return
+}
diff --git a/protocol/rest/rest_invoker.go b/protocol/rest/rest_invoker.go
new file mode 100644
index 0000000000000000000000000000000000000000..0c82035ac5eb9a52ab188baa971dbdf1b864e970
--- /dev/null
+++ b/protocol/rest/rest_invoker.go
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 rest
+
+import (
+ "context"
+ "fmt"
+)
+
+import (
+ perrors "github.com/pkg/errors"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
+ invocation_impl "github.com/apache/dubbo-go/protocol/invocation"
+ "github.com/apache/dubbo-go/protocol/rest/client"
+ "github.com/apache/dubbo-go/protocol/rest/config"
+)
+
+type RestInvoker struct {
+ protocol.BaseInvoker
+ client client.RestClient
+ restMethodConfigMap map[string]*config.RestMethodConfig
+}
+
+func NewRestInvoker(url common.URL, client *client.RestClient, restMethodConfig map[string]*config.RestMethodConfig) *RestInvoker {
+ return &RestInvoker{
+ BaseInvoker: *protocol.NewBaseInvoker(url),
+ client: *client,
+ restMethodConfigMap: restMethodConfig,
+ }
+}
+
+func (ri *RestInvoker) Invoke(ctx context.Context, invocation protocol.Invocation) protocol.Result {
+ inv := invocation.(*invocation_impl.RPCInvocation)
+ methodConfig := ri.restMethodConfigMap[inv.MethodName()]
+ var (
+ result protocol.RPCResult
+ body interface{}
+ pathParams map[string]string
+ queryParams map[string]string
+ headers map[string]string
+ err error
+ )
+ if methodConfig == nil {
+ result.Err = perrors.Errorf("[RestInvoker] Rest methodConfig:%s is nil", inv.MethodName())
+ return &result
+ }
+ if pathParams, err = restStringMapTransform(methodConfig.PathParamsMap, inv.Arguments()); err != nil {
+ result.Err = err
+ return &result
+ }
+ if queryParams, err = restStringMapTransform(methodConfig.QueryParamsMap, inv.Arguments()); err != nil {
+ result.Err = err
+ return &result
+ }
+ if headers, err = restStringMapTransform(methodConfig.HeadersMap, inv.Arguments()); err != nil {
+ result.Err = err
+ return &result
+ }
+ if len(inv.Arguments()) > methodConfig.Body && methodConfig.Body >= 0 {
+ body = inv.Arguments()[methodConfig.Body]
+ }
+
+ req := &client.RestRequest{
+ Location: ri.GetUrl().Location,
+ Produces: methodConfig.Produces,
+ Consumes: methodConfig.Consumes,
+ Method: methodConfig.MethodType,
+ Path: methodConfig.Path,
+ PathParams: pathParams,
+ QueryParams: queryParams,
+ Body: body,
+ Headers: headers,
+ }
+ result.Err = ri.client.Do(req, inv.Reply())
+ if result.Err == nil {
+ result.Rest = inv.Reply()
+ }
+ return &result
+}
+
+func restStringMapTransform(paramsMap map[int]string, args []interface{}) (map[string]string, error) {
+ resMap := make(map[string]string, len(paramsMap))
+ for k, v := range paramsMap {
+ if k >= len(args) || k < 0 {
+ return nil, perrors.Errorf("[Rest Invoke] Index %v is out of bundle", k)
+ }
+ resMap[v] = fmt.Sprint(args[k])
+ }
+ return resMap, nil
+}
diff --git a/protocol/rest/rest_invoker_test.go b/protocol/rest/rest_invoker_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..e44c5d9a21026992178bd432676c99bc837c361b
--- /dev/null
+++ b/protocol/rest/rest_invoker_test.go
@@ -0,0 +1,211 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 rest
+
+import (
+ "context"
+ "testing"
+ "time"
+)
+
+import (
+ "github.com/emicklei/go-restful/v3"
+ "github.com/stretchr/testify/assert"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/config"
+ "github.com/apache/dubbo-go/protocol/invocation"
+ "github.com/apache/dubbo-go/protocol/rest/client"
+ "github.com/apache/dubbo-go/protocol/rest/client/client_impl"
+ rest_config "github.com/apache/dubbo-go/protocol/rest/config"
+ "github.com/apache/dubbo-go/protocol/rest/server/server_impl"
+)
+
+func TestRestInvoker_Invoke(t *testing.T) {
+ // Refer
+ proto := GetRestProtocol()
+ defer proto.Destroy()
+ var filterNum int
+ server_impl.AddGoRestfulServerFilter(func(request *restful.Request, response *restful.Response, chain *restful.FilterChain) {
+ println(request.SelectedRoutePath())
+ filterNum = filterNum + 1
+ chain.ProcessFilter(request, response)
+ })
+ server_impl.AddGoRestfulServerFilter(func(request *restful.Request, response *restful.Response, chain *restful.FilterChain) {
+ println("filter2")
+ filterNum = filterNum + 1
+ chain.ProcessFilter(request, response)
+ })
+
+ url, err := common.NewURL("rest://127.0.0.1:8877/com.ikurento.user.UserProvider?anyhost=true&" +
+ "application=BDTService&category=providers&default.timeout=10000&dubbo=dubbo-provider-golang-1.0.0&" +
+ "environment=dev&interface=com.ikurento.user.UserProvider&ip=192.168.56.1&methods=GetUser%2C&" +
+ "module=dubbogo+user-info+server&org=ikurento.com&owner=ZX&pid=1447&revision=0.0.1&" +
+ "side=provider&timeout=3000×tamp=1556509797245")
+ assert.NoError(t, err)
+ _, err = common.ServiceMap.Register(url.Protocol, &UserProvider{})
+ assert.NoError(t, err)
+ con := config.ProviderConfig{}
+ config.SetProviderConfig(con)
+ configMap := make(map[string]*rest_config.RestServiceConfig)
+ methodConfigMap := make(map[string]*rest_config.RestMethodConfig)
+ queryParamsMap := make(map[int]string)
+ queryParamsMap[1] = "age"
+ queryParamsMap[2] = "name"
+ pathParamsMap := make(map[int]string)
+ pathParamsMap[0] = "userid"
+ headersMap := make(map[int]string)
+ headersMap[3] = "Content-Type"
+ methodConfigMap["GetUserOne"] = &rest_config.RestMethodConfig{
+ InterfaceName: "",
+ MethodName: "GetUserOne",
+ Path: "/GetUserOne",
+ Produces: "application/json",
+ Consumes: "application/json",
+ MethodType: "POST",
+ PathParams: "",
+ PathParamsMap: nil,
+ QueryParams: "",
+ QueryParamsMap: nil,
+ Body: 0,
+ }
+ methodConfigMap["GetUserTwo"] = &rest_config.RestMethodConfig{
+ InterfaceName: "",
+ MethodName: "GetUserTwo",
+ Path: "/GetUserTwo",
+ Produces: "application/json",
+ Consumes: "application/json",
+ MethodType: "POST",
+ PathParams: "",
+ PathParamsMap: nil,
+ QueryParams: "",
+ QueryParamsMap: nil,
+ Body: 0,
+ }
+ methodConfigMap["GetUserThree"] = &rest_config.RestMethodConfig{
+ InterfaceName: "",
+ MethodName: "GetUserThree",
+ Path: "/GetUserThree",
+ Produces: "application/json",
+ Consumes: "application/json",
+ MethodType: "POST",
+ PathParams: "",
+ PathParamsMap: nil,
+ QueryParams: "",
+ QueryParamsMap: nil,
+ Body: 0,
+ }
+ methodConfigMap["GetUserFour"] = &rest_config.RestMethodConfig{
+ InterfaceName: "",
+ MethodName: "GetUserFour",
+ Path: "/GetUserFour",
+ Produces: "application/json",
+ Consumes: "application/json",
+ MethodType: "POST",
+ PathParams: "",
+ PathParamsMap: nil,
+ QueryParams: "",
+ QueryParamsMap: nil,
+ Body: 0,
+ }
+ methodConfigMap["GetUserFive"] = &rest_config.RestMethodConfig{
+ InterfaceName: "",
+ MethodName: "GetUserFive",
+ Path: "/GetUserFive",
+ Produces: "*/*",
+ Consumes: "*/*",
+ MethodType: "GET",
+ }
+ methodConfigMap["GetUser"] = &rest_config.RestMethodConfig{
+ InterfaceName: "",
+ MethodName: "GetUser",
+ Path: "/GetUser/{userid}",
+ Produces: "application/json",
+ Consumes: "application/json",
+ MethodType: "GET",
+ PathParams: "",
+ PathParamsMap: pathParamsMap,
+ QueryParams: "",
+ QueryParamsMap: queryParamsMap,
+ Body: -1,
+ HeadersMap: headersMap,
+ }
+
+ configMap["com.ikurento.user.UserProvider"] = &rest_config.RestServiceConfig{
+ Server: "go-restful",
+ RestMethodConfigsMap: methodConfigMap,
+ }
+ rest_config.SetRestProviderServiceConfigMap(configMap)
+ proxyFactory := extension.GetProxyFactory("default")
+ proto.Export(proxyFactory.GetInvoker(url))
+ time.Sleep(5 * time.Second)
+ configMap = make(map[string]*rest_config.RestServiceConfig)
+ configMap["com.ikurento.user.UserProvider"] = &rest_config.RestServiceConfig{
+ RestMethodConfigsMap: methodConfigMap,
+ }
+ restClient := client_impl.NewRestyClient(&client.RestOptions{ConnectTimeout: 3 * time.Second, RequestTimeout: 3 * time.Second})
+ invoker := NewRestInvoker(url, &restClient, methodConfigMap)
+ user := &User{}
+ inv := invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("GetUser"),
+ invocation.WithArguments([]interface{}{1, int32(23), "username", "application/json"}), invocation.WithReply(user))
+ res := invoker.Invoke(context.Background(), inv)
+ assert.NoError(t, res.Error())
+ assert.Equal(t, User{Id: 1, Age: int32(23), Name: "username"}, *res.Result().(*User))
+ now := time.Now()
+ inv = invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("GetUserOne"),
+ invocation.WithArguments([]interface{}{&User{1, &now, int32(23), "username"}}), invocation.WithReply(user))
+ res = invoker.Invoke(context.Background(), inv)
+ assert.NoError(t, res.Error())
+ assert.NotNil(t, res.Result())
+ assert.Equal(t, 1, res.Result().(*User).Id)
+ assert.Equal(t, now.Unix(), res.Result().(*User).Time.Unix())
+ assert.Equal(t, int32(23), res.Result().(*User).Age)
+ assert.Equal(t, "username", res.Result().(*User).Name)
+ // test 1
+ inv = invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("GetUserTwo"),
+ invocation.WithArguments([]interface{}{&User{1, &now, int32(23), "username"}}), invocation.WithReply(user))
+ res = invoker.Invoke(context.Background(), inv)
+ assert.NoError(t, res.Error())
+ assert.NotNil(t, res.Result())
+ assert.Equal(t, "username", res.Result().(*User).Name)
+ // test 2
+ inv = invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("GetUserThree"),
+ invocation.WithArguments([]interface{}{&User{1, &now, int32(23), "username"}}), invocation.WithReply(user))
+ res = invoker.Invoke(context.Background(), inv)
+ assert.NoError(t, res.Error())
+ assert.NotNil(t, res.Result())
+ assert.Equal(t, "username", res.Result().(*User).Name)
+ // test 3
+ inv = invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("GetUserFour"),
+ invocation.WithArguments([]interface{}{[]User{User{1, nil, int32(23), "username"}}}), invocation.WithReply(user))
+ res = invoker.Invoke(context.Background(), inv)
+ assert.NoError(t, res.Error())
+ assert.NotNil(t, res.Result())
+ assert.Equal(t, "username", res.Result().(*User).Name)
+ // test 4
+ inv = invocation.NewRPCInvocationWithOptions(invocation.WithMethodName("GetUserFive"), invocation.WithReply(user))
+ res = invoker.Invoke(context.Background(), inv)
+ assert.Error(t, res.Error(), "test error")
+
+ assert.Equal(t, filterNum, 12)
+ err = common.ServiceMap.UnRegister(url.Protocol, "com.ikurento.user.UserProvider")
+ assert.NoError(t, err)
+}
diff --git a/protocol/rest/rest_protocol.go b/protocol/rest/rest_protocol.go
new file mode 100644
index 0000000000000000000000000000000000000000..47ecb6093b4cfa12a1d3397fa45d59b1e173a93a
--- /dev/null
+++ b/protocol/rest/rest_protocol.go
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 rest
+
+import (
+ "strings"
+ "sync"
+ "time"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/config"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/rest/client"
+ _ "github.com/apache/dubbo-go/protocol/rest/client/client_impl"
+ rest_config "github.com/apache/dubbo-go/protocol/rest/config"
+ _ "github.com/apache/dubbo-go/protocol/rest/config/reader"
+ "github.com/apache/dubbo-go/protocol/rest/server"
+ _ "github.com/apache/dubbo-go/protocol/rest/server/server_impl"
+)
+
+var (
+ restProtocol *RestProtocol
+)
+
+const REST = "rest"
+
+func init() {
+ extension.SetProtocol(REST, GetRestProtocol)
+}
+
+type RestProtocol struct {
+ protocol.BaseProtocol
+ serverLock sync.Mutex
+ serverMap map[string]server.RestServer
+ clientLock sync.Mutex
+ clientMap map[client.RestOptions]client.RestClient
+}
+
+func NewRestProtocol() *RestProtocol {
+ return &RestProtocol{
+ BaseProtocol: protocol.NewBaseProtocol(),
+ serverMap: make(map[string]server.RestServer, 8),
+ clientMap: make(map[client.RestOptions]client.RestClient, 8),
+ }
+}
+
+func (rp *RestProtocol) Export(invoker protocol.Invoker) protocol.Exporter {
+ url := invoker.GetUrl()
+ serviceKey := url.ServiceKey()
+ exporter := NewRestExporter(serviceKey, invoker, rp.ExporterMap())
+ restServiceConfig := rest_config.GetRestProviderServiceConfig(strings.TrimPrefix(url.Path, "/"))
+ if restServiceConfig == nil {
+ logger.Errorf("%s service doesn't has provider config", url.Path)
+ return nil
+ }
+ rp.SetExporterMap(serviceKey, exporter)
+ restServer := rp.getServer(url, restServiceConfig.Server)
+ restServer.Deploy(invoker, restServiceConfig.RestMethodConfigsMap)
+ return exporter
+}
+
+func (rp *RestProtocol) Refer(url common.URL) protocol.Invoker {
+ // create rest_invoker
+ var requestTimeout = config.GetConsumerConfig().RequestTimeout
+ requestTimeoutStr := url.GetParam(constant.TIMEOUT_KEY, config.GetConsumerConfig().Request_Timeout)
+ connectTimeout := config.GetConsumerConfig().ConnectTimeout
+ if t, err := time.ParseDuration(requestTimeoutStr); err == nil {
+ requestTimeout = t
+ }
+ restServiceConfig := rest_config.GetRestConsumerServiceConfig(strings.TrimPrefix(url.Path, "/"))
+ if restServiceConfig == nil {
+ logger.Errorf("%s service doesn't has consumer config", url.Path)
+ return nil
+ }
+ restOptions := client.RestOptions{RequestTimeout: requestTimeout, ConnectTimeout: connectTimeout}
+ restClient := rp.getClient(restOptions, restServiceConfig.Client)
+ invoker := NewRestInvoker(url, &restClient, restServiceConfig.RestMethodConfigsMap)
+ rp.SetInvokers(invoker)
+ return invoker
+}
+
+func (rp *RestProtocol) getServer(url common.URL, serverType string) server.RestServer {
+ restServer, ok := rp.serverMap[url.Location]
+ if ok {
+ return restServer
+ }
+ _, ok = rp.ExporterMap().Load(url.ServiceKey())
+ if !ok {
+ panic("[RestProtocol]" + url.ServiceKey() + "is not existing")
+ }
+ rp.serverLock.Lock()
+ defer rp.serverLock.Unlock()
+ restServer, ok = rp.serverMap[url.Location]
+ if ok {
+ return restServer
+ }
+ restServer = extension.GetNewRestServer(serverType)
+ restServer.Start(url)
+ rp.serverMap[url.Location] = restServer
+ return restServer
+}
+
+func (rp *RestProtocol) getClient(restOptions client.RestOptions, clientType string) client.RestClient {
+ restClient, ok := rp.clientMap[restOptions]
+ if ok {
+ return restClient
+ }
+ rp.clientLock.Lock()
+ defer rp.clientLock.Unlock()
+ restClient, ok = rp.clientMap[restOptions]
+ if ok {
+ return restClient
+ }
+ restClient = extension.GetNewRestClient(clientType, &restOptions)
+ rp.clientMap[restOptions] = restClient
+ return restClient
+}
+
+func (rp *RestProtocol) Destroy() {
+ // destroy rest_server
+ rp.BaseProtocol.Destroy()
+ for key, server := range rp.serverMap {
+ server.Destroy()
+ delete(rp.serverMap, key)
+ }
+ for key := range rp.clientMap {
+ delete(rp.clientMap, key)
+ }
+}
+
+func GetRestProtocol() protocol.Protocol {
+ if restProtocol == nil {
+ restProtocol = NewRestProtocol()
+ }
+ return restProtocol
+}
diff --git a/protocol/rest/rest_protocol_test.go b/protocol/rest/rest_protocol_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..8af73a1839c159fdf58c64d12e039c20bb3221c6
--- /dev/null
+++ b/protocol/rest/rest_protocol_test.go
@@ -0,0 +1,186 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 rest
+
+import (
+ "context"
+ "errors"
+ "fmt"
+ "strings"
+ "testing"
+ "time"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/extension"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ "github.com/apache/dubbo-go/config"
+ rest_config "github.com/apache/dubbo-go/protocol/rest/config"
+)
+
+func TestRestProtocol_Refer(t *testing.T) {
+ // Refer
+ proto := GetRestProtocol()
+ url, err := common.NewURL("rest://127.0.0.1:20000/com.ikurento.user.UserProvider?anyhost=true&" +
+ "application=BDTService&category=providers&default.timeout=10000&dubbo=dubbo-provider-golang-1.0.0&" +
+ "environment=dev&interface=com.ikurento.user.UserProvider&ip=192.168.56.1&methods=GetUser%2C&" +
+ "module=dubbogo+user-info+server&org=ikurento.com&owner=ZX&pid=1447&revision=0.0.1&" +
+ "side=provider&timeout=3000×tamp=1556509797245")
+ assert.NoError(t, err)
+ con := config.ConsumerConfig{
+ ConnectTimeout: 5 * time.Second,
+ RequestTimeout: 5 * time.Second,
+ }
+ config.SetConsumerConfig(con)
+ configMap := make(map[string]*rest_config.RestServiceConfig)
+ configMap["com.ikurento.user.UserProvider"] = &rest_config.RestServiceConfig{
+ Client: "resty",
+ }
+ rest_config.SetRestConsumerServiceConfigMap(configMap)
+ invoker := proto.Refer(url)
+
+ // make sure url
+ eq := invoker.GetUrl().URLEqual(url)
+ assert.True(t, eq)
+
+ // make sure invokers after 'Destroy'
+ invokersLen := len(proto.(*RestProtocol).Invokers())
+ assert.Equal(t, 1, invokersLen)
+ proto.Destroy()
+ invokersLen = len(proto.(*RestProtocol).Invokers())
+ assert.Equal(t, 0, invokersLen)
+}
+
+func TestRestProtocol_Export(t *testing.T) {
+ // Export
+ proto := GetRestProtocol()
+ url, err := common.NewURL("rest://127.0.0.1:8888/com.ikurento.user.UserProvider?anyhost=true&" +
+ "application=BDTService&category=providers&default.timeout=10000&dubbo=dubbo-provider-golang-1.0.0&" +
+ "environment=dev&interface=com.ikurento.user.UserProvider&ip=192.168.56.1&methods=GetUser%2C&" +
+ "module=dubbogo+user-info+server&org=ikurento.com&owner=ZX&pid=1447&revision=0.0.1&" +
+ "side=provider&timeout=3000×tamp=1556509797245")
+ assert.NoError(t, err)
+ _, err = common.ServiceMap.Register(url.Protocol, &UserProvider{})
+ assert.NoError(t, err)
+ con := config.ProviderConfig{}
+ config.SetProviderConfig(con)
+ configMap := make(map[string]*rest_config.RestServiceConfig)
+ methodConfigMap := make(map[string]*rest_config.RestMethodConfig)
+ queryParamsMap := make(map[int]string)
+ queryParamsMap[1] = "age"
+ queryParamsMap[2] = "name"
+ pathParamsMap := make(map[int]string)
+ pathParamsMap[0] = "userid"
+ methodConfigMap["GetUser"] = &rest_config.RestMethodConfig{
+ InterfaceName: "",
+ MethodName: "GetUser",
+ Path: "/GetUser/{userid}",
+ Produces: "application/json",
+ Consumes: "application/json",
+ MethodType: "GET",
+ PathParams: "",
+ PathParamsMap: pathParamsMap,
+ QueryParams: "",
+ QueryParamsMap: queryParamsMap,
+ Body: -1,
+ }
+ configMap["com.ikurento.user.UserProvider"] = &rest_config.RestServiceConfig{
+ Server: "go-restful",
+ RestMethodConfigsMap: methodConfigMap,
+ }
+ rest_config.SetRestProviderServiceConfigMap(configMap)
+ proxyFactory := extension.GetProxyFactory("default")
+ exporter := proto.Export(proxyFactory.GetInvoker(url))
+ // make sure url
+ eq := exporter.GetInvoker().GetUrl().URLEqual(url)
+ assert.True(t, eq)
+ // make sure exporterMap after 'Unexport'
+ fmt.Println(url.Path)
+ _, ok := proto.(*RestProtocol).ExporterMap().Load(strings.TrimPrefix(url.Path, "/"))
+ assert.True(t, ok)
+ exporter.Unexport()
+ _, ok = proto.(*RestProtocol).ExporterMap().Load(strings.TrimPrefix(url.Path, "/"))
+ assert.False(t, ok)
+
+ // make sure serverMap after 'Destroy'
+ _, ok = proto.(*RestProtocol).serverMap[url.Location]
+ assert.True(t, ok)
+ proto.Destroy()
+ _, ok = proto.(*RestProtocol).serverMap[url.Location]
+ assert.False(t, ok)
+ err = common.ServiceMap.UnRegister(url.Protocol, "com.ikurento.user.UserProvider")
+ assert.NoError(t, err)
+}
+
+type UserProvider struct {
+}
+
+func (p *UserProvider) Reference() string {
+ return "com.ikurento.user.UserProvider"
+}
+
+func (p *UserProvider) GetUser(ctx context.Context, id int, age int32, name string, contentType string) (*User, error) {
+ return &User{
+ Id: id,
+ Time: nil,
+ Age: age,
+ Name: name,
+ }, nil
+}
+
+func (p *UserProvider) GetUserOne(ctx context.Context, user *User) (*User, error) {
+ return user, nil
+}
+
+func (p *UserProvider) GetUserTwo(ctx context.Context, req []interface{}, rsp *User) error {
+ m := req[0].(map[string]interface{})
+ rsp.Name = m["Name"].(string)
+ return nil
+}
+
+func (p *UserProvider) GetUserThree(ctx context.Context, user interface{}) (*User, error) {
+ m := user.(map[string]interface{})
+
+ u := &User{}
+ u.Name = m["Name"].(string)
+ return u, nil
+}
+
+func (p *UserProvider) GetUserFour(ctx context.Context, user []interface{}, id string) (*User, error) {
+ m := user[0].(map[string]interface{})
+
+ u := &User{}
+ u.Name = m["Name"].(string)
+ return u, nil
+}
+
+func (p *UserProvider) GetUserFive(ctx context.Context, user []interface{}) (*User, error) {
+ return nil, errors.New("test error")
+}
+
+type User struct {
+ Id int
+ Time *time.Time
+ Age int32
+ Name string
+}
diff --git a/protocol/rest/server/rest_server.go b/protocol/rest/server/rest_server.go
new file mode 100644
index 0000000000000000000000000000000000000000..c10c98a7b677d47c43b64643a69d5b3768a6c663
--- /dev/null
+++ b/protocol/rest/server/rest_server.go
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 server
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/rest/config"
+)
+
+type RestServer interface {
+ Start(url common.URL)
+ Deploy(invoker protocol.Invoker, restMethodConfig map[string]*config.RestMethodConfig)
+ UnDeploy(restMethodConfig map[string]*config.RestMethodConfig)
+ Destroy()
+}
diff --git a/protocol/rest/server/server_impl/go_restful_server.go b/protocol/rest/server/server_impl/go_restful_server.go
new file mode 100644
index 0000000000000000000000000000000000000000..69f36a5c80aa51f52dfcfabc5a1bd4003f4cd727
--- /dev/null
+++ b/protocol/rest/server/server_impl/go_restful_server.go
@@ -0,0 +1,322 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 server_impl
+
+import (
+ "context"
+ "fmt"
+ "net"
+ "net/http"
+ "reflect"
+ "strconv"
+ "strings"
+ "time"
+)
+
+import (
+ "github.com/emicklei/go-restful/v3"
+ perrors "github.com/pkg/errors"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/protocol"
+ "github.com/apache/dubbo-go/protocol/invocation"
+ "github.com/apache/dubbo-go/protocol/rest/config"
+ "github.com/apache/dubbo-go/protocol/rest/server"
+)
+
+func init() {
+ extension.SetRestServer(constant.DEFAULT_REST_SERVER, GetNewGoRestfulServer)
+}
+
+var filterSlice []restful.FilterFunction
+
+type GoRestfulServer struct {
+ srv *http.Server
+ container *restful.Container
+}
+
+func NewGoRestfulServer() *GoRestfulServer {
+ return &GoRestfulServer{}
+}
+
+func (grs *GoRestfulServer) Start(url common.URL) {
+ grs.container = restful.NewContainer()
+ for _, filter := range filterSlice {
+ grs.container.Filter(filter)
+ }
+ grs.srv = &http.Server{
+ Handler: grs.container,
+ }
+ ln, err := net.Listen("tcp", url.Location)
+ if err != nil {
+ panic(perrors.New(fmt.Sprintf("Restful Server start error:%v", err)))
+ }
+
+ go func() {
+ err := grs.srv.Serve(ln)
+ if err != nil && err != http.ErrServerClosed {
+ logger.Errorf("[Go Restful] http.server.Serve(addr{%s}) = err{%+v}", url.Location, err)
+ }
+ }()
+}
+
+func (grs *GoRestfulServer) Deploy(invoker protocol.Invoker, restMethodConfig map[string]*config.RestMethodConfig) {
+ svc := common.ServiceMap.GetService(invoker.GetUrl().Protocol, strings.TrimPrefix(invoker.GetUrl().Path, "/"))
+ for methodName, config := range restMethodConfig {
+ // get method
+ method := svc.Method()[methodName]
+ argsTypes := method.ArgsType()
+ replyType := method.ReplyType()
+ ws := new(restful.WebService)
+ ws.Path(config.Path).
+ Produces(strings.Split(config.Produces, ",")...).
+ Consumes(strings.Split(config.Consumes, ",")...).
+ Route(ws.Method(config.MethodType).To(getFunc(methodName, invoker, argsTypes, replyType, config)))
+ grs.container.Add(ws)
+ }
+
+}
+
+func getFunc(methodName string, invoker protocol.Invoker, argsTypes []reflect.Type,
+ replyType reflect.Type, config *config.RestMethodConfig) func(req *restful.Request, resp *restful.Response) {
+ return func(req *restful.Request, resp *restful.Response) {
+ var (
+ err error
+ args []interface{}
+ )
+ if (len(argsTypes) == 1 || len(argsTypes) == 2 && replyType == nil) &&
+ argsTypes[0].String() == "[]interface {}" {
+ args = getArgsInterfaceFromRequest(req, config)
+ } else {
+ args = getArgsFromRequest(req, argsTypes, config)
+ }
+ result := invoker.Invoke(context.Background(), invocation.NewRPCInvocation(methodName, args, make(map[string]string)))
+ if result.Error() != nil {
+ err = resp.WriteError(http.StatusInternalServerError, result.Error())
+ if err != nil {
+ logger.Errorf("[Go Restful] WriteError error:%v", err)
+ }
+ return
+ }
+ err = resp.WriteEntity(result.Result())
+ if err != nil {
+ logger.Error("[Go Restful] WriteEntity error:%v", err)
+ }
+ }
+}
+func (grs *GoRestfulServer) UnDeploy(restMethodConfig map[string]*config.RestMethodConfig) {
+ for _, config := range restMethodConfig {
+ ws := new(restful.WebService)
+ ws.Path(config.Path)
+ err := grs.container.Remove(ws)
+ if err != nil {
+ logger.Warnf("[Go restful] Remove web service error:%v", err)
+ }
+ }
+}
+
+func (grs *GoRestfulServer) Destroy() {
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ if err := grs.srv.Shutdown(ctx); err != nil {
+ logger.Errorf("[Go Restful] Server Shutdown:", err)
+ }
+ logger.Infof("[Go Restful] Server exiting")
+}
+
+func getArgsInterfaceFromRequest(req *restful.Request, config *config.RestMethodConfig) []interface{} {
+ argsMap := make(map[int]interface{}, 8)
+ maxKey := 0
+ for k, v := range config.PathParamsMap {
+ if maxKey < k {
+ maxKey = k
+ }
+ argsMap[k] = req.PathParameter(v)
+ }
+ for k, v := range config.QueryParamsMap {
+ if maxKey < k {
+ maxKey = k
+ }
+ params := req.QueryParameters(v)
+ if len(params) == 1 {
+ argsMap[k] = params[0]
+ } else {
+ argsMap[k] = params
+ }
+ }
+ for k, v := range config.HeadersMap {
+ if maxKey < k {
+ maxKey = k
+ }
+ argsMap[k] = req.HeaderParameter(v)
+ }
+ if config.Body >= 0 {
+ if maxKey < config.Body {
+ maxKey = config.Body
+ }
+ m := make(map[string]interface{})
+ // TODO read as a slice
+ if err := req.ReadEntity(&m); err != nil {
+ logger.Warnf("[Go restful] Read body entity as map[string]interface{} error:%v", perrors.WithStack(err))
+ } else {
+ argsMap[config.Body] = m
+ }
+ }
+ args := make([]interface{}, maxKey+1)
+ for k, v := range argsMap {
+ if k >= 0 {
+ args[k] = v
+ }
+ }
+ return args
+}
+
+func getArgsFromRequest(req *restful.Request, argsTypes []reflect.Type, config *config.RestMethodConfig) []interface{} {
+ argsLength := len(argsTypes)
+ args := make([]interface{}, argsLength)
+ for i, t := range argsTypes {
+ args[i] = reflect.Zero(t).Interface()
+ }
+ var (
+ err error
+ param interface{}
+ i64 int64
+ )
+ for k, v := range config.PathParamsMap {
+ if k < 0 || k >= argsLength {
+ logger.Errorf("[Go restful] Path param parse error, the args:%v doesn't exist", k)
+ continue
+ }
+ t := argsTypes[k]
+ kind := t.Kind()
+ if kind == reflect.Ptr {
+ t = t.Elem()
+ }
+ if kind == reflect.Int {
+ param, err = strconv.Atoi(req.PathParameter(v))
+ } else if kind == reflect.Int32 {
+ i64, err = strconv.ParseInt(req.PathParameter(v), 10, 32)
+ if err == nil {
+ param = int32(i64)
+ }
+ } else if kind == reflect.Int64 {
+ param, err = strconv.ParseInt(req.PathParameter(v), 10, 64)
+ } else if kind == reflect.String {
+ param = req.PathParameter(v)
+ } else {
+ logger.Warnf("[Go restful] Path param parse error, the args:%v of type isn't int or string", k)
+ continue
+ }
+ if err != nil {
+ logger.Errorf("[Go restful] Path param parse error, error is %v", err)
+ continue
+ }
+ args[k] = param
+ }
+ for k, v := range config.QueryParamsMap {
+ if k < 0 || k >= argsLength {
+ logger.Errorf("[Go restful] Query param parse error, the args:%v doesn't exist", k)
+ continue
+ }
+ t := argsTypes[k]
+ kind := t.Kind()
+ if kind == reflect.Ptr {
+ t = t.Elem()
+ }
+ if kind == reflect.Slice {
+ param = req.QueryParameters(v)
+ } else if kind == reflect.String {
+ param = req.QueryParameter(v)
+ } else if kind == reflect.Int {
+ param, err = strconv.Atoi(req.QueryParameter(v))
+ } else if kind == reflect.Int32 {
+ i64, err = strconv.ParseInt(req.QueryParameter(v), 10, 32)
+ if err == nil {
+ param = int32(i64)
+ }
+ } else if kind == reflect.Int64 {
+ param, err = strconv.ParseInt(req.QueryParameter(v), 10, 64)
+ } else {
+ logger.Errorf("[Go restful] Query param parse error, the args:%v of type isn't int or string or slice", k)
+ continue
+ }
+ if err != nil {
+ logger.Errorf("[Go restful] Query param parse error, error is %v", err)
+ continue
+ }
+ args[k] = param
+ }
+
+ if config.Body >= 0 && config.Body < len(argsTypes) {
+ t := argsTypes[config.Body]
+ kind := t.Kind()
+ if kind == reflect.Ptr {
+ t = t.Elem()
+ }
+ var ni interface{}
+ if t.String() == "[]interface {}" {
+ ni = make([]map[string]interface{}, 0)
+ } else if t.String() == "interface {}" {
+ ni = make(map[string]interface{})
+ } else {
+ n := reflect.New(t)
+ if n.CanInterface() {
+ ni = n.Interface()
+ }
+ }
+ if err := req.ReadEntity(&ni); err != nil {
+ logger.Errorf("[Go restful] Read body entity error:%v", err)
+ } else {
+ args[config.Body] = ni
+ }
+ }
+
+ for k, v := range config.HeadersMap {
+ param := req.HeaderParameter(v)
+ if k < 0 || k >= argsLength {
+ logger.Errorf("[Go restful] Header param parse error, the args:%v doesn't exist", k)
+ continue
+ }
+ t := argsTypes[k]
+ if t.Kind() == reflect.Ptr {
+ t = t.Elem()
+ }
+ if t.Kind() == reflect.String {
+ args[k] = param
+ } else {
+ logger.Errorf("[Go restful] Header param parse error, the args:%v of type isn't string", k)
+ }
+ }
+
+ return args
+}
+
+func GetNewGoRestfulServer() server.RestServer {
+ return NewGoRestfulServer()
+}
+
+// Let user addFilter
+// addFilter should before config.Load()
+func AddGoRestfulServerFilter(filterFuc restful.FilterFunction) {
+ filterSlice = append(filterSlice, filterFuc)
+}
diff --git a/registry/base_registry.go b/registry/base_registry.go
index 5b9aef82928d491d4b8f4dbe3caa4bd64a185dad..3b64e93e2f6b5b58a70650f589dec3ca092376c1 100644
--- a/registry/base_registry.go
+++ b/registry/base_registry.go
@@ -69,11 +69,20 @@ func init() {
*/
type FacadeBasedRegistry interface {
Registry
+
+ // CreatePath create the path in the registry
CreatePath(string) error
+ // DoRegister actually do the register job
DoRegister(string, string) error
+ // DoSubscribe actually subscribe the URL
DoSubscribe(conf *common.URL) (Listener, error)
+ // CloseAndNilClient close the client and then reset the client in registry to nil
+ // you should notice that this method will be invoked inside a lock.
+ // So you should implement this method as light weighted as you can.
CloseAndNilClient()
+ // CloseListener close listeners
CloseListener()
+ // InitListeners init listeners
InitListeners()
}
@@ -153,7 +162,7 @@ func (r *BaseRegistry) service(c common.URL) string {
func (r *BaseRegistry) RestartCallBack() bool {
// copy r.services
- services := []common.URL{}
+ services := make([]common.URL, 0, len(r.services))
for _, confIf := range r.services {
services = append(services, confIf)
}
@@ -227,9 +236,11 @@ func (r *BaseRegistry) providerRegistry(c common.URL, params url.Values) (string
return "", "", perrors.Errorf("conf{Path:%s, Methods:%s}", c.Path, c.Methods)
}
dubboPath = fmt.Sprintf("/dubbo/%s/%s", r.service(c), common.DubboNodes[common.PROVIDER])
- r.cltLock.Lock()
- err = r.facadeBasedRegistry.CreatePath(dubboPath)
- r.cltLock.Unlock()
+ func() {
+ r.cltLock.Lock()
+ defer r.cltLock.Unlock()
+ err = r.facadeBasedRegistry.CreatePath(dubboPath)
+ }()
if err != nil {
logger.Errorf("facadeBasedRegistry.CreatePath(path{%s}) = error{%#v}", dubboPath, perrors.WithStack(err))
return "", "", perrors.WithMessagef(err, "facadeBasedRegistry.CreatePath(path:%s)", dubboPath)
@@ -251,10 +262,11 @@ func (r *BaseRegistry) providerRegistry(c common.URL, params url.Values) (string
logger.Debugf("provider url params:%#v", params)
var host string
if c.Ip == "" {
- host = localIP + ":" + c.Port
+ host = localIP
} else {
- host = c.Ip + ":" + c.Port
+ host = c.Ip
}
+ host += ":" + c.Port
rawURL = fmt.Sprintf("%s://%s%s?%s", c.Protocol, host, c.Path, params.Encode())
// Print your own registration service providers.
@@ -271,17 +283,25 @@ func (r *BaseRegistry) consumerRegistry(c common.URL, params url.Values) (string
err error
)
dubboPath = fmt.Sprintf("/dubbo/%s/%s", r.service(c), common.DubboNodes[common.CONSUMER])
- r.cltLock.Lock()
- err = r.facadeBasedRegistry.CreatePath(dubboPath)
- r.cltLock.Unlock()
+
+ func() {
+ r.cltLock.Lock()
+ defer r.cltLock.Unlock()
+ err = r.facadeBasedRegistry.CreatePath(dubboPath)
+
+ }()
if err != nil {
logger.Errorf("facadeBasedRegistry.CreatePath(path{%s}) = error{%v}", dubboPath, perrors.WithStack(err))
return "", "", perrors.WithStack(err)
}
dubboPath = fmt.Sprintf("/dubbo/%s/%s", r.service(c), common.DubboNodes[common.PROVIDER])
- r.cltLock.Lock()
- err = r.facadeBasedRegistry.CreatePath(dubboPath)
- r.cltLock.Unlock()
+
+ func() {
+ r.cltLock.Lock()
+ defer r.cltLock.Unlock()
+ err = r.facadeBasedRegistry.CreatePath(dubboPath)
+ }()
+
if err != nil {
logger.Errorf("facadeBasedRegistry.CreatePath(path{%s}) = error{%v}", dubboPath, perrors.WithStack(err))
return "", "", perrors.WithStack(err)
@@ -345,9 +365,9 @@ func (r *BaseRegistry) Subscribe(url *common.URL, notifyListener NotifyListener)
// closeRegisters close and remove registry client and reset services map
func (r *BaseRegistry) closeRegisters() {
+ logger.Infof("begin to close provider client")
r.cltLock.Lock()
defer r.cltLock.Unlock()
- logger.Infof("begin to close provider client")
// Close and remove(set to nil) the registry client
r.facadeBasedRegistry.CloseAndNilClient()
// reset the services map
diff --git a/registry/etcdv3/listener.go b/registry/etcdv3/listener.go
index f9b046a2c52814cd4e5ea38f9ea4c58c8bdb5bc4..51fdf21f5d229932646b4da464de960c2f2985de 100644
--- a/registry/etcdv3/listener.go
+++ b/registry/etcdv3/listener.go
@@ -38,9 +38,9 @@ type dataListener struct {
listener config_center.ConfigurationListener
}
-// NewRegistryDataListener ...
+// NewRegistryDataListener
func NewRegistryDataListener(listener config_center.ConfigurationListener) *dataListener {
- return &dataListener{listener: listener, interestedURL: []*common.URL{}}
+ return &dataListener{listener: listener}
}
func (l *dataListener) AddInterestedURL(url *common.URL) {
@@ -49,7 +49,12 @@ func (l *dataListener) AddInterestedURL(url *common.URL) {
func (l *dataListener) DataChange(eventType remoting.Event) bool {
- url := eventType.Path[strings.Index(eventType.Path, "/providers/")+len("/providers/"):]
+ index := strings.Index(eventType.Path, "/providers/")
+ if index == -1 {
+ logger.Warnf("Listen with no url, event.path={%v}", eventType.Path)
+ return false
+ }
+ url := eventType.Path[index+len("/providers/"):]
serviceURL, err := common.NewURL(url)
if err != nil {
logger.Warnf("Listen NewURL(r{%s}) = error{%v}", eventType.Path, err)
@@ -68,7 +73,6 @@ func (l *dataListener) DataChange(eventType remoting.Event) bool {
return true
}
}
-
return false
}
@@ -97,7 +101,7 @@ func (l *configurationListener) Next() (*registry.ServiceEvent, error) {
case e := <-l.events:
logger.Infof("got etcd event %#v", e)
- if e.ConfigType == remoting.EventTypeDel {
+ if e.ConfigType == remoting.EventTypeDel && l.registry.client.Valid() {
select {
case <-l.registry.Done():
logger.Warnf("update @result{%s}. But its connection to registry is invalid", e.Value)
diff --git a/registry/etcdv3/listener_test.go b/registry/etcdv3/listener_test.go
index 928e3fa83d4a19869903d3aaee1691c298b031b2..e691ae3cf1204ee97f130764496a7fc5bf67ac42 100644
--- a/registry/etcdv3/listener_test.go
+++ b/registry/etcdv3/listener_test.go
@@ -18,10 +18,9 @@
package etcdv3
import (
+ "os"
"testing"
"time"
-
- "github.com/apache/dubbo-go/config_center"
)
import (
@@ -32,6 +31,7 @@ import (
import (
"github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/config_center"
"github.com/apache/dubbo-go/remoting"
)
@@ -40,13 +40,16 @@ type RegistryTestSuite struct {
etcd *embed.Etcd
}
+const defaultEtcdV3WorkDir = "/tmp/default-dubbo-go-registry.etcd"
+
// start etcd server
func (suite *RegistryTestSuite) SetupSuite() {
t := suite.T()
cfg := embed.NewConfig()
- cfg.Dir = "/tmp/default.etcd"
+ // avoid conflict with default etcd work-dir
+ cfg.Dir = defaultEtcdV3WorkDir
e, err := embed.StartEtcd(cfg)
if err != nil {
t.Fatal(err)
@@ -66,6 +69,10 @@ func (suite *RegistryTestSuite) SetupSuite() {
// stop etcd server
func (suite *RegistryTestSuite) TearDownSuite() {
suite.etcd.Close()
+ // clean the etcd workdir
+ if err := os.RemoveAll(defaultEtcdV3WorkDir); err != nil {
+ suite.FailNow(err.Error())
+ }
}
func (suite *RegistryTestSuite) TestDataChange() {
diff --git a/registry/etcdv3/registry_test.go b/registry/etcdv3/registry_test.go
index 6e26a8f3fcbbf50592520a44b253e5abbaedb061..dc4e382979d910e4f42453fa0a409afbcb0ecabc 100644
--- a/registry/etcdv3/registry_test.go
+++ b/registry/etcdv3/registry_test.go
@@ -98,7 +98,7 @@ func (suite *RegistryTestSuite) TestSubscribe() {
assert.Regexp(t, ".*ServiceEvent{Action{add}.*", serviceEvent.String())
}
-func (suite *RegistryTestSuite) TestConsumerDestory() {
+func (suite *RegistryTestSuite) TestConsumerDestroy() {
t := suite.T()
url, _ := common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider", common.WithParamsValue(constant.CLUSTER_KEY, "mock"), common.WithMethods([]string{"GetUser", "AddUser"}))
@@ -117,7 +117,7 @@ func (suite *RegistryTestSuite) TestConsumerDestory() {
}
-func (suite *RegistryTestSuite) TestProviderDestory() {
+func (suite *RegistryTestSuite) TestProviderDestroy() {
t := suite.T()
reg := initRegistry(t)
diff --git a/registry/kubernetes/listener.go b/registry/kubernetes/listener.go
new file mode 100644
index 0000000000000000000000000000000000000000..f8869fea7b77541eb929624cc1fa708c1218d7dd
--- /dev/null
+++ b/registry/kubernetes/listener.go
@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "strings"
+)
+
+import (
+ perrors "github.com/pkg/errors"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/config_center"
+ "github.com/apache/dubbo-go/registry"
+ "github.com/apache/dubbo-go/remoting"
+)
+
+type dataListener struct {
+ interestedURL []*common.URL
+ listener config_center.ConfigurationListener
+}
+
+// NewRegistryDataListener
+func NewRegistryDataListener(listener config_center.ConfigurationListener) *dataListener {
+ return &dataListener{listener: listener}
+}
+
+// AddInterestedURL
+func (l *dataListener) AddInterestedURL(url *common.URL) {
+ l.interestedURL = append(l.interestedURL, url)
+}
+
+// DataChange
+// notify listen, when interest event
+func (l *dataListener) DataChange(eventType remoting.Event) bool {
+
+ index := strings.Index(eventType.Path, "/providers/")
+ if index == -1 {
+ logger.Warnf("Listen with no url, event.path={%v}", eventType.Path)
+ return false
+ }
+ url := eventType.Path[index+len("/providers/"):]
+ serviceURL, err := common.NewURL(url)
+ if err != nil {
+ logger.Warnf("Listen NewURL(r{%s}) = error{%v}", eventType.Path, err)
+ return false
+ }
+
+ for _, v := range l.interestedURL {
+ if serviceURL.URLEqual(*v) {
+ l.listener.Process(
+ &config_center.ConfigChangeEvent{
+ Key: eventType.Path,
+ Value: serviceURL,
+ ConfigType: eventType.Action,
+ },
+ )
+ return true
+ }
+ }
+ return false
+}
+
+type configurationListener struct {
+ registry *kubernetesRegistry
+ events chan *config_center.ConfigChangeEvent
+}
+
+// NewConfigurationListener for listening the event of kubernetes.
+func NewConfigurationListener(reg *kubernetesRegistry) *configurationListener {
+ // add a new waiter
+ reg.WaitGroup().Add(1)
+ return &configurationListener{registry: reg, events: make(chan *config_center.ConfigChangeEvent, 32)}
+}
+
+func (l *configurationListener) Process(configType *config_center.ConfigChangeEvent) {
+ l.events <- configType
+}
+
+func (l *configurationListener) Next() (*registry.ServiceEvent, error) {
+ for {
+ select {
+ case <-l.registry.Done():
+ logger.Warnf("listener's kubernetes client connection is broken, so kubernetes event listener exits now.")
+ return nil, perrors.New("listener stopped")
+
+ case e := <-l.events:
+ logger.Infof("got kubernetes event %#v", e)
+ if e.ConfigType == remoting.EventTypeDel && !l.registry.client.Valid() {
+ select {
+ case <-l.registry.Done():
+ logger.Warnf("update @result{%s}. But its connection to registry is invalid", e.Value)
+ default:
+ }
+ continue
+ }
+ return ®istry.ServiceEvent{Action: e.ConfigType, Service: e.Value.(common.URL)}, nil
+ }
+ }
+}
+func (l *configurationListener) Close() {
+ l.registry.WaitGroup().Done()
+}
diff --git a/registry/kubernetes/listener_test.go b/registry/kubernetes/listener_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..c50b5b670a5491b9813652f7aa46bec18a35a7d7
--- /dev/null
+++ b/registry/kubernetes/listener_test.go
@@ -0,0 +1,259 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "encoding/json"
+ "os"
+ "strconv"
+ "testing"
+ "time"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/suite"
+ "k8s.io/api/core/v1"
+ "k8s.io/client-go/kubernetes"
+ "k8s.io/client-go/kubernetes/fake"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/config_center"
+ "github.com/apache/dubbo-go/remoting"
+)
+
+var clientPodJsonData = `{
+ "apiVersion": "v1",
+ "kind": "Pod",
+ "metadata": {
+ "annotations": {
+ "dubbo.io/annotation": "W3siayI6Ii9kdWJibyIsInYiOiIifSx7ImsiOiIvZHViYm8vY29tLmlrdXJlbnRvLnVzZXIuVXNlclByb3ZpZGVyIiwidiI6IiJ9LHsiayI6Ii9kdWJiby9jb20uaWt1cmVudG8udXNlci5Vc2VyUHJvdmlkZXIvY29uc3VtZXJzIiwidiI6IiJ9LHsiayI6Ii9kdWJibyIsInYiOiIifSx7ImsiOiIvZHViYm8vY29tLmlrdXJlbnRvLnVzZXIuVXNlclByb3ZpZGVyIiwidiI6IiJ9LHsiayI6Ii9kdWJiby9jb20uaWt1cmVudG8udXNlci5Vc2VyUHJvdmlkZXIvcHJvdmlkZXJzIiwidiI6IiJ9LHsiayI6Ii9kdWJiby9jb20uaWt1cmVudG8udXNlci5Vc2VyUHJvdmlkZXIvY29uc3VtZXJzL2NvbnN1bWVyJTNBJTJGJTJGMTcyLjE3LjAuOCUyRlVzZXJQcm92aWRlciUzRmNhdGVnb3J5JTNEY29uc3VtZXJzJTI2ZHViYm8lM0RkdWJib2dvLWNvbnN1bWVyLTIuNi4wJTI2cHJvdG9jb2wlM0RkdWJibyIsInYiOiIifV0="
+ },
+ "creationTimestamp": "2020-03-13T03:38:57Z",
+ "labels": {
+ "dubbo.io/label": "dubbo.io-value"
+ },
+ "name": "client",
+ "namespace": "default",
+ "resourceVersion": "2449700",
+ "selfLink": "/api/v1/namespaces/default/pods/client",
+ "uid": "3ec394f5-dcc6-49c3-8061-57b4b2b41344"
+ },
+ "spec": {
+ "containers": [
+ {
+ "env": [
+ {
+ "name": "NAMESPACE",
+ "valueFrom": {
+ "fieldRef": {
+ "apiVersion": "v1",
+ "fieldPath": "metadata.namespace"
+ }
+ }
+ }
+ ],
+ "image": "registry.cn-hangzhou.aliyuncs.com/scottwang/dubbogo-client",
+ "imagePullPolicy": "Always",
+ "name": "client",
+ "resources": {},
+ "terminationMessagePath": "/dev/termination-log",
+ "terminationMessagePolicy": "File",
+ "volumeMounts": [
+ {
+ "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount",
+ "name": "dubbo-sa-token-l2lzh",
+ "readOnly": true
+ }
+ ]
+ }
+ ],
+ "dnsPolicy": "ClusterFirst",
+ "enableServiceLinks": true,
+ "nodeName": "minikube",
+ "priority": 0,
+ "restartPolicy": "Never",
+ "schedulerName": "default-scheduler",
+ "securityContext": {},
+ "serviceAccount": "dubbo-sa",
+ "serviceAccountName": "dubbo-sa",
+ "terminationGracePeriodSeconds": 30,
+ "tolerations": [
+ {
+ "effect": "NoExecute",
+ "key": "node.kubernetes.io/not-ready",
+ "operator": "Exists",
+ "tolerationSeconds": 300
+ },
+ {
+ "effect": "NoExecute",
+ "key": "node.kubernetes.io/unreachable",
+ "operator": "Exists",
+ "tolerationSeconds": 300
+ }
+ ],
+ "volumes": [
+ {
+ "name": "dubbo-sa-token-l2lzh",
+ "secret": {
+ "defaultMode": 420,
+ "secretName": "dubbo-sa-token-l2lzh"
+ }
+ }
+ ]
+ },
+ "status": {
+ "conditions": [
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:38:57Z",
+ "status": "True",
+ "type": "Initialized"
+ },
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:40:18Z",
+ "status": "True",
+ "type": "Ready"
+ },
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:40:18Z",
+ "status": "True",
+ "type": "ContainersReady"
+ },
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:38:57Z",
+ "status": "True",
+ "type": "PodScheduled"
+ }
+ ],
+ "containerStatuses": [
+ {
+ "containerID": "docker://2870d6abc19ca7fe22ca635ebcfac5d48c6d5550a659bafd74fb48104f6dfe3c",
+ "image": "registry.cn-hangzhou.aliyuncs.com/scottwang/dubbogo-client:latest",
+ "imageID": "docker-pullable://registry.cn-hangzhou.aliyuncs.com/scottwang/dubbogo-client@sha256:1f075131f708a0d400339e81549d7c4d4ed917ab0b6bd38ef458dd06ad25a559",
+ "lastState": {},
+ "name": "client",
+ "ready": true,
+ "restartCount": 0,
+ "state": {
+ "running": {
+ "startedAt": "2020-03-13T03:40:17Z"
+ }
+ }
+ }
+ ],
+ "hostIP": "10.0.2.15",
+ "phase": "Running",
+ "podIP": "172.17.0.8",
+ "qosClass": "BestEffort",
+ "startTime": "2020-03-13T03:38:57Z"
+ }
+}
+`
+
+func Test_DataChange(t *testing.T) {
+ listener := NewRegistryDataListener(&MockDataListener{})
+ url, _ := common.NewURL("jsonrpc%3A%2F%2F127.0.0.1%3A20001%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26app.version%3D0.0.1%26application%3DBDTService%26category%3Dproviders%26cluster%3Dfailover%26dubbo%3Ddubbo-provider-golang-2.6.0%26environment%3Ddev%26group%3D%26interface%3Dcom.ikurento.user.UserProvider%26ip%3D10.32.20.124%26loadbalance%3Drandom%26methods.GetUser.loadbalance%3Drandom%26methods.GetUser.retries%3D1%26methods.GetUser.weight%3D0%26module%3Ddubbogo%2Buser-info%2Bserver%26name%3DBDTService%26organization%3Dikurento.com%26owner%3DZX%26pid%3D74500%26retries%3D0%26service.filter%3Decho%26side%3Dprovider%26timestamp%3D1560155407%26version%3D%26warmup%3D100")
+ listener.AddInterestedURL(&url)
+ int := listener.DataChange(remoting.Event{Path: "/dubbo/com.ikurento.user.UserProvider/providers/jsonrpc%3A%2F%2F127.0.0.1%3A20001%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26app.version%3D0.0.1%26application%3DBDTService%26category%3Dproviders%26cluster%3Dfailover%26dubbo%3Ddubbo-provider-golang-2.6.0%26environment%3Ddev%26group%3D%26interface%3Dcom.ikurento.user.UserProvider%26ip%3D10.32.20.124%26loadbalance%3Drandom%26methods.GetUser.loadbalance%3Drandom%26methods.GetUser.retries%3D1%26methods.GetUser.weight%3D0%26module%3Ddubbogo%2Buser-info%2Bserver%26name%3DBDTService%26organization%3Dikurento.com%26owner%3DZX%26pid%3D74500%26retries%3D0%26service.filter%3Decho%26side%3Dprovider%26timestamp%3D1560155407%26version%3D%26warmup%3D100"})
+ assert.Equal(t, true, int)
+}
+
+type MockDataListener struct{}
+
+func (*MockDataListener) Process(configType *config_center.ConfigChangeEvent) {}
+
+type KubernetesRegistryTestSuite struct {
+ suite.Suite
+
+ currentPod v1.Pod
+}
+
+func (s *KubernetesRegistryTestSuite) initRegistry() *kubernetesRegistry {
+
+ t := s.T()
+
+ regurl, err := common.NewURL("registry://127.0.0.1:443", common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ mock, err := newMockKubernetesRegistry(®url, s.currentPod.GetNamespace(), func() (kubernetes.Interface, error) {
+
+ out := fake.NewSimpleClientset()
+
+ // mock current pod
+ if _, err := out.CoreV1().Pods(s.currentPod.GetNamespace()).Create(&s.currentPod); err != nil {
+ t.Fatal(err)
+ }
+ return out, nil
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ time.Sleep(time.Second)
+ return mock.(*kubernetesRegistry)
+}
+
+func (s *KubernetesRegistryTestSuite) SetupSuite() {
+
+ t := s.T()
+
+ const (
+ // kubernetes inject the var
+ podNameKey = "HOSTNAME"
+ nameSpaceKey = "NAMESPACE"
+ )
+
+ // 1. install test data
+ if err := json.Unmarshal([]byte(clientPodJsonData), &s.currentPod); err != nil {
+ t.Fatal(err)
+ }
+
+ // 2. set downward-api inject env
+ if err := os.Setenv(podNameKey, s.currentPod.GetName()); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Setenv(nameSpaceKey, s.currentPod.GetNamespace()); err != nil {
+ t.Fatal(err)
+ }
+
+}
+
+func (s *KubernetesRegistryTestSuite) TestDataChange() {
+
+ t := s.T()
+
+ listener := NewRegistryDataListener(&MockDataListener{})
+ url, _ := common.NewURL("jsonrpc%3A%2F%2F127.0.0.1%3A20001%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26app.version%3D0.0.1%26application%3DBDTService%26category%3Dproviders%26cluster%3Dfailover%26dubbo%3Ddubbo-provider-golang-2.6.0%26environment%3Ddev%26group%3D%26interface%3Dcom.ikurento.user.UserProvider%26ip%3D10.32.20.124%26loadbalance%3Drandom%26methods.GetUser.loadbalance%3Drandom%26methods.GetUser.retries%3D1%26methods.GetUser.weight%3D0%26module%3Ddubbogo%2Buser-info%2Bserver%26name%3DBDTService%26organization%3Dikurento.com%26owner%3DZX%26pid%3D74500%26retries%3D0%26service.filter%3Decho%26side%3Dprovider%26timestamp%3D1560155407%26version%3D%26warmup%3D100")
+ listener.AddInterestedURL(&url)
+ if !listener.DataChange(remoting.Event{Path: "/dubbo/com.ikurento.user.UserProvider/providers/jsonrpc%3A%2F%2F127.0.0.1%3A20001%2Fcom.ikurento.user.UserProvider%3Fanyhost%3Dtrue%26app.version%3D0.0.1%26application%3DBDTService%26category%3Dproviders%26cluster%3Dfailover%26dubbo%3Ddubbo-provider-golang-2.6.0%26environment%3Ddev%26group%3D%26interface%3Dcom.ikurento.user.UserProvider%26ip%3D10.32.20.124%26loadbalance%3Drandom%26methods.GetUser.loadbalance%3Drandom%26methods.GetUser.retries%3D1%26methods.GetUser.weight%3D0%26module%3Ddubbogo%2Buser-info%2Bserver%26name%3DBDTService%26organization%3Dikurento.com%26owner%3DZX%26pid%3D74500%26retries%3D0%26service.filter%3Decho%26side%3Dprovider%26timestamp%3D1560155407%26version%3D%26warmup%3D100"}) {
+ t.Fatal("data change not ok")
+ }
+}
+
+func TestKubernetesRegistrySuite(t *testing.T) {
+ suite.Run(t, &KubernetesRegistryTestSuite{})
+}
diff --git a/registry/kubernetes/registry.go b/registry/kubernetes/registry.go
new file mode 100644
index 0000000000000000000000000000000000000000..7212a83d63b34cc08f193994f004efccf9e21a0c
--- /dev/null
+++ b/registry/kubernetes/registry.go
@@ -0,0 +1,237 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "fmt"
+ "os"
+ "path"
+ "strings"
+ "sync"
+ "time"
+)
+
+import (
+ "github.com/dubbogo/getty"
+ "github.com/dubbogo/gost/net"
+ perrors "github.com/pkg/errors"
+ k8s "k8s.io/client-go/kubernetes"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+ "github.com/apache/dubbo-go/common/extension"
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/registry"
+ "github.com/apache/dubbo-go/remoting/kubernetes"
+)
+
+var (
+ processID = ""
+ localIP = ""
+)
+
+const (
+ Name = "kubernetes"
+ ConnDelay = 3
+ MaxFailTimes = 15
+)
+
+func init() {
+ processID = fmt.Sprintf("%d", os.Getpid())
+ localIP, _ = gxnet.GetLocalIP()
+ extension.SetRegistry(Name, newKubernetesRegistry)
+}
+
+type kubernetesRegistry struct {
+ registry.BaseRegistry
+ cltLock sync.RWMutex
+ client *kubernetes.Client
+ listenerLock sync.Mutex
+ listener *kubernetes.EventListener
+ dataListener *dataListener
+ configListener *configurationListener
+}
+
+func (r *kubernetesRegistry) Client() *kubernetes.Client {
+ r.cltLock.RLock()
+ client := r.client
+ r.cltLock.RUnlock()
+ return client
+}
+func (r *kubernetesRegistry) SetClient(client *kubernetes.Client) {
+ r.cltLock.Lock()
+ r.client = client
+ r.cltLock.Unlock()
+}
+
+func (r *kubernetesRegistry) CloseAndNilClient() {
+ r.client.Close()
+ r.client = nil
+}
+
+func (r *kubernetesRegistry) CloseListener() {
+
+ r.cltLock.Lock()
+ l := r.configListener
+ r.cltLock.Unlock()
+ if l != nil {
+ l.Close()
+ }
+ r.configListener = nil
+}
+
+func (r *kubernetesRegistry) CreatePath(k string) error {
+ if err := r.client.Create(k, ""); err != nil {
+ return perrors.WithMessagef(err, "create path %s in kubernetes", k)
+ }
+ return nil
+}
+
+func (r *kubernetesRegistry) DoRegister(root string, node string) error {
+ return r.client.Create(path.Join(root, node), "")
+}
+
+func (r *kubernetesRegistry) DoSubscribe(svc *common.URL) (registry.Listener, error) {
+
+ var (
+ configListener *configurationListener
+ )
+
+ r.listenerLock.Lock()
+ configListener = r.configListener
+ r.listenerLock.Unlock()
+ if r.listener == nil {
+ r.cltLock.Lock()
+ client := r.client
+ r.cltLock.Unlock()
+ if client == nil {
+ return nil, perrors.New("kubernetes client broken")
+ }
+
+ r.listenerLock.Lock()
+ if r.listener == nil {
+ // double check
+ r.listener = kubernetes.NewEventListener(r.client)
+ }
+ r.listenerLock.Unlock()
+ }
+
+ //register the svc to dataListener
+ r.dataListener.AddInterestedURL(svc)
+ for _, v := range strings.Split(svc.GetParam(constant.CATEGORY_KEY, constant.DEFAULT_CATEGORY), ",") {
+ go r.listener.ListenServiceEvent(fmt.Sprintf("/dubbo/%s/"+v, svc.Service()), r.dataListener)
+ }
+
+ return configListener, nil
+}
+
+func (r *kubernetesRegistry) InitListeners() {
+ r.listener = kubernetes.NewEventListener(r.client)
+ r.configListener = NewConfigurationListener(r)
+ r.dataListener = NewRegistryDataListener(r.configListener)
+}
+
+func newKubernetesRegistry(url *common.URL) (registry.Registry, error) {
+
+ // actually, kubernetes use in-cluster config,
+ r := &kubernetesRegistry{}
+
+ r.InitBaseRegistry(url, r)
+
+ if err := kubernetes.ValidateClient(r); err != nil {
+ return nil, perrors.WithStack(err)
+ }
+
+ r.WaitGroup().Add(1)
+ go r.HandleClientRestart()
+ r.InitListeners()
+
+ logger.Debugf("the kubernetes registry started")
+
+ return r, nil
+}
+
+func newMockKubernetesRegistry(
+ url *common.URL,
+ namespace string,
+ clientGeneratorFunc func() (k8s.Interface, error),
+) (registry.Registry, error) {
+
+ var err error
+
+ r := &kubernetesRegistry{}
+
+ r.InitBaseRegistry(url, r)
+ r.client, err = kubernetes.NewMockClient(namespace, clientGeneratorFunc)
+ if err != nil {
+ return nil, perrors.WithMessage(err, "new mock client")
+ }
+ r.InitListeners()
+ return r, nil
+}
+
+func (r *kubernetesRegistry) HandleClientRestart() {
+
+ var (
+ err error
+ failTimes int
+ )
+
+ defer r.WaitGroup()
+LOOP:
+ for {
+ select {
+ case <-r.Done():
+ logger.Warnf("(KubernetesProviderRegistry)reconnectKubernetes goroutine exit now...")
+ break LOOP
+ // re-register all services
+ case <-r.Client().Done():
+ r.Client().Close()
+ r.SetClient(nil)
+
+ // try to connect to kubernetes,
+ failTimes = 0
+ for {
+ select {
+ case <-r.Done():
+ logger.Warnf("(KubernetesProviderRegistry)reconnectKubernetes Registry goroutine exit now...")
+ break LOOP
+ case <-getty.GetTimeWheel().After(timeSecondDuration(failTimes * ConnDelay)): // avoid connect frequent
+ }
+ err = kubernetes.ValidateClient(r)
+ logger.Infof("Kubernetes ProviderRegistry.validateKubernetesClient = error{%#v}", perrors.WithStack(err))
+
+ if err == nil {
+ if r.RestartCallBack() {
+ break
+ }
+ }
+ failTimes++
+ if MaxFailTimes <= failTimes {
+ failTimes = MaxFailTimes
+ }
+ }
+ }
+ }
+}
+
+func timeSecondDuration(sec int) time.Duration {
+ return time.Duration(sec) * time.Second
+}
diff --git a/registry/kubernetes/registry_test.go b/registry/kubernetes/registry_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..ea6d7663a9ceeab241c7a94a91f94288ab2990fc
--- /dev/null
+++ b/registry/kubernetes/registry_test.go
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "strconv"
+ "time"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+import (
+ "github.com/apache/dubbo-go/common"
+ "github.com/apache/dubbo-go/common/constant"
+)
+
+func (s *KubernetesRegistryTestSuite) TestRegister() {
+
+ t := s.T()
+
+ r := s.initRegistry()
+ defer r.Destroy()
+
+ url, _ := common.NewURL(
+ "dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider",
+ common.WithParamsValue(constant.CLUSTER_KEY, "mock"),
+ common.WithMethods([]string{"GetUser", "AddUser"}),
+ )
+
+ err := r.Register(url)
+ assert.NoError(t, err)
+ _, _, err = r.client.GetChildren("/dubbo/com.ikurento.user.UserProvider/providers")
+ if err != nil {
+ t.Fatal(err)
+ }
+}
+
+func (s *KubernetesRegistryTestSuite) TestSubscribe() {
+
+ t := s.T()
+
+ r := s.initRegistry()
+ defer r.Destroy()
+
+ url, _ := common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider", common.WithParamsValue(constant.CLUSTER_KEY, "mock"), common.WithMethods([]string{"GetUser", "AddUser"}))
+
+ listener, err := r.DoSubscribe(&url)
+ if err != nil {
+ t.Fatal(err)
+ }
+ time.Sleep(1e9)
+
+ go func() {
+ err := r.Register(url)
+ if err != nil {
+ t.Fatal(err)
+ }
+ }()
+
+ serviceEvent, err := listener.Next()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ t.Logf("got event %s", serviceEvent)
+}
+
+func (s *KubernetesRegistryTestSuite) TestConsumerDestroy() {
+
+ t := s.T()
+
+ r := s.initRegistry()
+
+ url, _ := common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider",
+ common.WithParamsValue(constant.CLUSTER_KEY, "mock"),
+ common.WithMethods([]string{"GetUser", "AddUser"}))
+
+ _, err := r.DoSubscribe(&url)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ //listener.Close()
+ time.Sleep(1e9)
+ r.Destroy()
+
+ assert.Equal(t, false, r.IsAvailable())
+
+}
+
+func (s *KubernetesRegistryTestSuite) TestProviderDestroy() {
+
+ t := s.T()
+
+ r := s.initRegistry()
+
+ url, _ := common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider",
+ common.WithParamsValue(constant.CLUSTER_KEY, "mock"),
+ common.WithMethods([]string{"GetUser", "AddUser"}))
+ err := r.Register(url)
+ assert.NoError(t, err)
+
+ time.Sleep(1e9)
+ r.Destroy()
+ assert.Equal(t, false, r.IsAvailable())
+}
+
+func (s *KubernetesRegistryTestSuite) TestNewRegistry() {
+
+ t := s.T()
+
+ regUrl, err := common.NewURL("registry://127.0.0.1:443",
+ common.WithParamsValue(constant.ROLE_KEY, strconv.Itoa(common.PROVIDER)))
+ if err != nil {
+ t.Fatal(err)
+ }
+ _, err = newKubernetesRegistry(®Url)
+ if err == nil {
+ t.Fatal("not in cluster, should be a err")
+ }
+}
+
+func (s *KubernetesRegistryTestSuite) TestHandleClientRestart() {
+
+ r := s.initRegistry()
+ r.WaitGroup().Add(1)
+ go r.HandleClientRestart()
+ time.Sleep(timeSecondDuration(1))
+ r.client.Close()
+}
diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go
index fe8e42db9f39190e34142149a6b67c9638a84ed2..bef1760e04fd6597721fd19b5d19820f45ed2bf0 100644
--- a/registry/zookeeper/listener.go
+++ b/registry/zookeeper/listener.go
@@ -43,7 +43,7 @@ type RegistryDataListener struct {
// NewRegistryDataListener ...
func NewRegistryDataListener(listener config_center.ConfigurationListener) *RegistryDataListener {
- return &RegistryDataListener{listener: listener, interestedURL: []*common.URL{}}
+ return &RegistryDataListener{listener: listener}
}
// AddInterestedURL ...
@@ -65,13 +65,19 @@ func (l *RegistryDataListener) DataChange(eventType remoting.Event) bool {
logger.Errorf("Listen NewURL(r{%s}) = error{%v} eventType.Path={%v}", url, err, eventType.Path)
return false
}
+
for _, v := range l.interestedURL {
if serviceURL.URLEqual(*v) {
- l.listener.Process(&config_center.ConfigChangeEvent{Value: serviceURL, ConfigType: eventType.Action})
+ l.listener.Process(
+ &config_center.ConfigChangeEvent{
+ Key: eventType.Path,
+ Value: serviceURL,
+ ConfigType: eventType.Action,
+ },
+ )
return true
}
}
-
return false
}
diff --git a/remoting/etcdv3/client_test.go b/remoting/etcdv3/client_test.go
index d9166fc8eac78b8d1c5a93f05b7cf5fc9705e10f..895cc2954adf93b5899d0ae5daedbd35834b7ef4 100644
--- a/remoting/etcdv3/client_test.go
+++ b/remoting/etcdv3/client_test.go
@@ -18,8 +18,8 @@
package etcdv3
import (
- "fmt"
"net/url"
+ "os"
"path"
"reflect"
"strings"
@@ -37,6 +37,8 @@ import (
"google.golang.org/grpc/connectivity"
)
+const defaultEtcdV3WorkDir = "/tmp/default-dubbo-go-remote.etcd"
+
// tests dataset
var tests = []struct {
input struct {
@@ -92,7 +94,7 @@ func (suite *ClientTestSuite) SetupSuite() {
cfg := embed.NewConfig()
cfg.LPUrls = []url.URL{*lpurl}
cfg.LCUrls = []url.URL{*lcurl}
- cfg.Dir = "/tmp/default.etcd"
+ cfg.Dir = defaultEtcdV3WorkDir
e, err := embed.StartEtcd(cfg)
if err != nil {
t.Fatal(err)
@@ -112,6 +114,9 @@ func (suite *ClientTestSuite) SetupSuite() {
// stop etcd server
func (suite *ClientTestSuite) TearDownSuite() {
suite.etcd.Close()
+ if err := os.RemoveAll(defaultEtcdV3WorkDir); err != nil {
+ suite.FailNow(err.Error())
+ }
}
func (suite *ClientTestSuite) setUpClient() *Client {
@@ -135,8 +140,6 @@ func (suite *ClientTestSuite) SetupTest() {
func (suite *ClientTestSuite) TestClientClose() {
- fmt.Println("called client close")
-
c := suite.client
t := suite.T()
@@ -148,8 +151,6 @@ func (suite *ClientTestSuite) TestClientClose() {
func (suite *ClientTestSuite) TestClientValid() {
- fmt.Println("called client valid")
-
c := suite.client
t := suite.T()
diff --git a/remoting/etcdv3/listener.go b/remoting/etcdv3/listener.go
index a51a68bce78f4f24658f96dac5dc8778a07a6d9a..e3cb74e4f676efa1f325ac45e32b21b39d1bbd6a 100644
--- a/remoting/etcdv3/listener.go
+++ b/remoting/etcdv3/listener.go
@@ -53,7 +53,6 @@ func NewEventListener(client *Client) *EventListener {
// this method will return true when spec key deleted,
// this method will return false when deep layer connection lose
func (l *EventListener) ListenServiceNodeEvent(key string, listener ...remoting.DataListener) bool {
- l.wg.Add(1)
defer l.wg.Done()
for {
wc, err := l.client.Watch(key)
@@ -138,8 +137,6 @@ func (l *EventListener) handleEvents(event *clientv3.Event, listeners ...remotin
// ListenServiceNodeEventWithPrefix Listen on a set of key with spec prefix
func (l *EventListener) ListenServiceNodeEventWithPrefix(prefix string, listener ...remoting.DataListener) {
-
- l.wg.Add(1)
defer l.wg.Done()
for {
wc, err := l.client.WatchWithPrefix(prefix)
@@ -202,7 +199,7 @@ func (l *EventListener) ListenServiceEvent(key string, listener remoting.DataLis
keyList, valueList, err := l.client.getChildren(key)
if err != nil {
- logger.Errorf("Get new node path {%v} 's content error,message is {%v}", key, perrors.WithMessage(err, "get children"))
+ logger.Warnf("Get new node path {%v} 's content error,message is {%v}", key, perrors.WithMessage(err, "get children"))
}
logger.Infof("get key children list %s, keys %v values %v", key, keyList, valueList)
@@ -217,12 +214,14 @@ func (l *EventListener) ListenServiceEvent(key string, listener remoting.DataLis
}
logger.Infof("listen dubbo provider key{%s} event and wait to get all provider etcdv3 nodes", key)
+ l.wg.Add(1)
go func(key string, listener remoting.DataListener) {
l.ListenServiceNodeEventWithPrefix(key, listener)
logger.Warnf("listenDirEvent(key{%s}) goroutine exit now", key)
}(key, listener)
logger.Infof("listen dubbo service key{%s}", key)
+ l.wg.Add(1)
go func(key string) {
if l.ListenServiceNodeEvent(key) {
listener.DataChange(remoting.Event{Path: key, Action: remoting.EventTypeDel})
diff --git a/remoting/kubernetes/client.go b/remoting/kubernetes/client.go
new file mode 100644
index 0000000000000000000000000000000000000000..0c9ffd2b914e6ad584023725867a3aaa4b641224
--- /dev/null
+++ b/remoting/kubernetes/client.go
@@ -0,0 +1,692 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "context"
+ "encoding/base64"
+ "encoding/json"
+ "os"
+ "sync"
+ "time"
+)
+
+import (
+ perrors "github.com/pkg/errors"
+ "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/fields"
+ "k8s.io/apimachinery/pkg/types"
+ "k8s.io/apimachinery/pkg/util/strategicpatch"
+ "k8s.io/apimachinery/pkg/watch"
+ "k8s.io/client-go/kubernetes"
+ "k8s.io/client-go/rest"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/logger"
+)
+
+const (
+ // kubernetes inject the var
+ podNameKey = "HOSTNAME"
+ nameSpaceKey = "NAMESPACE"
+ // all pod annotation key
+ DubboIOAnnotationKey = "dubbo.io/annotation"
+
+ DubboIOLabelKey = "dubbo.io/label"
+ DubboIOLabelValue = "dubbo.io-value"
+)
+
+var (
+ ErrDubboLabelAlreadyExist = perrors.New("dubbo label already exist")
+)
+
+type Client struct {
+
+ // kubernetes connection config
+ cfg *rest.Config
+
+ // the kubernetes interface
+ rawClient kubernetes.Interface
+
+ // current pod config
+ currentPodName string
+
+ ns string
+
+ // current resource version
+ lastResourceVersion string
+
+ // the memory watcherSet
+ watcherSet WatcherSet
+
+ // protect the wg && currentPod
+ lock sync.RWMutex
+ // current pod status
+ currentPod *v1.Pod
+ // protect the watchPods loop && watcher
+ wg sync.WaitGroup
+
+ // manage the client lifecycle
+ ctx context.Context
+ cancel context.CancelFunc
+}
+
+// load CurrentPodName
+func getCurrentPodName() (string, error) {
+
+ v := os.Getenv(podNameKey)
+ if len(v) == 0 {
+ return "", perrors.New("read value from env by key (HOSTNAME)")
+ }
+ return v, nil
+}
+
+// load CurrentNameSpace
+func getCurrentNameSpace() (string, error) {
+
+ v := os.Getenv(nameSpaceKey)
+ if len(v) == 0 {
+ return "", perrors.New("read value from env by key (NAMESPACE)")
+ }
+ return v, nil
+}
+
+// NewMockClient
+// export for registry package test
+func NewMockClient(namespace string, mockClientGenerator func() (kubernetes.Interface, error)) (*Client, error) {
+ return newMockClient(namespace, mockClientGenerator)
+}
+
+// newMockClient
+// new a client for test
+func newMockClient(namespace string, mockClientGenerator func() (kubernetes.Interface, error)) (*Client, error) {
+
+ rawClient, err := mockClientGenerator()
+ if err != nil {
+ return nil, perrors.WithMessage(err, "call mock generator")
+ }
+
+ currentPodName, err := getCurrentPodName()
+ if err != nil {
+ return nil, perrors.WithMessage(err, "get pod name")
+ }
+
+ ctx, cancel := context.WithCancel(context.Background())
+
+ c := &Client{
+ currentPodName: currentPodName,
+ ns: namespace,
+ rawClient: rawClient,
+ ctx: ctx,
+ watcherSet: newWatcherSet(ctx),
+ cancel: cancel,
+ }
+
+ currentPod, err := c.initCurrentPod()
+ if err != nil {
+ return nil, perrors.WithMessage(err, "init current pod")
+ }
+
+ // record current status
+ c.currentPod = currentPod
+
+ // init the watcherSet by current pods
+ if err := c.initWatchSet(); err != nil {
+ return nil, perrors.WithMessage(err, "init watcherSet")
+ }
+
+ c.lastResourceVersion = c.currentPod.GetResourceVersion()
+
+ // start kubernetes watch loop
+ if err := c.watchPods(); err != nil {
+ return nil, perrors.WithMessage(err, "watch pods")
+ }
+
+ logger.Infof("init kubernetes registry client success @namespace = %q @Podname = %q", namespace, c.currentPod.Name)
+ return c, nil
+}
+
+// newClient
+// new a client for registry
+func newClient(namespace string) (*Client, error) {
+
+ cfg, err := rest.InClusterConfig()
+ if err != nil {
+ return nil, perrors.WithMessage(err, "get in-cluster config")
+ }
+
+ rawClient, err := kubernetes.NewForConfig(cfg)
+ if err != nil {
+ return nil, perrors.WithMessage(err, "new kubernetes client by in cluster config")
+ }
+
+ currentPodName, err := getCurrentPodName()
+ if err != nil {
+ return nil, perrors.WithMessage(err, "get pod name")
+ }
+
+ ctx, cancel := context.WithCancel(context.Background())
+
+ c := &Client{
+ currentPodName: currentPodName,
+ ns: namespace,
+ cfg: cfg,
+ rawClient: rawClient,
+ ctx: ctx,
+ watcherSet: newWatcherSet(ctx),
+ cancel: cancel,
+ }
+
+ currentPod, err := c.initCurrentPod()
+ if err != nil {
+ return nil, perrors.WithMessage(err, "init current pod")
+ }
+
+ // record current status
+ c.currentPod = currentPod
+
+ // init the watcherSet by current pods
+ if err := c.initWatchSet(); err != nil {
+ return nil, perrors.WithMessage(err, "init watcherSet")
+ }
+
+ // start kubernetes watch loop
+ if err := c.watchPods(); err != nil {
+ return nil, perrors.WithMessage(err, "watch pods")
+ }
+
+ logger.Infof("init kubernetes registry client success @namespace = %q @Podname = %q", namespace, c.currentPod.Name)
+ return c, nil
+}
+
+// initCurrentPod
+// 1. get current pod
+// 2. give the dubbo-label for this pod
+func (c *Client) initCurrentPod() (*v1.Pod, error) {
+
+ // read the current pod status
+ currentPod, err := c.rawClient.CoreV1().Pods(c.ns).Get(c.currentPodName, metav1.GetOptions{})
+ if err != nil {
+ return nil, perrors.WithMessagef(err, "get current (%s) pod in namespace (%s)", c.currentPodName, c.ns)
+ }
+
+ oldPod, newPod, err := c.assembleDUBBOLabel(currentPod)
+ if err != nil {
+ if err != ErrDubboLabelAlreadyExist {
+ return nil, perrors.WithMessage(err, "assemble dubbo label")
+ }
+ // current pod don't have label
+ }
+
+ p, err := c.getPatch(oldPod, newPod)
+ if err != nil {
+ return nil, perrors.WithMessage(err, "get patch")
+ }
+
+ currentPod, err = c.patchCurrentPod(p)
+ if err != nil {
+ return nil, perrors.WithMessage(err, "patch to current pod")
+ }
+
+ return currentPod, nil
+}
+
+// initWatchSet
+// 1. get all with dubbo label pods
+// 2. put every element to watcherSet
+func (c *Client) initWatchSet() error {
+
+ pods, err := c.rawClient.CoreV1().Pods(c.ns).List(metav1.ListOptions{
+ LabelSelector: fields.OneTermEqualSelector(DubboIOLabelKey, DubboIOLabelValue).String(),
+ })
+ if err != nil {
+ return perrors.WithMessagef(err, "list pods in namespace (%s)", c.ns)
+ }
+
+ // set resource version
+ c.lastResourceVersion = pods.GetResourceVersion()
+
+ for _, pod := range pods.Items {
+ logger.Debugf("got the pod (name: %s), (label: %v), (annotations: %v)", pod.Name, pod.GetLabels(), pod.GetAnnotations())
+ c.handleWatchedPodEvent(&pod, watch.Added)
+ }
+
+ return nil
+}
+
+// watchPods
+// try to watch kubernetes pods
+func (c *Client) watchPods() error {
+
+ // try once
+ watcher, err := c.rawClient.CoreV1().Pods(c.ns).Watch(metav1.ListOptions{
+ LabelSelector: fields.OneTermEqualSelector(DubboIOLabelKey, DubboIOLabelValue).String(),
+ Watch: true,
+ ResourceVersion: c.lastResourceVersion,
+ })
+ if err != nil {
+ return perrors.WithMessagef(err, "try to watch the namespace (%s) pods", c.ns)
+ }
+
+ watcher.Stop()
+
+ c.wg.Add(1)
+ // add wg, grace close the client
+ go c.watchPodsLoop()
+ return nil
+}
+
+type resourceVersionGetter interface {
+ GetResourceVersion() string
+}
+
+// watchPods
+// try to notify
+func (c *Client) watchPodsLoop() {
+
+ defer func() {
+ // notify other goroutine, this loop over
+ c.wg.Done()
+ logger.Info("watchPodsLoop goroutine game over")
+ }()
+
+ for {
+ onceWatch:
+ wc, err := c.rawClient.CoreV1().Pods(c.ns).Watch(metav1.ListOptions{
+ LabelSelector: fields.OneTermEqualSelector(DubboIOLabelKey, DubboIOLabelValue).String(),
+ Watch: true,
+ ResourceVersion: c.lastResourceVersion,
+ })
+ if err != nil {
+ logger.Warnf("watch the namespace (%s) pods: %v, retry after 2 seconds", c.ns, err)
+ time.Sleep(2 * time.Second)
+ continue
+ }
+
+ logger.Infof("the old kubernetes client broken, collect the resource status from resource version (%s)", c.lastResourceVersion)
+
+ for {
+ select {
+ // double check ctx
+ case <-c.ctx.Done():
+ logger.Infof("the kubernetes client stopped, resultChan len %d", len(wc.ResultChan()))
+ return
+
+ // get one element from result-chan
+ case event, ok := <-wc.ResultChan():
+ if !ok {
+ wc.Stop()
+ logger.Info("kubernetes watch chan die, create new")
+ goto onceWatch
+ }
+
+ if event.Type == watch.Error {
+ // watched a error event
+ logger.Warnf("kubernetes watch api report err (%#v)", event)
+ continue
+ }
+
+ o, ok := event.Object.(resourceVersionGetter)
+ if !ok {
+ logger.Warnf("kubernetes response object not a versioned object, its real type %T", event.Object)
+ continue
+ }
+
+ // record the last resource version avoid to sync all pod
+ c.lastResourceVersion = o.GetResourceVersion()
+ logger.Infof("kubernetes get the current resource version %v", c.lastResourceVersion)
+
+ // check event object type
+ p, ok := event.Object.(*v1.Pod)
+ if !ok {
+ logger.Warnf("kubernetes response object not a Pod, its real type %T", event.Object)
+ continue
+ }
+
+ logger.Debugf("kubernetes got pod %#v", p)
+ // handle the watched pod
+ go c.handleWatchedPodEvent(p, event.Type)
+ }
+ }
+ }
+}
+
+// handleWatchedPodEvent
+// handle watched pod event
+func (c *Client) handleWatchedPodEvent(p *v1.Pod, eventType watch.EventType) {
+
+ for ak, av := range p.GetAnnotations() {
+
+ // not dubbo interest annotation
+ if ak != DubboIOAnnotationKey {
+ continue
+ }
+
+ ol, err := c.unmarshalRecord(av)
+ if err != nil {
+ logger.Errorf("there a pod with dubbo annotation, but unmarshal dubbo value %v", err)
+ return
+ }
+
+ for _, o := range ol {
+
+ switch eventType {
+ case watch.Added:
+ // if pod is added, the record always be create
+ o.EventType = Create
+ case watch.Modified:
+ o.EventType = Update
+ case watch.Deleted:
+ o.EventType = Delete
+ default:
+ logger.Errorf("no valid kubernetes event-type (%s) ", eventType)
+ return
+ }
+
+ logger.Debugf("prepare to put object (%#v) to kubernetes-watcherSet", o)
+
+ if err := c.watcherSet.Put(o); err != nil {
+ logger.Errorf("put (%#v) to cache watcherSet: %v ", o, err)
+ return
+ }
+
+ }
+
+ }
+}
+
+// unmarshalRecord
+// unmarshal the kubernetes dubbo annotation value
+func (c *Client) unmarshalRecord(record string) ([]*WatcherEvent, error) {
+
+ if len(record) == 0 {
+ // []*WatcherEvent is nil.
+ return nil, nil
+ }
+
+ rawMsg, err := base64.URLEncoding.DecodeString(record)
+ if err != nil {
+ return nil, perrors.WithMessagef(err, "decode record (%s)", record)
+ }
+
+ var out []*WatcherEvent
+ if err := json.Unmarshal(rawMsg, &out); err != nil {
+ return nil, perrors.WithMessage(err, "decode json")
+ }
+ return out, nil
+}
+
+// marshalRecord
+// marshal the kubernetes dubbo annotation value
+func (c *Client) marshalRecord(ol []*WatcherEvent) (string, error) {
+
+ msg, err := json.Marshal(ol)
+ if err != nil {
+ return "", perrors.WithMessage(err, "json encode object list")
+ }
+ return base64.URLEncoding.EncodeToString(msg), nil
+}
+
+// readCurrentPod
+// read the current pod status from kubernetes api
+func (c *Client) readCurrentPod() (*v1.Pod, error) {
+
+ currentPod, err := c.rawClient.CoreV1().Pods(c.ns).Get(c.currentPodName, metav1.GetOptions{})
+ if err != nil {
+ return nil, perrors.WithMessagef(err, "get current (%s) pod in namespace (%s)", c.currentPodName, c.ns)
+ }
+ return currentPod, nil
+}
+
+// Create
+// create k/v pair in watcher-set
+func (c *Client) Create(k, v string) error {
+
+ // the read current pod must be lock, protect every
+ // create operation can be atomic
+ c.lock.Lock()
+ defer c.lock.Unlock()
+
+ // 1. accord old pod && (k, v) assemble new pod dubbo annotion v
+ // 2. get patch data
+ // 3. PATCH the pod
+ currentPod, err := c.readCurrentPod()
+ if err != nil {
+ return perrors.WithMessage(err, "read current pod")
+ }
+
+ oldPod, newPod, err := c.assembleDUBBOAnnotations(k, v, currentPod)
+ if err != nil {
+ return perrors.WithMessage(err, "assemble")
+ }
+
+ patchBytes, err := c.getPatch(oldPod, newPod)
+ if err != nil {
+ return perrors.WithMessage(err, "get patch")
+ }
+
+ updatedPod, err := c.patchCurrentPod(patchBytes)
+ if err != nil {
+ return perrors.WithMessage(err, "patch current pod")
+ }
+
+ c.currentPod = updatedPod
+ logger.Debugf("put the @key = %s @value = %s success", k, v)
+ // not update the watcherSet, the watcherSet should be write by the watchPodsLoop
+ return nil
+}
+
+// patch current pod
+// write new meta for current pod
+func (c *Client) patchCurrentPod(patch []byte) (*v1.Pod, error) {
+
+ updatedPod, err := c.rawClient.CoreV1().Pods(c.ns).Patch(c.currentPodName, types.StrategicMergePatchType, patch)
+ if err != nil {
+ return nil, perrors.WithMessage(err, "patch in kubernetes pod ")
+ }
+ return updatedPod, nil
+}
+
+// assemble the dubbo kubernetes label
+// every dubbo instance should be labeled spec {"dubbo.io/label":"dubbo.io/label-value"} label
+func (c *Client) assembleDUBBOLabel(currentPod *v1.Pod) (*v1.Pod, *v1.Pod, error) {
+
+ var (
+ oldPod = &v1.Pod{}
+ newPod = &v1.Pod{}
+ )
+
+ oldPod.Labels = make(map[string]string, 8)
+ newPod.Labels = make(map[string]string, 8)
+
+ if currentPod.GetLabels() != nil {
+
+ if currentPod.GetLabels()[DubboIOLabelKey] == DubboIOLabelValue {
+ // already have label
+ return nil, nil, ErrDubboLabelAlreadyExist
+ }
+ }
+
+ // copy current pod labels to oldPod && newPod
+ for k, v := range currentPod.GetLabels() {
+ oldPod.Labels[k] = v
+ newPod.Labels[k] = v
+ }
+ // assign new label for current pod
+ newPod.Labels[DubboIOLabelKey] = DubboIOLabelValue
+ return oldPod, newPod, nil
+}
+
+// assemble the dubbo kubernetes annotations
+// accord the current pod && (k,v) assemble the old-pod, new-pod
+func (c *Client) assembleDUBBOAnnotations(k, v string, currentPod *v1.Pod) (oldPod *v1.Pod, newPod *v1.Pod, err error) {
+
+ oldPod = &v1.Pod{}
+ newPod = &v1.Pod{}
+ oldPod.Annotations = make(map[string]string, 8)
+ newPod.Annotations = make(map[string]string, 8)
+
+ for k, v := range currentPod.GetAnnotations() {
+ oldPod.Annotations[k] = v
+ newPod.Annotations[k] = v
+ }
+
+ al, err := c.unmarshalRecord(oldPod.GetAnnotations()[DubboIOAnnotationKey])
+ if err != nil {
+ err = perrors.WithMessage(err, "unmarshal record")
+ return
+ }
+
+ newAnnotations, err := c.marshalRecord(append(al, &WatcherEvent{Key: k, Value: v}))
+ if err != nil {
+ err = perrors.WithMessage(err, "marshal record")
+ return
+ }
+
+ newPod.Annotations[DubboIOAnnotationKey] = newAnnotations
+ return
+}
+
+// getPatch
+// get the kubernetes pod patch bytes
+func (c *Client) getPatch(oldPod, newPod *v1.Pod) ([]byte, error) {
+
+ oldData, err := json.Marshal(oldPod)
+ if err != nil {
+ return nil, perrors.WithMessage(err, "marshal old pod")
+ }
+
+ newData, err := json.Marshal(newPod)
+ if err != nil {
+ return nil, perrors.WithMessage(err, "marshal newPod pod")
+ }
+
+ patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, v1.Pod{})
+ if err != nil {
+ return nil, perrors.WithMessage(err, "create two-way-merge-patch")
+ }
+ return patchBytes, nil
+}
+
+// GetChildren
+// get k children list from kubernetes-watcherSet
+func (c *Client) GetChildren(k string) ([]string, []string, error) {
+
+ objectList, err := c.watcherSet.Get(k, true)
+ if err != nil {
+ return nil, nil, perrors.WithMessagef(err, "get children from watcherSet on (%s)", k)
+ }
+
+ var kList []string
+ var vList []string
+
+ for _, o := range objectList {
+ kList = append(kList, o.Key)
+ vList = append(vList, o.Value)
+ }
+
+ return kList, vList, nil
+}
+
+// Watch
+// watch on spec key
+func (c *Client) Watch(k string) (<-chan *WatcherEvent, <-chan struct{}, error) {
+
+ w, err := c.watcherSet.Watch(k, false)
+ if err != nil {
+ return nil, nil, perrors.WithMessagef(err, "watch on (%s)", k)
+ }
+
+ return w.ResultChan(), w.done(), nil
+}
+
+// Watch
+// watch on spec prefix
+func (c *Client) WatchWithPrefix(prefix string) (<-chan *WatcherEvent, <-chan struct{}, error) {
+
+ w, err := c.watcherSet.Watch(prefix, true)
+ if err != nil {
+ return nil, nil, perrors.WithMessagef(err, "watch on prefix (%s)", prefix)
+ }
+
+ return w.ResultChan(), w.done(), nil
+}
+
+// Valid
+// Valid the client
+// if return false, the client is die
+func (c *Client) Valid() bool {
+
+ select {
+ case <-c.Done():
+ return false
+ default:
+ }
+ c.lock.RLock()
+ defer c.lock.RUnlock()
+ return c.rawClient != nil
+}
+
+// Done
+// read the client status
+func (c *Client) Done() <-chan struct{} {
+ return c.ctx.Done()
+}
+
+// Stop
+// read the client status
+func (c *Client) Close() {
+
+ select {
+ case <-c.ctx.Done():
+ //already stopped
+ return
+ default:
+ }
+ c.cancel()
+
+ // the client ctx be canceled
+ // will trigger the watcherSet watchers all stopped
+ // so, just wait
+ c.wg.Wait()
+}
+
+// ValidateClient
+// validate the kubernetes client
+func ValidateClient(container clientFacade) error {
+
+ client := container.Client()
+
+ // new Client
+ if client == nil || client.Valid() {
+ ns, err := getCurrentNameSpace()
+ if err != nil {
+ return perrors.WithMessage(err, "get current namespace")
+ }
+ newClient, err := newClient(ns)
+ if err != nil {
+ logger.Warnf("new kubernetes client (namespace{%s}: %v)", ns, err)
+ return perrors.WithMessagef(err, "new kubernetes client (:%+v)", ns)
+ }
+ container.SetClient(newClient)
+ }
+
+ return nil
+}
diff --git a/remoting/kubernetes/client_test.go b/remoting/kubernetes/client_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..342285b345b5e45682fe792d35f2f910e7d86d9d
--- /dev/null
+++ b/remoting/kubernetes/client_test.go
@@ -0,0 +1,513 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "encoding/json"
+ "fmt"
+ "net/http"
+ "os"
+ "runtime"
+ "strings"
+ "sync"
+ "testing"
+ "time"
+)
+
+import (
+ "github.com/stretchr/testify/suite"
+ v1 "k8s.io/api/core/v1"
+ "k8s.io/client-go/kubernetes"
+ "k8s.io/client-go/kubernetes/fake"
+)
+
+// tests dataset
+var tests = []struct {
+ input struct {
+ k string
+ v string
+ }
+}{
+ {input: struct {
+ k string
+ v string
+ }{k: "name", v: "scott.wang"}},
+ {input: struct {
+ k string
+ v string
+ }{k: "namePrefix", v: "prefix.scott.wang"}},
+ {input: struct {
+ k string
+ v string
+ }{k: "namePrefix1", v: "prefix1.scott.wang"}},
+ {input: struct {
+ k string
+ v string
+ }{k: "age", v: "27"}},
+}
+
+// test dataset prefix
+const prefix = "name"
+
+var clientPodJsonData = `{
+ "apiVersion": "v1",
+ "kind": "Pod",
+ "metadata": {
+ "annotations": {
+ "dubbo.io/annotation": "W3siayI6Ii9kdWJibyIsInYiOiIifSx7ImsiOiIvZHViYm8vY29tLmlrdXJlbnRvLnVzZXIuVXNlclByb3ZpZGVyIiwidiI6IiJ9LHsiayI6Ii9kdWJiby9jb20uaWt1cmVudG8udXNlci5Vc2VyUHJvdmlkZXIvY29uc3VtZXJzIiwidiI6IiJ9LHsiayI6Ii9kdWJibyIsInYiOiIifSx7ImsiOiIvZHViYm8vY29tLmlrdXJlbnRvLnVzZXIuVXNlclByb3ZpZGVyIiwidiI6IiJ9LHsiayI6Ii9kdWJiby9jb20uaWt1cmVudG8udXNlci5Vc2VyUHJvdmlkZXIvcHJvdmlkZXJzIiwidiI6IiJ9LHsiayI6Ii9kdWJiby9jb20uaWt1cmVudG8udXNlci5Vc2VyUHJvdmlkZXIvY29uc3VtZXJzL2NvbnN1bWVyJTNBJTJGJTJGMTcyLjE3LjAuOCUyRlVzZXJQcm92aWRlciUzRmNhdGVnb3J5JTNEY29uc3VtZXJzJTI2ZHViYm8lM0RkdWJib2dvLWNvbnN1bWVyLTIuNi4wJTI2cHJvdG9jb2wlM0RkdWJibyIsInYiOiIifV0="
+ },
+ "creationTimestamp": "2020-03-13T03:38:57Z",
+ "labels": {
+ "dubbo.io/label": "dubbo.io-value"
+ },
+ "name": "client",
+ "namespace": "default",
+ "resourceVersion": "2449700",
+ "selfLink": "/api/v1/namespaces/default/pods/client",
+ "uid": "3ec394f5-dcc6-49c3-8061-57b4b2b41344"
+ },
+ "spec": {
+ "containers": [
+ {
+ "env": [
+ {
+ "name": "NAMESPACE",
+ "valueFrom": {
+ "fieldRef": {
+ "apiVersion": "v1",
+ "fieldPath": "metadata.namespace"
+ }
+ }
+ }
+ ],
+ "image": "registry.cn-hangzhou.aliyuncs.com/scottwang/dubbogo-client",
+ "imagePullPolicy": "Always",
+ "name": "client",
+ "resources": {},
+ "terminationMessagePath": "/dev/termination-log",
+ "terminationMessagePolicy": "File",
+ "volumeMounts": [
+ {
+ "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount",
+ "name": "dubbo-sa-token-l2lzh",
+ "readOnly": true
+ }
+ ]
+ }
+ ],
+ "dnsPolicy": "ClusterFirst",
+ "enableServiceLinks": true,
+ "nodeName": "minikube",
+ "priority": 0,
+ "restartPolicy": "Never",
+ "schedulerName": "default-scheduler",
+ "securityContext": {},
+ "serviceAccount": "dubbo-sa",
+ "serviceAccountName": "dubbo-sa",
+ "terminationGracePeriodSeconds": 30,
+ "tolerations": [
+ {
+ "effect": "NoExecute",
+ "key": "node.kubernetes.io/not-ready",
+ "operator": "Exists",
+ "tolerationSeconds": 300
+ },
+ {
+ "effect": "NoExecute",
+ "key": "node.kubernetes.io/unreachable",
+ "operator": "Exists",
+ "tolerationSeconds": 300
+ }
+ ],
+ "volumes": [
+ {
+ "name": "dubbo-sa-token-l2lzh",
+ "secret": {
+ "defaultMode": 420,
+ "secretName": "dubbo-sa-token-l2lzh"
+ }
+ }
+ ]
+ },
+ "status": {
+ "conditions": [
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:38:57Z",
+ "status": "True",
+ "type": "Initialized"
+ },
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:40:18Z",
+ "status": "True",
+ "type": "Ready"
+ },
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:40:18Z",
+ "status": "True",
+ "type": "ContainersReady"
+ },
+ {
+ "lastProbeTime": null,
+ "lastTransitionTime": "2020-03-13T03:38:57Z",
+ "status": "True",
+ "type": "PodScheduled"
+ }
+ ],
+ "containerStatuses": [
+ {
+ "containerID": "docker://2870d6abc19ca7fe22ca635ebcfac5d48c6d5550a659bafd74fb48104f6dfe3c",
+ "image": "registry.cn-hangzhou.aliyuncs.com/scottwang/dubbogo-client:latest",
+ "imageID": "docker-pullable://registry.cn-hangzhou.aliyuncs.com/scottwang/dubbogo-client@sha256:1f075131f708a0d400339e81549d7c4d4ed917ab0b6bd38ef458dd06ad25a559",
+ "lastState": {},
+ "name": "client",
+ "ready": true,
+ "restartCount": 0,
+ "state": {
+ "running": {
+ "startedAt": "2020-03-13T03:40:17Z"
+ }
+ }
+ }
+ ],
+ "hostIP": "10.0.2.15",
+ "phase": "Running",
+ "podIP": "172.17.0.8",
+ "qosClass": "BestEffort",
+ "startTime": "2020-03-13T03:38:57Z"
+ }
+}
+`
+
+type KubernetesClientTestSuite struct {
+ suite.Suite
+
+ currentPod v1.Pod
+}
+
+func (s *KubernetesClientTestSuite) initClient() *Client {
+
+ t := s.T()
+
+ client, err := newMockClient(s.currentPod.GetNamespace(), func() (kubernetes.Interface, error) {
+
+ out := fake.NewSimpleClientset()
+
+ // mock current pod
+ if _, err := out.CoreV1().Pods(s.currentPod.GetNamespace()).Create(&s.currentPod); err != nil {
+ t.Fatal(err)
+ }
+ return out, nil
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ time.Sleep(time.Second)
+ return client
+}
+
+func (s *KubernetesClientTestSuite) SetupSuite() {
+
+ runtime.GOMAXPROCS(1)
+
+ t := s.T()
+
+ // 1. install test data
+ if err := json.Unmarshal([]byte(clientPodJsonData), &s.currentPod); err != nil {
+ t.Fatal(err)
+ }
+
+ // 2. set downward-api inject env
+ if err := os.Setenv(podNameKey, s.currentPod.GetName()); err != nil {
+ t.Fatal(err)
+ }
+ if err := os.Setenv(nameSpaceKey, s.currentPod.GetNamespace()); err != nil {
+ t.Fatal(err)
+ }
+
+ go http.ListenAndServe(":6061", nil)
+
+}
+
+func (s *KubernetesClientTestSuite) TestReadCurrentPodName() {
+ t := s.T()
+
+ n, err := getCurrentPodName()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ if n != s.currentPod.GetName() {
+ t.Fatalf("expect %s but got %s", s.currentPod.GetName(), n)
+ }
+
+}
+func (s *KubernetesClientTestSuite) TestReadCurrentNameSpace() {
+ t := s.T()
+
+ ns, err := getCurrentNameSpace()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ if ns != s.currentPod.GetNamespace() {
+ t.Fatalf("expect %s but got %s", s.currentPod.GetNamespace(), ns)
+ }
+
+}
+func (s *KubernetesClientTestSuite) TestClientValid() {
+
+ t := s.T()
+
+ client := s.initClient()
+ defer client.Close()
+
+ if client.Valid() != true {
+ t.Fatal("client is not valid")
+ }
+
+ client.Close()
+ if client.Valid() != false {
+ t.Fatal("client is valid")
+ }
+}
+
+func (s *KubernetesClientTestSuite) TestClientDone() {
+
+ t := s.T()
+
+ client := s.initClient()
+
+ go func() {
+ time.Sleep(time.Second)
+ client.Close()
+ }()
+
+ <-client.Done()
+
+ if client.Valid() == true {
+ t.Fatal("client should be invalid then")
+ }
+}
+
+func (s *KubernetesClientTestSuite) TestClientCreateKV() {
+
+ t := s.T()
+
+ client := s.initClient()
+ defer client.Close()
+
+ for _, tc := range tests {
+
+ k := tc.input.k
+ v := tc.input.v
+
+ if err := client.Create(k, v); err != nil {
+ t.Fatal(err)
+ }
+
+ }
+}
+
+func (s *KubernetesClientTestSuite) TestClientGetChildrenKVList() {
+
+ t := s.T()
+
+ client := s.initClient()
+ defer client.Close()
+
+ wg := sync.WaitGroup{}
+ wg.Add(1)
+
+ syncDataComplete := make(chan struct{})
+
+ go func() {
+
+ wc, done, err := client.WatchWithPrefix(prefix)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ wg.Done()
+ i := 0
+
+ for {
+ select {
+ case e := <-wc:
+ i++
+ fmt.Printf("got event %v k %s v %s\n", e.EventType, e.Key, e.Value)
+ if i == 3 {
+ // already sync all event
+ syncDataComplete <- struct{}{}
+ return
+ }
+ case <-done:
+ t.Log("the watcherSet watcher was stopped")
+ return
+ }
+ }
+ }()
+
+ // wait the watch goroutine start
+ wg.Wait()
+
+ expect := make(map[string]string)
+ got := make(map[string]string)
+
+ for _, tc := range tests {
+
+ k := tc.input.k
+ v := tc.input.v
+
+ if strings.Contains(k, prefix) {
+ expect[k] = v
+ }
+
+ if err := client.Create(k, v); err != nil {
+ t.Fatal(err)
+ }
+ }
+
+ <-syncDataComplete
+
+ // start get all children
+ kList, vList, err := client.GetChildren(prefix)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ for i := 0; i < len(kList); i++ {
+ got[kList[i]] = vList[i]
+ }
+
+ for expectK, expectV := range expect {
+
+ if got[expectK] != expectV {
+ t.Fatalf("expect {%s: %s} but got {%s: %v}", expectK, expectV, expectK, got[expectK])
+ }
+ }
+
+}
+
+func (s *KubernetesClientTestSuite) TestClientWatchPrefix() {
+
+ t := s.T()
+
+ client := s.initClient()
+
+ wg := sync.WaitGroup{}
+ wg.Add(1)
+
+ go func() {
+
+ wc, done, err := client.WatchWithPrefix(prefix)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ wg.Done()
+
+ for {
+ select {
+ case e := <-wc:
+ t.Logf("got event %v k %s v %s", e.EventType, e.Key, e.Value)
+ case <-done:
+ t.Log("the watcherSet watcher was stopped")
+ return
+ }
+ }
+ }()
+
+ // must wait the watch goroutine work
+ wg.Wait()
+
+ for _, tc := range tests {
+
+ k := tc.input.k
+ v := tc.input.v
+
+ if err := client.Create(k, v); err != nil {
+ t.Fatal(err)
+ }
+ }
+
+ client.Close()
+}
+
+func (s *KubernetesClientTestSuite) TestNewClient() {
+
+ t := s.T()
+
+ _, err := newClient(s.currentPod.GetNamespace())
+ if err == nil {
+ t.Fatal("the out of cluster test should fail")
+ }
+
+}
+
+func (s *KubernetesClientTestSuite) TestClientWatch() {
+
+ t := s.T()
+
+ client := s.initClient()
+
+ wg := sync.WaitGroup{}
+ wg.Add(1)
+
+ go func() {
+
+ wc, done, err := client.Watch(prefix)
+ if err != nil {
+ t.Fatal(err)
+ }
+ wg.Done()
+
+ for {
+ select {
+ case e := <-wc:
+ t.Logf("got event %v k %s v %s", e.EventType, e.Key, e.Value)
+ case <-done:
+ t.Log("the watcherSet watcher was stopped")
+ return
+ }
+ }
+
+ }()
+
+ // must wait the watch goroutine already start the watch goroutine
+ wg.Wait()
+
+ for _, tc := range tests {
+
+ k := tc.input.k
+ v := tc.input.v
+
+ if err := client.Create(k, v); err != nil {
+ t.Fatal(err)
+ }
+ }
+
+ client.Close()
+}
+
+func TestKubernetesClient(t *testing.T) {
+ suite.Run(t, new(KubernetesClientTestSuite))
+}
diff --git a/remoting/kubernetes/facade.go b/remoting/kubernetes/facade.go
new file mode 100644
index 0000000000000000000000000000000000000000..dd15c918b45c353b8395e0b82aee82216f48cd0e
--- /dev/null
+++ b/remoting/kubernetes/facade.go
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+type clientFacade interface {
+ Client() *Client
+ SetClient(*Client)
+}
diff --git a/remoting/kubernetes/facade_test.go b/remoting/kubernetes/facade_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..024264ffdee14c2ad3fb01a8a5279084c0f085d9
--- /dev/null
+++ b/remoting/kubernetes/facade_test.go
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "sync"
+)
+import (
+ "k8s.io/client-go/kubernetes"
+ "k8s.io/client-go/kubernetes/fake"
+)
+
+type mockFacade struct {
+ client *Client
+ cltLock sync.Mutex
+ done chan struct{}
+}
+
+func (r *mockFacade) Client() *Client {
+ return r.client
+}
+
+func (r *mockFacade) SetClient(client *Client) {
+ r.client = client
+}
+
+func (s *KubernetesClientTestSuite) Test_Facade() {
+
+ t := s.T()
+
+ mockClient, err := newMockClient(s.currentPod.GetNamespace(), func() (kubernetes.Interface, error) {
+
+ out := fake.NewSimpleClientset()
+
+ // mock current pod
+ if _, err := out.CoreV1().Pods(s.currentPod.GetNamespace()).Create(&s.currentPod); err != nil {
+ t.Fatal(err)
+ }
+ return out, nil
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ m := &mockFacade{
+ client: mockClient,
+ }
+
+ if err := ValidateClient(m); err == nil {
+ t.Fatal("out of cluster should err")
+ }
+ mockClient.Close()
+}
diff --git a/remoting/kubernetes/listener.go b/remoting/kubernetes/listener.go
new file mode 100644
index 0000000000000000000000000000000000000000..4c198c66cc3e02006291a195af9d023ec5a02340
--- /dev/null
+++ b/remoting/kubernetes/listener.go
@@ -0,0 +1,217 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "sync"
+)
+
+import (
+ perrors "github.com/pkg/errors"
+)
+
+import (
+ "github.com/apache/dubbo-go/common/logger"
+ "github.com/apache/dubbo-go/remoting"
+)
+
+type EventListener struct {
+ client *Client
+ keyMapLock sync.RWMutex
+ keyMap map[string]struct{}
+ wg sync.WaitGroup
+}
+
+func NewEventListener(client *Client) *EventListener {
+ return &EventListener{
+ client: client,
+ keyMap: make(map[string]struct{}, 8),
+ }
+}
+
+// Listen on a spec key
+// this method will return true when spec key deleted,
+// this method will return false when deep layer connection lose
+func (l *EventListener) ListenServiceNodeEvent(key string, listener ...remoting.DataListener) bool {
+ defer l.wg.Done()
+ for {
+ wc, done, err := l.client.Watch(key)
+ if err != nil {
+ logger.Warnf("watch exist{key:%s} = error{%v}", key, err)
+ return false
+ }
+
+ select {
+
+ // client stopped
+ case <-l.client.Done():
+ logger.Warnf("kubernetes client stopped")
+ return false
+
+ // watcherSet watcher stopped
+ case <-done:
+ logger.Warnf("kubernetes watcherSet watcher stopped")
+ return false
+
+ // handle kubernetes-watcherSet events
+ case e, ok := <-wc:
+ if !ok {
+ logger.Warnf("kubernetes-watcherSet watch-chan closed")
+ return false
+ }
+
+ if l.handleEvents(e, listener...) {
+ // if event is delete
+ return true
+ }
+ }
+ }
+
+ return false
+}
+
+// return true mean the event type is DELETE
+// return false mean the event type is CREATE || UPDATE
+func (l *EventListener) handleEvents(event *WatcherEvent, listeners ...remoting.DataListener) bool {
+
+ logger.Infof("got a kubernetes-watcherSet event {type: %d, key: %s}", event.EventType, event.Key)
+
+ switch event.EventType {
+ case Create:
+ for _, listener := range listeners {
+ logger.Infof("kubernetes-watcherSet get event (key{%s}) = event{EventNodeDataCreated}", event.Key)
+ listener.DataChange(remoting.Event{
+ Path: string(event.Key),
+ Action: remoting.EventTypeAdd,
+ Content: string(event.Value),
+ })
+ }
+ return false
+ case Update:
+ for _, listener := range listeners {
+ logger.Infof("kubernetes-watcherSet get event (key{%s}) = event{EventNodeDataChanged}", event.Key)
+ listener.DataChange(remoting.Event{
+ Path: string(event.Key),
+ Action: remoting.EventTypeUpdate,
+ Content: string(event.Value),
+ })
+ }
+ return false
+ case Delete:
+ logger.Warnf("kubernetes-watcherSet get event (key{%s}) = event{EventNodeDeleted}", event.Key)
+ return true
+ default:
+ return false
+ }
+}
+
+// Listen on a set of key with spec prefix
+func (l *EventListener) ListenServiceNodeEventWithPrefix(prefix string, listener ...remoting.DataListener) {
+
+ defer l.wg.Done()
+ for {
+ wc, done, err := l.client.WatchWithPrefix(prefix)
+ if err != nil {
+ logger.Warnf("listenDirEvent(key{%s}) = error{%v}", prefix, err)
+ }
+
+ select {
+ // client stopped
+ case <-l.client.Done():
+ logger.Warnf("kubernetes client stopped")
+ return
+
+ // watcher stopped
+ case <-done:
+ logger.Warnf("kubernetes watcherSet watcher stopped")
+ return
+
+ // kuberentes-watcherSet event stream
+ case e, ok := <-wc:
+
+ if !ok {
+ logger.Warnf("kubernetes-watcherSet watch-chan closed")
+ return
+ }
+
+ l.handleEvents(e, listener...)
+ }
+ }
+}
+
+// this func is invoked by kubernetes ConsumerRegistry::Registry/ kubernetes ConsumerRegistry::get/kubernetes ConsumerRegistry::getListener
+// registry.go:Listen -> listenServiceEvent -> listenDirEvent -> ListenServiceNodeEvent
+// |
+// --------> ListenServiceNodeEvent
+func (l *EventListener) ListenServiceEvent(key string, listener remoting.DataListener) {
+
+ l.keyMapLock.RLock()
+ _, ok := l.keyMap[key]
+ l.keyMapLock.RUnlock()
+ if ok {
+ logger.Warnf("kubernetes-watcherSet key %s has already been listened.", key)
+ return
+ }
+
+ l.keyMapLock.Lock()
+ // double check
+ if _, ok := l.keyMap[key]; ok {
+ // another goroutine already set it
+ l.keyMapLock.Unlock()
+ return
+ }
+ l.keyMap[key] = struct{}{}
+ l.keyMapLock.Unlock()
+
+ keyList, valueList, err := l.client.GetChildren(key)
+ if err != nil {
+ logger.Warnf("Get new node path {%v} 's content error,message is {%v}", key, perrors.WithMessage(err, "get children"))
+ }
+
+ logger.Infof("get key children list %s, keys %v values %v", key, keyList, valueList)
+
+ for i, k := range keyList {
+ logger.Infof("got children list key -> %s", k)
+ listener.DataChange(remoting.Event{
+ Path: k,
+ Action: remoting.EventTypeAdd,
+ Content: valueList[i],
+ })
+ }
+
+ logger.Infof("listen dubbo provider key{%s} event and wait to get all provider from kubernetes-watcherSet", key)
+
+ l.wg.Add(1)
+ go func(key string, listener remoting.DataListener) {
+ l.ListenServiceNodeEventWithPrefix(key, listener)
+ logger.Warnf("listenDirEvent(key{%s}) goroutine exit now", key)
+ }(key, listener)
+
+ logger.Infof("listen dubbo service key{%s}", key)
+ l.wg.Add(1)
+ go func(key string) {
+ if l.ListenServiceNodeEvent(key) {
+ listener.DataChange(remoting.Event{Path: key, Action: remoting.EventTypeDel})
+ }
+ logger.Warnf("listenSelf(kubernetes key{%s}) goroutine exit now", key)
+ }(key)
+}
+
+func (l *EventListener) Close() {
+ l.wg.Wait()
+}
diff --git a/remoting/kubernetes/listener_test.go b/remoting/kubernetes/listener_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..a9446782a5c336268c3d6418e5882031d1566ae8
--- /dev/null
+++ b/remoting/kubernetes/listener_test.go
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "time"
+)
+
+import (
+ "github.com/stretchr/testify/assert"
+)
+
+import (
+ "github.com/apache/dubbo-go/remoting"
+)
+
+var changedData = `
+ dubbo.consumer.request_timeout=3s
+ dubbo.consumer.connect_timeout=5s
+ dubbo.application.organization=ikurento.com
+ dubbo.application.name=BDTService
+ dubbo.application.module=dubbogo user-info server
+ dubbo.application.version=0.0.1
+ dubbo.application.owner=ZX
+ dubbo.application.environment=dev
+ dubbo.registries.hangzhouzk.protocol=zookeeper
+ dubbo.registries.hangzhouzk.timeout=3s
+ dubbo.registries.hangzhouzk.address=127.0.0.1:2181
+ dubbo.registries.shanghaizk.protocol=zookeeper
+ dubbo.registries.shanghaizk.timeout=3s
+ dubbo.registries.shanghaizk.address=127.0.0.1:2182
+ dubbo.service.com.ikurento.user.UserProvider.protocol=dubbo
+ dubbo.service.com.ikurento.user.UserProvider.interface=com.ikurento.user.UserProvider
+ dubbo.service.com.ikurento.user.UserProvider.loadbalance=random
+ dubbo.service.com.ikurento.user.UserProvider.warmup=100
+ dubbo.service.com.ikurento.user.UserProvider.cluster=failover
+`
+
+type mockDataListener struct {
+ eventList []remoting.Event
+ client *Client
+ changedData string
+
+ rc chan remoting.Event
+}
+
+func (m *mockDataListener) DataChange(eventType remoting.Event) bool {
+ m.eventList = append(m.eventList, eventType)
+ if eventType.Content == m.changedData {
+ m.rc <- eventType
+ }
+ return true
+}
+
+func (s *KubernetesClientTestSuite) TestListener() {
+
+ t := s.T()
+
+ var tests = []struct {
+ input struct {
+ k string
+ v string
+ }
+ }{
+ {input: struct {
+ k string
+ v string
+ }{k: "/dubbo", v: changedData}},
+ }
+
+ c := s.initClient()
+ defer c.Close()
+
+ listener := NewEventListener(c)
+ dataListener := &mockDataListener{client: c, changedData: changedData, rc: make(chan remoting.Event)}
+ listener.ListenServiceEvent("/dubbo", dataListener)
+
+ // NOTICE: direct listen will lose create msg
+ time.Sleep(time.Second)
+ for _, tc := range tests {
+
+ k := tc.input.k
+ v := tc.input.v
+ if err := c.Create(k, v); err != nil {
+ t.Fatal(err)
+ }
+
+ }
+ msg := <-dataListener.rc
+ assert.Equal(t, changedData, msg.Content)
+}
diff --git a/remoting/kubernetes/watch.go b/remoting/kubernetes/watch.go
new file mode 100644
index 0000000000000000000000000000000000000000..c99a3ebcc041f2fed0160f1f286e72937d2c9aee
--- /dev/null
+++ b/remoting/kubernetes/watch.go
@@ -0,0 +1,336 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "context"
+ "strconv"
+ "strings"
+ "sync"
+)
+
+import (
+ perrors "github.com/pkg/errors"
+)
+
+var (
+ ErrWatcherSetAlreadyStopped = perrors.New("the watcher-set already be stopped")
+ ErrKVPairNotFound = perrors.New("k/v pair not found")
+)
+
+const (
+ defaultWatcherChanSize = 100
+)
+
+type eventType int
+
+const (
+ Create eventType = iota
+ Update
+ Delete
+)
+
+func (e eventType) String() string {
+
+ switch e {
+ case Create:
+ return "CREATE"
+ case Update:
+ return "UPDATE"
+ case Delete:
+ return "DELETE"
+ default:
+ return "UNKNOWN"
+ }
+}
+
+// WatcherEvent
+// watch event is element in watcherSet
+type WatcherEvent struct {
+ // event-type
+ EventType eventType `json:"-"`
+ // the dubbo-go should consume the key
+ Key string `json:"k"`
+ // the dubbo-go should consume the value
+ Value string `json:"v"`
+}
+
+// Watchable WatcherSet
+type WatcherSet interface {
+
+ // put the watch event to the watch set
+ Put(object *WatcherEvent) error
+ // if prefix is false,
+ // the len([]*WatcherEvent) == 1
+ Get(key string, prefix bool) ([]*WatcherEvent, error)
+ // watch the spec key or key prefix
+ Watch(key string, prefix bool) (Watcher, error)
+ // check the watcher set status
+ Done() <-chan struct{}
+}
+
+// Watcher
+type Watcher interface {
+ // the watcher's id
+ ID() string
+ // result stream
+ ResultChan() <-chan *WatcherEvent
+ // Stop the watcher
+ stop()
+ // check the watcher status
+ done() <-chan struct{}
+}
+
+// the watch set implement
+type watcherSetImpl struct {
+
+ // Client's ctx, client die, the watch set will die too
+ ctx context.Context
+
+ // protect watcher-set and watchers
+ lock sync.RWMutex
+
+ // the key is dubbo-go interest meta
+ cache map[string]*WatcherEvent
+
+ currentWatcherId uint64
+ watchers map[uint64]*watcher
+}
+
+// closeWatchers
+// when the watcher-set was closed
+func (s *watcherSetImpl) closeWatchers() {
+
+ select {
+ case <-s.ctx.Done():
+
+ // parent ctx be canceled, close the watch-set's watchers
+ s.lock.Lock()
+ watchers := s.watchers
+ s.lock.Unlock()
+
+ for _, w := range watchers {
+ // stop data stream
+ // close(w.ch)
+ // stop watcher
+ w.stop()
+ }
+ }
+}
+
+// Watch
+// watch on spec key, with or without prefix
+func (s *watcherSetImpl) Watch(key string, prefix bool) (Watcher, error) {
+ return s.addWatcher(key, prefix)
+}
+
+// Done
+// get the watcher-set status
+func (s *watcherSetImpl) Done() <-chan struct{} {
+ return s.ctx.Done()
+}
+
+// Put
+// put the watch event to watcher-set
+func (s *watcherSetImpl) Put(watcherEvent *WatcherEvent) error {
+
+ sendMsg := func(object *WatcherEvent, w *watcher) {
+
+ select {
+ case <-w.done():
+ // the watcher already stop
+ case w.ch <- object:
+ // block send the msg
+ }
+ }
+
+ s.lock.Lock()
+ defer s.lock.Unlock()
+
+ if err := s.valid(); err != nil {
+ return err
+ }
+
+ // put to watcher-set
+ if watcherEvent.EventType == Delete {
+ delete(s.cache, watcherEvent.Key)
+ } else {
+
+ old, ok := s.cache[watcherEvent.Key]
+ if ok {
+ if old.Value == watcherEvent.Value {
+ // already have this k/v pair
+ return nil
+ }
+ }
+
+ // refresh the watcherEvent
+ s.cache[watcherEvent.Key] = watcherEvent
+ }
+
+ // notify watcher
+ for _, w := range s.watchers {
+
+ w := w
+
+ if !strings.Contains(watcherEvent.Key, w.interested.key) {
+ // this watcher no interest in this element
+ continue
+ }
+
+ if !w.interested.prefix {
+ if watcherEvent.Key == w.interested.key {
+ go sendMsg(watcherEvent, w)
+ }
+ // not interest
+ continue
+ }
+ go sendMsg(watcherEvent, w)
+ }
+ return nil
+}
+
+// valid
+func (s *watcherSetImpl) valid() error {
+ select {
+ case <-s.ctx.Done():
+ return ErrWatcherSetAlreadyStopped
+ default:
+ return nil
+ }
+}
+
+// addWatcher
+func (s *watcherSetImpl) addWatcher(key string, prefix bool) (Watcher, error) {
+
+ if err := s.valid(); err != nil {
+ return nil, err
+ }
+
+ s.lock.Lock()
+ defer s.lock.Unlock()
+
+ // increase the watcher-id
+ s.currentWatcherId++
+
+ w := &watcher{
+ id: s.currentWatcherId,
+ watcherSet: s,
+ interested: struct {
+ key string
+ prefix bool
+ }{key: key, prefix: prefix},
+ ch: make(chan *WatcherEvent, defaultWatcherChanSize),
+ exit: make(chan struct{}),
+ }
+ s.watchers[s.currentWatcherId] = w
+ return w, nil
+}
+
+// Get
+// get elements from watcher-set
+func (s *watcherSetImpl) Get(key string, prefix bool) ([]*WatcherEvent, error) {
+
+ s.lock.RLock()
+ defer s.lock.RUnlock()
+
+ if err := s.valid(); err != nil {
+ return nil, err
+ }
+
+ if !prefix {
+ for k, v := range s.cache {
+ if k == key {
+ return []*WatcherEvent{v}, nil
+ }
+ }
+ // object
+ return nil, ErrKVPairNotFound
+ }
+
+ var out []*WatcherEvent
+
+ for k, v := range s.cache {
+ if strings.Contains(k, key) {
+ out = append(out, v)
+ }
+ }
+
+ if len(out) == 0 {
+ return nil, ErrKVPairNotFound
+ }
+
+ return out, nil
+}
+
+// the watcher-set watcher
+type watcher struct {
+ id uint64
+
+ // the underlay watcherSet
+ watcherSet *watcherSetImpl
+
+ // the interest topic
+ interested struct {
+ key string
+ prefix bool
+ }
+ ch chan *WatcherEvent
+
+ closeOnce sync.Once
+ exit chan struct{}
+}
+
+// ResultChan
+func (w *watcher) ResultChan() <-chan *WatcherEvent {
+ return w.ch
+}
+
+// ID
+// the watcher's id
+func (w *watcher) ID() string {
+ return strconv.FormatUint(w.id, 10)
+}
+
+// stop
+// stop the watcher
+func (w *watcher) stop() {
+
+ // double close will panic
+ w.closeOnce.Do(func() {
+ close(w.exit)
+ })
+}
+
+// done
+// check watcher status
+func (w *watcher) done() <-chan struct{} {
+ return w.exit
+}
+
+// newWatcherSet
+// new watcher set from parent context
+func newWatcherSet(ctx context.Context) WatcherSet {
+ s := &watcherSetImpl{
+ ctx: ctx,
+ cache: map[string]*WatcherEvent{},
+ watchers: map[uint64]*watcher{},
+ }
+ go s.closeWatchers()
+ return s
+}
diff --git a/remoting/kubernetes/watch_test.go b/remoting/kubernetes/watch_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..8889103be212381c07ffff3c3d4399f41aeee564
--- /dev/null
+++ b/remoting/kubernetes/watch_test.go
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 kubernetes
+
+import (
+ "context"
+ "strconv"
+ "sync"
+ "testing"
+ "time"
+)
+
+func TestWatchSet(t *testing.T) {
+
+ ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+ defer cancel()
+
+ s := newWatcherSet(ctx)
+
+ wg := sync.WaitGroup{}
+
+ for i := 0; i < 2; i++ {
+
+ wg.Add(1)
+
+ go func() {
+ defer wg.Done()
+ w, err := s.Watch("key-1", false)
+ if err != nil {
+ t.Fatal(err)
+ }
+ for {
+ select {
+ case e := <-w.ResultChan():
+ t.Logf("consumer %s got %s\n", w.ID(), e.Key)
+
+ case <-w.done():
+ t.Logf("consumer %s stopped", w.ID())
+ return
+ }
+ }
+ }()
+ }
+ for i := 2; i < 3; i++ {
+
+ wg.Add(1)
+ go func() {
+
+ defer wg.Done()
+ w, err := s.Watch("key", true)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ for {
+ select {
+ case e := <-w.ResultChan():
+ t.Logf("prefix consumer %s got %s\n", w.ID(), e.Key)
+
+ case <-w.done():
+ t.Logf("prefix consumer %s stopped", w.ID())
+ return
+ }
+ }
+ }()
+ }
+
+ for i := 0; i < 5; i++ {
+ go func(i int) {
+ if err := s.Put(&WatcherEvent{
+ Key: "key-" + strconv.Itoa(i),
+ Value: strconv.Itoa(i),
+ }); err != nil {
+ t.Fatal(err)
+ }
+ }(i)
+ }
+
+ wg.Wait()
+}
diff --git a/remoting/zookeeper/listener.go b/remoting/zookeeper/listener.go
index 77aa05ee9eada327475fa5bf86c7af2c65de0ef2..eaf259f4417201c95172e95d7a87476575e004d5 100644
--- a/remoting/zookeeper/listener.go
+++ b/remoting/zookeeper/listener.go
@@ -59,7 +59,6 @@ func (l *ZkEventListener) SetClient(client *ZookeeperClient) {
// ListenServiceNodeEvent ...
func (l *ZkEventListener) ListenServiceNodeEvent(zkPath string, listener ...remoting.DataListener) bool {
- l.wg.Add(1)
defer l.wg.Done()
var zkEvent zk.Event
for {
@@ -145,6 +144,7 @@ func (l *ZkEventListener) handleZkNodeEvent(zkPath string, children []string, li
continue
}
// listen l service node
+ l.wg.Add(1)
go func(node string, zkPath string, listener remoting.DataListener) {
logger.Infof("delete zkNode{%s}", node)
if l.ListenServiceNodeEvent(node, listener) {
@@ -174,7 +174,6 @@ func (l *ZkEventListener) handleZkNodeEvent(zkPath string, children []string, li
}
func (l *ZkEventListener) listenDirEvent(zkPath string, listener remoting.DataListener) {
- l.wg.Add(1)
defer l.wg.Done()
var (
@@ -250,6 +249,7 @@ func (l *ZkEventListener) listenDirEvent(zkPath string, listener remoting.DataLi
continue
}
logger.Infof("listen dubbo service key{%s}", dubboPath)
+ l.wg.Add(1)
go func(zkPath string, listener remoting.DataListener) {
if l.ListenServiceNodeEvent(zkPath) {
listener.DataChange(remoting.Event{Path: zkPath, Action: remoting.EventTypeDel})
@@ -261,6 +261,7 @@ func (l *ZkEventListener) listenDirEvent(zkPath string, listener remoting.DataLi
//if zkPath is end of "providers/ & consumers/" we do not listen children dir
if strings.LastIndex(zkPath, constant.PROVIDER_CATEGORY) == -1 &&
strings.LastIndex(zkPath, constant.CONSUMER_CATEGORY) == -1 {
+ l.wg.Add(1)
go func(zkPath string, listener remoting.DataListener) {
l.listenDirEvent(zkPath, listener)
logger.Warnf("listenDirEvent(zkPath{%s}) goroutine exit now", zkPath)
@@ -292,6 +293,7 @@ func timeSecondDuration(sec int) time.Duration {
// --------> ListenServiceNodeEvent
func (l *ZkEventListener) ListenServiceEvent(zkPath string, listener remoting.DataListener) {
logger.Infof("listen dubbo path{%s}", zkPath)
+ l.wg.Add(1)
go func(zkPath string, listener remoting.DataListener) {
l.listenDirEvent(zkPath, listener)
logger.Warnf("listenDirEvent(zkPath{%s}) goroutine exit now", zkPath)