Browse Source

change split chars

RockyJin 4 years atrás
parent
commit
87340e3170
2 changed files with 9 additions and 9 deletions
  1. 6 6
      deploy/docker/conf_util.go
  2. 3 3
      deploy/docker/conf_util_test.go

+ 6 - 6
deploy/docker/conf_util.go

@@ -9,9 +9,9 @@ import (
 )
 
 var fileMap = map[string]string{
-	"edgex":       "/kuiper/etc/sources/edgex.yaml",
-	"mqtt_source": "/kuiper/etc/mqtt_source.yaml",
-	"kuiper":      "/kuiper/etc/kuiper.yaml",
+	"edgex":       "/go/kuiper/etc/sources/edgex.yaml",
+	"mqtt_source": "/go/kuiper/etc/mqtt_source.yaml",
+	"kuiper":      "/go/kuiper/etc/kuiper.yaml",
 }
 
 var file_keys_map = map[string]map[string]string{
@@ -101,10 +101,10 @@ func ProcessEnv(files map[string]map[interface{}]interface{}, vars []string) {
 			fmt.Printf("Find env: %s, start to handle it.\n", e)
 		}
 
-		env_v := strings.ReplaceAll(pair[0], "__", "+")
-		keys := strings.Split(env_v, "_")
+		env_v := strings.ReplaceAll(pair[0], "__", ".")
+		keys := strings.Split(env_v, ".")
 		for i, v := range keys {
-			keys[i] = strings.ReplaceAll(v, "+", "_")
+			keys[i] = v
 		}
 
 		if len(keys) < 2 {

+ 3 - 3
deploy/docker/conf_util_test.go

@@ -126,9 +126,9 @@ func TestProcessEnv(t *testing.T) {
 	}{
 		{
 			vars: []string{
-				"EDGEX_DEFAULT_TYPE=zmq",
-				"EDGEX_DEFAULT_OPTIONAL_CLIENTID=clientid_0000",
-				"EDGEX_APPLICATION__CONF_PROTOCOL=ssl",
+				"EDGEX__DEFAULT__TYPE=zmq",
+				"EDGEX__DEFAULT__OPTIONAL__CLIENTID=clientid_0000",
+				"EDGEX__APPLICATION_CONF__PROTOCOL=ssl",
 			},
 			file: "edgex",
 			expt: map[interface{}]interface{}{