Merge branch 'fix_make_all_goimports' of github.com:rayowang/layotto …

…into fix_make_all_goimports
mosn · May 19, 2022 · 47d1f86 · 47d1f86
2 parents a826ad7 + ab0f99b
commit 47d1f86
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 5 deletions.
diff --git a/demo/configuration/common/README.md b/demo/configuration/common/README.md
@@ -0,0 +1,6 @@
+You can run this demo with different component names.
+For example:
+```go
+go build -o client
+./client -s "config_demo"
+```
diff --git a/demo/secret/common/README.md b/demo/secret/common/README.md
@@ -0,0 +1,6 @@
+You can run this demo with different component names.
+For example:
+```go
+go build -o client
+./client -s "secret_demo"
+```
diff --git a/demo/secret/common/client.go b/demo/secret/common/client.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+
 	"mosn.io/layotto/sdk/go-sdk/client"
 
 	runtimev1pb "mosn.io/layotto/spec/proto/runtime/v1"

diff --git a/demo/state/common/README.md b/demo/state/common/README.md
@@ -0,0 +1,6 @@
+You can run this demo with different component names.
+For example:
+```go
+go build -o client
+./client -s "state_demo"
+```
diff --git a/docs/en/component_specs/secret/common.md b/docs/en/component_specs/secret/common.md
@@ -4,7 +4,7 @@ This component can access secrets from local files, environment variables, k8s,
 
 The json configuration file has the following structure:
 ```json
-"secretStores": {
+"secret_store": {
   "<STORE NAME>": {
     "metadata": {
       "<KEY>": "<VALUE>",
@@ -15,7 +15,7 @@ The json configuration file has the following structure:
 ```
 Configuration examples of local file keys, local environment variables, and k8s keys:
 ```
-       "secretStores": {
+       "secret_store": {
                         "local.file": {
                           "metadata": {
                             "secretsFile": "../../configs/config_secret_local_file.json"

diff --git a/docs/zh/component_specs/secret/common.md b/docs/zh/component_specs/secret/common.md
@@ -5,7 +5,7 @@
 
 json配置文件有如下结构：
 ```json
-"secretStores": {
+"secret_store": {
   "<STORE NAME>": {
     "metadata": {
       "<KEY>": "<VALUE>",
@@ -16,7 +16,7 @@ json配置文件有如下结构：
 ```
 本地文件秘钥、本地环境变量、k8s秘钥的配置例子：
 ```
-       "secretStores": {
+       "secret_store": {
                         "local.file": {
                           "metadata": {
                             "secretsFile": "../../configs/config_secret_local_file.json"

diff --git a/pkg/runtime/config.go b/pkg/runtime/config.go
@@ -19,6 +19,8 @@ package runtime
 import (
 	"encoding/json"
 
+	"mosn.io/layotto/pkg/runtime/secretstores"
+
 	"mosn.io/layotto/components/custom"
 
 	"mosn.io/layotto/pkg/runtime/bindings"
@@ -50,7 +52,7 @@ type MosnRuntimeConfig struct {
 	LockManagement         map[string]lock.Config              `json:"lock"`
 	SequencerManagement    map[string]sequencer.Config         `json:"sequencer"`
 	Bindings               map[string]bindings.Metadata        `json:"bindings"`
-	SecretStoresManagement map[string]bindings.Metadata        `json:"secret_store"`
+	SecretStoresManagement map[string]secretstores.Metadata    `json:"secret_store"`
 	// <component type,component name,config>
 	// e.g. <"super_pubsub","etcd",config>
 	CustomComponent map[string]map[string]custom.Config `json:"custom_component,omitempty"`

diff --git a/pkg/runtime/secretstores/metadata.go b/pkg/runtime/secretstores/metadata.go
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 Layotto Authors
+ *
+ * Licensed 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 secretstores
+
+type Metadata struct {
+	Version  string
+	Metadata map[string]string `json:"metadata"`
+}