mosn · seeflood · May 25, 2022 · May 8, 2022 · May 8, 2022 · May 8, 2022
diff --git a/cmd/layotto_multiple_api/helloworld/grpc_api.go b/cmd/layotto_multiple_api/helloworld/grpc_api.go
@@ -30,7 +30,7 @@ import (
 	grpc_api "mosn.io/layotto/pkg/grpc"
 )
 
-const componentType = "helloworld"
+const kind = "helloworld"
 
 // This demo will always use this component name.
 const componentName = "in-memory"
@@ -40,7 +40,7 @@ func NewHelloWorldAPI(ac *grpc_api.ApplicationContext) grpc.GrpcAPI {
 	name2component := make(map[string]component.HelloWorld)
 	if len(ac.CustomComponent) != 0 {
 		// we only care about those components of type "helloworld"
-		name2comp, ok := ac.CustomComponent[componentType]
+		name2comp, ok := ac.CustomComponent[kind]
 		if ok && len(name2comp) > 0 {
 			for name, v := range name2comp {
 				// convert them using type assertion

diff --git a/components/configstores/registry.go b/components/configstores/registry.go
@@ -24,7 +24,7 @@ import (
 
 type Registry interface {
 	Register(fs ...*StoreFactory)
-	Create(name string) (Store, error)
+	Create(componentType string) (Store, error)
 }
 
 type StoreFactory struct {
@@ -59,10 +59,10 @@ func (r *StoreRegistry) Register(fs ...*StoreFactory) {
 	}
 }
 
-func (r *StoreRegistry) Create(name string) (Store, error) {
-	if f, ok := r.stores[name]; ok {
-		r.info.LoadComponent(ServiceName, name)
+func (r *StoreRegistry) Create(componentType string) (Store, error) {
+	if f, ok := r.stores[componentType]; ok {
+		r.info.LoadComponent(ServiceName, componentType)
 		return f(), nil
 	}
-	return nil, fmt.Errorf("service component %s is not regsitered", name)
+	return nil, fmt.Errorf("service component %s is not regsitered", componentType)
 }
diff --git a/components/configstores/types.go b/components/configstores/types.go
@@ -18,6 +18,7 @@ package configstores
 
 // StoreConfig wraps configuration for a store implementation
 type StoreConfig struct {
+	Type      string            `json:"type"`
 	StoreName string            `json:"store_name"`
 	Address   []string          `json:"address"`
 	TimeOut   string            `json:"timeout"`

diff --git a/components/custom/config.go b/components/custom/config.go
@@ -14,6 +14,7 @@
 package custom
 
 type Config struct {
+	Type     string            `json:"type"`
 	Version  string            `json:"version"`
 	Metadata map[string]string `json:"metadata"`
 }
diff --git a/components/custom/registry.go b/components/custom/registry.go
@@ -21,17 +21,17 @@ import (
 
 type Registry interface {
 	Register(componentType string, factorys ...*ComponentFactory)
-	Create(componentType, name string) (Component, error)
+	Create(kind, componentType string) (Component, error)
 }
 
 type ComponentFactory struct {
-	Name          string
+	Type          string
 	FactoryMethod func() Component
 }
 
-func NewComponentFactory(name string, f func() Component) *ComponentFactory {
+func NewComponentFactory(compType string, f func() Component) *ComponentFactory {
 	return &ComponentFactory{
-		Name:          name,
+		Type:          compType,
 		FactoryMethod: f,
 	}
 }
@@ -59,8 +59,8 @@ func (r *componentRegistry) Register(componentType string, fs ...*ComponentFacto
 	}
 	// register FactoryMethod
 	for _, f := range fs {
-		r.stores[componentType][f.Name] = f.FactoryMethod
-		r.info.RegisterComponent(componentType, f.Name)
+		r.stores[componentType][f.Type] = f.FactoryMethod
+		r.info.RegisterComponent(componentType, f.Type)
 	}
 }
 

diff --git a/components/file/registry.go b/components/file/registry.go
@@ -24,7 +24,7 @@ import (
 
 type Registry interface {
 	Register(fs ...*FileFactory)
-	Create(name string) (File, error)
+	Create(componentType string) (File, error)
 }
 
 type FileFactory struct {
@@ -59,10 +59,10 @@ func (r *FileStoreRegistry) Register(fs ...*FileFactory) {
 	}
 }
 
-func (r *FileStoreRegistry) Create(name string) (File, error) {
-	if f, ok := r.files[name]; ok {
-		r.info.LoadComponent(ServiceName, name)
+func (r *FileStoreRegistry) Create(componentType string) (File, error) {
+	if f, ok := r.files[componentType]; ok {
+		r.info.LoadComponent(ServiceName, componentType)
 		return f(), nil
 	}
-	return nil, fmt.Errorf("service component %s is not regsitered", name)
+	return nil, fmt.Errorf("service component %s is not regsitered", componentType)
 }
diff --git a/components/file/types.go b/components/file/types.go
@@ -23,6 +23,7 @@ import (
 
 // FileConfig wraps configuration for a file implementation
 type FileConfig struct {
+	Type     string `json:"type"`
 	Metadata json.RawMessage
 }
 

diff --git a/components/hello/hello.go b/components/hello/hello.go
@@ -26,6 +26,7 @@ type HelloService interface {
 }
 
 type HelloConfig struct {
+	Type        string `json:"type"`
 	HelloString string `json:"hello"`
 }
 

diff --git a/components/hello/registry.go b/components/hello/registry.go
@@ -24,7 +24,7 @@ import (
 
 type Registry interface {
 	Register(fs ...*HelloFactory)
-	Create(name string) (HelloService, error)
+	Create(componentType string) (HelloService, error)
 }
 
 type HelloFactory struct {
@@ -59,10 +59,10 @@ func (r *helloRegistry) Register(fs ...*HelloFactory) {
 	}
 }
 
-func (r *helloRegistry) Create(name string) (HelloService, error) {
-	if f, ok := r.stores[name]; ok {
-		r.info.LoadComponent(ServiceName, name) // 加载组件信息
+func (r *helloRegistry) Create(componentType string) (HelloService, error) {
+	if f, ok := r.stores[componentType]; ok {
+		r.info.LoadComponent(ServiceName, componentType) // 加载组件信息
 		return f(), nil
 	}
-	return nil, fmt.Errorf("service component %s is not regsitered", name)
+	return nil, fmt.Errorf("service component %s is not regsitered", componentType)
 }
diff --git a/components/lock/types.go b/components/lock/types.go
@@ -17,6 +17,7 @@ type Feature string
 
 // Lock's metadata
 type Config struct {
+	Type     string            `json:"type"`
 	Metadata map[string]string `json:"metadata"`
 }
 

diff --git a/components/pkg/info/info.go b/components/pkg/info/info.go
@@ -48,8 +48,8 @@ func (info *RuntimeInfo) RegisterComponent(service string, name string) {
 	}
 }
 
-func (info *RuntimeInfo) LoadComponent(service string, name string) {
+func (info *RuntimeInfo) LoadComponent(service string, componentType string) {
 	if c, ok := info.Services[service]; ok {
-		c.Loaded = append(c.Loaded, name)
+		c.Loaded = append(c.Loaded, componentType)
 	}
 }
diff --git a/components/sequencer/types.go b/components/sequencer/types.go
@@ -14,6 +14,7 @@
 package sequencer
 
 type Config struct {
+	Type       string            `json:"type"`
 	BiggerThan map[string]int64  `json:"biggerThan"`
 	Metadata   map[string]string `json:"metadata"`
 }
diff --git a/configs/config_apollo.json b/configs/config_apollo.json
@@ -29,12 +29,14 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "helloworld": {
+                        "quick_start_demo": {
+                          "type": "helloworld",
                           "hello": "greeting"
                         }
                       },
                       "config_store": {
-                        "apollo": {
+                        "config_demo": {
+                          "type": "apollo",
                           "address": [
                             "http://106.54.227.205:8080"
                           ],

diff --git a/configs/config_apollo_health.json b/configs/config_apollo_health.json
@@ -34,12 +34,14 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "helloworld": {
+                        "quick_start_demo": {
+                          "type": "helloworld",
                           "hello": "greeting"
                         }
                       },
                       "config_store": {
-                        "apollo": {
+                        "config_demo": {
+                          "type": "apollo",
                           "address": [
                             "http://106.54.227.205:8080"
                           ],

diff --git a/configs/config_bindings.json b/configs/config_bindings.json
@@ -17,12 +17,14 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "helloworld": {
+                        "quick_start_demo": {
+                          "type": "helloworld",
                           "hello": "greeting"
                         }
                       },
                       "bindings": {
-                        "http": {
+                        "bindings_demo": {
+                          "type": "http",
                           "metadata":
                             {
                                 "url": "https://github.com/mosn/layotto"

diff --git a/configs/config_file.json b/configs/config_file.json
@@ -17,12 +17,14 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "helloworld": {
+                        "quick_start_demo": {
+                          "type": "helloworld",
                           "hello": "greeting"
                         }
                       },
                       "file": {
-                        "minioOSS": {
+                        "file_demo": {
+                          "type": "minioOSS",
                           "metadata": [
                             {
                               "endpoint": "127.0.0.1:9000",

diff --git a/configs/config_file_qiniu_oss.json b/configs/config_file_qiniu_oss.json
@@ -17,12 +17,14 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "helloworld": {
+                        "quick_start_demo": {
+                          "type": "helloworld",
                           "hello": "greeting"
                         }
                       },
                       "file": {
-                        "qiniuOSS": {
+                        "file_demo": {
+                          "type": "qiniuOSS",
                           "metadata": [
                             {
                               "endpoint": "<require>",

diff --git a/configs/config_file_tencentcloud_oss.json b/configs/config_file_tencentcloud_oss.json
@@ -17,12 +17,14 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "helloworld": {
+                        "quick_start_demo": {
+                          "type": "helloworld",
                           "hello": "greeting"
                         }
                       },
                       "files": {
-                        "tencentCloudOSS": {
+                        "file_demo": {
+                          "type": "tencentCloudOSS",
                           "metadata": [
                             {
                               "endpoint": "<get endpoint from https://console.cloud.tencent.com/cos/bucket configuration management>",

diff --git a/configs/config_in_memory.json b/configs/config_in_memory.json
@@ -22,37 +22,43 @@
                     "server_name": "runtime",
                     "grpc_config": {
                       "hellos": {
-                        "helloworld": {
+                        "quick_start_demo": {
+                          "type": "helloworld",
                           "hello": "greeting"
                         }
                       },
                       "state": {
-                        "in-memory": {
+                        "state_demo": {
+                          "type": "in-memory",
                           "metadata": {
                           }
                         }
                       },
                       "lock": {
-                        "in-memory": {
+                        "lock_demo": {
+                          "type": "in-memory",
                           "metadata": {
                           }
                         }
                       },
                       "pub_subs": {
-                        "in-memory": {
+                        "pub_subs_demo": {
+                          "type": "in-memory",
                           "metadata": {
                             "consumerID": "1"
                           }
                         }
                       },
                       "sequencer": {
-                        "in-memory": {
+                        "sequencer_demo": {
+                          "type": "in-memory",
                           "metadata": {}
                         }
                       },
                       "custom_component": {
                         "helloworld": {
-                          "in-memory": {
+                          "demo": {
+                            "type": "in-memory",
                             "metadata": {}
                           }
                         }