fix: change IDs to -ids

apache · Oct 27, 2021 · 4d4fb6e · 4d4fb6e
1 parent e4723f4
commit 4d4fb6e
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 17 deletions.
diff --git a/config/consumer_config.go b/config/consumer_config.go
@@ -40,7 +40,7 @@ const (
 type ConsumerConfig struct {
 	Filter string `yaml:"filter" json:"filter,omitempty" property:"filter"`
 	// support string
-	RegistryIDs []string `yaml:"registryIDs" json:"registryIDs,omitempty" property:"registryIDs"`
+	RegistryIDs []string `yaml:"registry-ids" json:"registry-ids,omitempty" property:"registry-ids"`
 
 	RequestTimeout string `default:"3s" yaml:"request-timeout" json:"request-timeout,omitempty" property:"request-timeout"`
 	ProxyFactory   string `default:"default" yaml:"proxy" json:"proxy,omitempty" property:"proxy"`

diff --git a/config/provider_config.go b/config/provider_config.go
@@ -36,7 +36,7 @@ type ProviderConfig struct {
 	// Deprecated Register whether registration is required
 	Register bool `yaml:"register" json:"register" property:"register"`
 	// RegistryIDs is registry ids list
-	RegistryIDs []string `yaml:"registryIDs" json:"registryIDs" property:"registryIDs"`
+	RegistryIDs []string `yaml:"registry-ids" json:"registry-ids" property:"registry-ids"`
 	// Services services
 	Services map[string]*ServiceConfig `yaml:"services" json:"services,omitempty" property:"services"`
 

diff --git a/config/reference_config.go b/config/reference_config.go
@@ -50,7 +50,7 @@ type ReferenceConfig struct {
 	URL            string            `yaml:"url"  json:"url,omitempty" property:"url"`
 	Filter         string            `yaml:"filter" json:"filter,omitempty" property:"filter"`
 	Protocol       string            `default:"dubbo"  yaml:"protocol"  json:"protocol,omitempty" property:"protocol"`
-	RegistryIDs    []string          `yaml:"registryIDs"  json:"registryIDs,omitempty"  property:"registryIDs"`
+	RegistryIDs    []string          `yaml:"registry-ids"  json:"registry-ids,omitempty"  property:"registry-ids"`
 	Cluster        string            `yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
 	Loadbalance    string            `yaml:"loadbalance"  json:"loadbalance,omitempty" property:"loadbalance"`
 	Retries        string            `yaml:"retries"  json:"retries,omitempty" property:"retries"`

diff --git a/config/service_config.go b/config/service_config.go
@@ -50,9 +50,9 @@ import (
 type ServiceConfig struct {
 	id                          string
 	Filter                      string            `yaml:"filter" json:"filter,omitempty" property:"filter"`
-	ProtocolIDs                 []string          `default:"[\"dubbo\"]"  validate:"required"  yaml:"protocolIDs"  json:"protocolIDs,omitempty" property:"protocolIDs"` // multi protocolIDs support, split by ','
+	ProtocolIDs                 []string          `default:"[\"dubbo\"]"  validate:"required"  yaml:"protocol-ids"  json:"protocol-ids,omitempty" property:"protocol-ids"` // multi protocolIDs support, split by ','
 	Interface                   string            `validate:"required"  yaml:"interface"  json:"interface,omitempty" property:"interface"`
-	RegistryIDs                 []string          `yaml:"registryIDs"  json:"registryIDs,omitempty"  property:"registryIDs"`
+	RegistryIDs                 []string          `yaml:"registry-ids"  json:"registry-ids,omitempty"  property:"registry-ids"`
 	Cluster                     string            `default:"failover" yaml:"cluster"  json:"cluster,omitempty" property:"cluster"`
 	Loadbalance                 string            `default:"random" yaml:"loadbalance"  json:"loadbalance,omitempty"  property:"loadbalance"`
 	Group                       string            `yaml:"group"  json:"group,omitempty" property:"group"`

diff --git a/config/testdata/application.yaml b/config/testdata/application.yaml
@@ -26,10 +26,10 @@ dubbo:
   services:
     helloService:
       interface: org.dubbo.service.HelloService
-      registryIDs: nacos,zk
+      registry-ids: nacos,zk
     orderService:
       interface: org.dubbo.service.OrderService
-      registryIDs: nacos
+      registry-ids: nacos
   provider:
     register: true
     services:
diff --git a/config/testdata/config/app/application.yaml b/config/testdata/config/app/application.yaml
@@ -14,7 +14,7 @@ dubbo:
         interface: org.github.dubbo.HelloService # must be compatible with grpc or dubbo-java
   provider:
     register: true
-    registryIDs: nacos
+    registry-ids: nacos
     services:
       helloService:
         protocol: dubbo

diff --git a/config/testdata/config/provider/application.yaml b/config/testdata/config/provider/application.yaml
@@ -6,12 +6,12 @@ dubbo:
       address: nacos://127.0.0.1:8848
   provider:
     register: true
-    registryIDs:
+    registry-ids:
      - nacos
      - zk
     services:
       helloService:
         interface: org.dubbo.service.HelloService
-        registryIDs: nacos,zk
+        registry-ids: nacos,zk
       orderService:
         interface: org.dubbo.service.OrderService
diff --git a/config/testdata/config/provider/registry_application.yaml b/config/testdata/config/provider/registry_application.yaml
@@ -4,10 +4,10 @@ dubbo:
       timeout: 3s
       address: naocs://127.0.0.1:8848
   provider:
-    registryIDs: nacos
+    registry-ids: nacos
     services:
       HelloService:
         interface: org.dubbo.service.HelloService
-        registryIDs: nacos,zk
+        registry-ids: nacos,zk
       OrderService:
         interface: org.dubbo.service.OrderService
diff --git a/config/testdata/consumer_config.yml b/config/testdata/consumer_config.yml
@@ -33,7 +33,7 @@ registries :
 
 references:
   "UserProvider":
-    registryIDs: "hangzhouzk,shanghaizk"
+    registry-ids: "hangzhouzk,shanghaizk"
     filter: ""
     protocol : "dubbo"
     version: "1.0"

diff --git a/config/testdata/consumer_config_with_configcenter.yml b/config/testdata/consumer_config_with_configcenter.yml
@@ -7,7 +7,7 @@ config_center:
   address: "127.0.0.1"
 references:
   "UserProvider":
-    registryIDs: "hangzhouzk,shanghaizk"
+    registry-ids: "hangzhouzk,shanghaizk"
     filter: ""
     protocol : "dubbo"
     interface : "com.ikurento.user.UserProvider"

diff --git a/config/testdata/consumer_config_withoutProtocol.yml b/config/testdata/consumer_config_withoutProtocol.yml
@@ -33,7 +33,7 @@ registries :
 
 references:
   "UserProvider":
-    registryIDs: "hangzhouzk,shanghaizk"
+    registry-ids: "hangzhouzk,shanghaizk"
     filter: ""
     version: "1.0"
     group: "as"

diff --git a/config/testdata/provider_config.yml b/config/testdata/provider_config.yml
@@ -27,7 +27,7 @@ registries :
 
 services:
   "UserProvider":
-    registryIDs: "hangzhouzk,shanghaizk"
+    registry-ids: "hangzhouzk,shanghaizk"
     filter: ""
     # the name of limiter
     tps.limiter: "default"

diff --git a/config/testdata/provider_config_withoutProtocol.yml b/config/testdata/provider_config_withoutProtocol.yml
@@ -27,7 +27,7 @@ registries :
 
 services:
   "UserProvider":
-    registryIDs: "hangzhouzk,shanghaizk"
+    registry-ids: "hangzhouzk,shanghaizk"
     filter: ""
     # equivalent to interface of dubbo.xml
     interface : "com.ikurento.user.UserProvider"

diff --git a/config_center/apollo/mockDubbogo.yaml.json b/config_center/apollo/mockDubbogo.yaml.json
@@ -0,0 +1 @@
+{"appId":"testApplication_yang","cluster":"default","namespaceName":"mockDubbogo.yaml","releaseKey":"20191104105242-0f13805d89f834a4","configurations":{"registries.hangzhouzk.username":"11111"}}