fix: load env vars having $ in value correctly (#455)

raystack · Dec 12, 2022 · cdfd99c · cdfd99c
1 parent bcd07ed
commit cdfd99c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/recipe/envs.go b/recipe/envs.go
@@ -39,7 +39,7 @@ func populateDataFromLocal() map[string]string {
 	for _, envvar := range os.Environ() {
 		keyval := strings.SplitN(envvar, "=", 2) // "sampleKey=sample=Value" returns ["sampleKey", "sample=value"]
 		key := keyval[0]
-		val := os.ExpandEnv(keyval[1])
+		val := keyval[1]
 
 		key, ok := mapToMeteorKey(key)
 		if !ok {

diff --git a/recipe/reader_test.go b/recipe/reader_test.go
@@ -11,8 +11,8 @@ import (
 
 var (
 	emptyConfigPath = ""
-	username        = "admin"
-	password        = "1234"
+	username        = "[email protected]"
+	password        = "TempPa$sword"
 )
 
 func TestReaderRead(t *testing.T) {
@@ -307,6 +307,8 @@ func TestReaderRead(t *testing.T) {
 }
 
 func compareRecipes(t *testing.T, expected, actual recipe.Recipe) {
+	t.Helper()
+
 	assert.Equal(t, expected.Name, actual.Name)
 	assert.Equal(t, len(expected.Sinks), len(actual.Sinks))
 	assert.Equal(t, len(expected.Processors), len(actual.Processors))

diff --git a/recipe/sample_config.yaml b/recipe/sample_config.yaml
@@ -1,3 +1,3 @@
 SOURCE:
-  USERNAME: admin
-  PASSWORD: "1234"
+  USERNAME: [email protected]
+  PASSWORD: "TempPa$sword"
diff --git a/recipe/testdata/config2.yaml b/recipe/testdata/config2.yaml
@@ -1,3 +1,3 @@
 SOURCE:
-  USERNAME: admin
-  PASSWORD: "1234"
+  USERNAME: [email protected]
+  PASSWORD: "TempPa$sword"