feat: component ref

components/ref/config.go

@@ -18,10 +18,10 @@ package ref
 
 //Config is ref json config
 type Config struct {
-	SecretRef []*Item `json:"secret_ref"`
+	SecretRef []*SecretItem `json:"secret_ref"`
 }
 
-type Item struct {
+type SecretItem struct {
 	//secret component name, such as : local.file
 	StoreName string `json:"store_name"`
 	// key in the secret component
@@ -31,3 +31,8 @@ type Item struct {
 	// key need to inject into metadata
 	InjectAs string `json:"inject_as"`
 }
+
+type ComponentRefConfig struct {
+	SecretRef []string `json:"secret_ref"`
+	ConfigRef []string `json:"config_ref"`
+}

configs/config_ref_example.json

@@ -27,6 +27,15 @@
                           "hello": "greeting"
                         }
                       },
+                      "config_store": {
+                        "config_demo": {
+                          "type": "etcd",
+                          "address": [
+                            "127.0.0.1:2379"
+                          ],
+                          "timeout": "10"
+                        }
+                      },
                       "secret_store": {
                         "local.file": {
                           "type": "local.file",
@@ -59,6 +68,15 @@
                       "app": {
                         "app_id": "app1",
                         "grpc_callback_port": 9999
+                      },
+                      "component_ref": {
+                        "config_store": [
+                          "config_demo"
+                        ],
+                        "secret_store": [
+                          "local.file",
+                          "local.env"
+                        ]
                       }
                     }
                   }

pkg/runtime/config.go

@@ -18,6 +18,7 @@ package runtime
 
 import (
 	"encoding/json"
+	"mosn.io/layotto/components/ref"
 
 	"mosn.io/layotto/components/oss"
 
@@ -60,6 +61,7 @@ type MosnRuntimeConfig struct {
 	// <component type,component name,config>
 	// e.g. <"super_pubsub","etcd",config>
 	CustomComponent map[string]map[string]custom.Config `json:"custom_component,omitempty"`
+	ComponentRef    ref.ComponentRefConfig              `json:"component_ref"`
 	Extends         map[string]json.RawMessage          `json:"extends,omitempty"` // extend config
 }
 

pkg/runtime/ref/contianer.go

@@ -28,17 +28,18 @@ type RefContainer struct {
 	ConfigRef map[string]configstores.Store
 }
 
+// NewRefContainer return a new container
 func NewRefContainer() *RefContainer {
 	return &RefContainer{
 		SecretRef: make(map[string]secretstores.SecretStore),
 		ConfigRef: make(map[string]configstores.Store),
 	}
 }
 
-func (r *RefContainer) GetSecretStore(key string) secretstores.SecretStore {
+func (r *RefContainer) getSecretStore(key string) secretstores.SecretStore {
 	return r.SecretRef[key]
 }
 
-func (r *RefContainer) GetConfigStore(key string) configstores.Store {
+func (r *RefContainer) getConfigStore(key string) configstores.Store {
 	return r.ConfigRef[key]
 }

pkg/runtime/ref/contianer_test.go

@@ -33,7 +33,7 @@ func TestRefContainer(t *testing.T) {
 	container.SecretRef["fake"] = ss
 	cf := &mock.MockStore{}
 	container.ConfigRef["mock"] = cf
-	assert.Equal(t, ss, container.GetSecretStore("fake"))
-	assert.Equal(t, cf, container.GetConfigStore("mock"))
+	assert.Equal(t, ss, container.getSecretStore("fake"))
+	assert.Equal(t, cf, container.getConfigStore("mock"))
 
 }

pkg/runtime/ref/injector.go

@@ -17,18 +17,45 @@
 package ref
 
 import (
+	"fmt"
 	"github.com/dapr/components-contrib/secretstores"
+	"mosn.io/layotto/components/configstores"
 
 	"mosn.io/layotto/components/ref"
 )
 
 type DefaultInjector struct {
-	Container RefContainer
+	//limit ref component
+	ComponentLimit map[string]struct{}
+	Container      RefContainer
+}
+
+var defaultInjector *DefaultInjector
+
+// NewDefaultInjector return a single Inject
+func NewDefaultInjector(secretStores map[string]secretstores.SecretStore, configStores map[string]configstores.Store, config ref.ComponentRefConfig) *DefaultInjector {
+	injector := &DefaultInjector{
+		Container: RefContainer{
+			SecretRef: secretStores,
+			ConfigRef: configStores,
+		},
+	}
+	for _, c := range config.ConfigRef {
+		injector.ComponentLimit[c] = struct{}{}
+	}
+	for _, c := range config.SecretRef {
+		injector.ComponentLimit[c] = struct{}{}
+	}
+	defaultInjector = injector
+	return injector
+}
+func GetDefaultInjector() *DefaultInjector {
+	return defaultInjector
 }
 
 //InjectSecretRef  inject secret to metaData
 // TODO: permission control
-func (i *DefaultInjector) InjectSecretRef(items []*ref.Item, metaData map[string]string) (map[string]string, error) {
+func (i *DefaultInjector) InjectSecretRef(items []*ref.SecretItem, metaData map[string]string) (map[string]string, error) {
 	if metaData == nil {
 		metaData = make(map[string]string)
 	}
@@ -38,7 +65,7 @@ func (i *DefaultInjector) InjectSecretRef(items []*ref.Item, metaData map[string
 
 	meta := make(map[string]string)
 	for _, item := range items {
-		store := i.Container.GetSecretStore(item.StoreName)
+		store := i.Container.getSecretStore(item.StoreName)
 		secret, err := store.GetSecret(secretstores.GetSecretRequest{
 			Name: item.Key,
 		})
@@ -62,3 +89,17 @@ func (i *DefaultInjector) InjectSecretRef(items []*ref.Item, metaData map[string
 	}
 	return metaData, nil
 }
+
+func (i *DefaultInjector) InjectConfigRef(key string) (configstores.Store, error) {
+	if _, ok := i.ComponentLimit[key]; ok {
+		return i.Container.getConfigStore(key), nil
+	}
+	return nil, fmt.Errorf("do not allow get config store %s", key)
+}
+
+func (i *DefaultInjector) InjectPubSubRef(key string) (secretstores.SecretStore, error) {
+	if _, ok := i.ComponentLimit[key]; ok {
+		return i.Container.getSecretStore(key), nil
+	}
+	return nil, fmt.Errorf("do not allow get secret store %s", key)
+}

pkg/runtime/ref/injector_test.go

@@ -38,20 +38,20 @@ func TestInject(t *testing.T) {
 	injector := DefaultInjector{Container: *container}
 	meta := make(map[string]string)
 
-	var items []*ref.Item
+	var items []*ref.SecretItem
 	secretRef, err := injector.InjectSecretRef(nil, meta)
 	assert.Nil(t, err)
 	assert.Equal(t, len(secretRef), 0)
 	secretRef, err = injector.InjectSecretRef(items, nil)
 	assert.Nil(t, err)
 	assert.Equal(t, len(secretRef), 0)
-	items = append(items, &ref.Item{
+	items = append(items, &ref.SecretItem{
 		StoreName: "fake_secret_store",
 		Key:       "good-key",
 		SubKey:    "good-key",
 		InjectAs:  "ref-key",
 	})
-	items = append(items, &ref.Item{
+	items = append(items, &ref.SecretItem{
 		StoreName: "fake_secret_store",
 		Key:       "good-key",
 		SubKey:    "good-key",

pkg/runtime/runtime.go

@@ -248,12 +248,7 @@ func DefaultInitRuntimeStage(o *runtimeOptions, m *MosnRuntime) error {
 	if err := m.initConfigStores(o.services.configStores...); err != nil {
 		return err
 	}
-	m.Injector = &ref.DefaultInjector{
-		Container: ref.RefContainer{
-			SecretRef: m.secretStores,
-			ConfigRef: m.configStores,
-		},
-	}
+	m.Injector = ref.NewDefaultInjector(m.secretStores, m.configStores, m.runtimeConfig.ComponentRef)
 	if err := m.initCustomComponents(o.services.custom); err != nil {
 		return err
 	}