feature: Decoupled type

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

components/configstores/registry.go

@@ -24,17 +24,17 @@ import (
 
 type Registry interface {
 	Register(fs ...*StoreFactory)
-	Create(name string) (Store, error)
+	Create(compType string) (Store, error)
 }
 
 type StoreFactory struct {
-	Name          string
+	CompType      string
 	FactoryMethod func() Store
 }
 
-func NewStoreFactory(name string, f func() Store) *StoreFactory {
+func NewStoreFactory(compType string, f func() Store) *StoreFactory {
 	return &StoreFactory{
-		Name:          name,
+		CompType:      compType,
 		FactoryMethod: f,
 	}
 }
@@ -54,15 +54,15 @@ func NewRegistry(info *info.RuntimeInfo) Registry {
 
 func (r *StoreRegistry) Register(fs ...*StoreFactory) {
 	for _, f := range fs {
-		r.stores[f.Name] = f.FactoryMethod
-		r.info.RegisterComponent(ServiceName, f.Name)
+		r.stores[f.CompType] = f.FactoryMethod
+		r.info.RegisterComponent(ServiceName, f.CompType)
 	}
 }
 
-func (r *StoreRegistry) Create(name string) (Store, error) {
-	if f, ok := r.stores[name]; ok {
-		r.info.LoadComponent(ServiceName, name)
+func (r *StoreRegistry) Create(compType string) (Store, error) {
+	if f, ok := r.stores[compType]; ok {
+		r.info.LoadComponent(ServiceName, compType)
 		return f(), nil
 	}
-	return nil, fmt.Errorf("service component %s is not regsitered", name)
+	return nil, fmt.Errorf("service component %s is not regsitered", compType)
 }

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"`

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"`
 }

components/custom/registry.go

@@ -20,18 +20,18 @@ import (
 )
 
 type Registry interface {
-	Register(componentType string, factorys ...*ComponentFactory)
-	Create(componentType, name string) (Component, error)
+	Register(kind string, factorys ...*ComponentFactory)
+	Create(kind, compType 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,
 	}
 }
@@ -48,29 +48,29 @@ func NewRegistry(info *info.RuntimeInfo) Registry {
 	}
 }
 
-func (r *componentRegistry) Register(componentType string, fs ...*ComponentFactory) {
+func (r *componentRegistry) Register(kind string, fs ...*ComponentFactory) {
 	if len(fs) == 0 {
 		return
 	}
-	r.info.AddService(componentType)
+	r.info.AddService(kind)
 	// lazy init
-	if _, ok := r.stores[componentType]; !ok {
-		r.stores[componentType] = make(map[string]func() Component)
+	if _, ok := r.stores[kind]; !ok {
+		r.stores[kind] = make(map[string]func() Component)
 	}
 	// register FactoryMethod
 	for _, f := range fs {
-		r.stores[componentType][f.Name] = f.FactoryMethod
-		r.info.RegisterComponent(componentType, f.Name)
+		r.stores[kind][f.Type] = f.FactoryMethod
+		r.info.RegisterComponent(kind, f.Type)
 	}
 }
 
-func (r *componentRegistry) Create(componentType, name string) (Component, error) {
-	store, ok := r.stores[componentType]
+func (r *componentRegistry) Create(compType, name string) (Component, error) {
+	store, ok := r.stores[compType]
 	if !ok {
-		return nil, fmt.Errorf("custom component type %s is not regsitered", componentType)
+		return nil, fmt.Errorf("custom component type %s is not regsitered", compType)
 	}
 	if f, ok := store[name]; ok {
-		r.info.LoadComponent(componentType, name)
+		r.info.LoadComponent(compType, name)
 		return f(), nil
 	}
 	return nil, fmt.Errorf("custom component %s is not regsitered", name)

components/file/registry.go

@@ -24,17 +24,17 @@ import (
 
 type Registry interface {
 	Register(fs ...*FileFactory)
-	Create(name string) (File, error)
+	Create(compType string) (File, error)
 }
 
 type FileFactory struct {
-	Name          string
+	CompType      string
 	FactoryMethod func() File
 }
 
-func NewFileFactory(name string, f func() File) *FileFactory {
+func NewFileFactory(CompType string, f func() File) *FileFactory {
 	return &FileFactory{
-		Name:          name,
+		CompType:      CompType,
 		FactoryMethod: f,
 	}
 }
@@ -54,15 +54,15 @@ func NewRegistry(info *info.RuntimeInfo) Registry {
 
 func (r *FileStoreRegistry) Register(fs ...*FileFactory) {
 	for _, f := range fs {
-		r.files[f.Name] = f.FactoryMethod
-		r.info.RegisterComponent(ServiceName, f.Name)
+		r.files[f.CompType] = f.FactoryMethod
+		r.info.RegisterComponent(ServiceName, f.CompType)
 	}
 }
 
-func (r *FileStoreRegistry) Create(name string) (File, error) {
-	if f, ok := r.files[name]; ok {
-		r.info.LoadComponent(ServiceName, name)
+func (r *FileStoreRegistry) Create(compType string) (File, error) {
+	if f, ok := r.files[compType]; ok {
+		r.info.LoadComponent(ServiceName, compType)
 		return f(), nil
 	}
-	return nil, fmt.Errorf("service component %s is not regsitered", name)
+	return nil, fmt.Errorf("service component %s is not regsitered", compType)
 }

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
 }
 

components/hello/hello.go

@@ -26,6 +26,7 @@ type HelloService interface {
 }
 
 type HelloConfig struct {
+	Type        string `json:"type"`
 	HelloString string `json:"hello"`
 }
 

components/hello/registry.go

@@ -24,17 +24,17 @@ import (
 
 type Registry interface {
 	Register(fs ...*HelloFactory)
-	Create(name string) (HelloService, error)
+	Create(compType string) (HelloService, error)
 }
 
 type HelloFactory struct {
-	Name          string
+	CompType      string
 	FatcoryMethod func() HelloService
 }
 
-func NewHelloFactory(name string, f func() HelloService) *HelloFactory {
+func NewHelloFactory(compType string, f func() HelloService) *HelloFactory {
 	return &HelloFactory{
-		Name:          name,
+		CompType:      compType,
 		FatcoryMethod: f,
 	}
 }
@@ -54,15 +54,15 @@ func NewRegistry(info *info.RuntimeInfo) Registry {
 
 func (r *helloRegistry) Register(fs ...*HelloFactory) {
 	for _, f := range fs {
-		r.stores[f.Name] = f.FatcoryMethod
-		r.info.RegisterComponent(ServiceName, f.Name) // 注册组件信息
+		r.stores[f.CompType] = f.FatcoryMethod
+		r.info.RegisterComponent(ServiceName, f.CompType) // 注册组件信息
 	}
 }
 
-func (r *helloRegistry) Create(name string) (HelloService, error) {
-	if f, ok := r.stores[name]; ok {
-		r.info.LoadComponent(ServiceName, name) // 加载组件信息
+func (r *helloRegistry) Create(compType string) (HelloService, error) {
+	if f, ok := r.stores[compType]; ok {
+		r.info.LoadComponent(ServiceName, compType) // 加载组件信息
 		return f(), nil
 	}
-	return nil, fmt.Errorf("service component %s is not regsitered", name)
+	return nil, fmt.Errorf("service component %s is not regsitered", compType)
 }

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"`
 }
 

components/pkg/info/info.go

@@ -42,14 +42,14 @@ func (info *RuntimeInfo) AddService(service string) {
 	info.Services[service] = &ComponentInfo{}
 }
 
-func (info *RuntimeInfo) RegisterComponent(service string, name string) {
+func (info *RuntimeInfo) RegisterComponent(service string, compType string) {
 	if c, ok := info.Services[service]; ok {
-		c.Registered = append(c.Registered, name)
+		c.Registered = append(c.Registered, compType)
 	}
 }
 
-func (info *RuntimeInfo) LoadComponent(service string, name string) {
+func (info *RuntimeInfo) LoadComponent(service string, compType string) {
 	if c, ok := info.Services[service]; ok {
-		c.Loaded = append(c.Loaded, name)
+		c.Loaded = append(c.Loaded, compType)
 	}
 }

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"`
 }

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"
                           ],

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"
                           ],

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"

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",

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>",

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>",