Tests can have multiple env variables

pkg/yqlib/doc/operators/env-variable-operators.md

@@ -77,7 +77,7 @@ will output
 a: "12"
 ```
 
-## Dynamically evaluate a path from an environment variable
+## Dynamically update a path from an environment variable
 The env variable can be any valid yq expression.
 
 Given a sample.yml file of:
@@ -89,11 +89,14 @@ a:
 ```
 then
 ```bash
-myenv=".a.b[0].name" yq 'eval(strenv(myenv))' sample.yml
+valueEnv="moo"  pathEnv=".a.b[0].name" yq 'eval(strenv(pathEnv)) = strenv(valueEnv)' sample.yml
 ```
 will output
 ```yaml
-dog
+a:
+  b:
+    - name: moo
+    - name: cat
 ```
 
 ## Dynamic key lookup with environment variable

pkg/yqlib/doc/operators/eval.md

@@ -36,13 +36,13 @@ a:
 ```
 then
 ```bash
-myenv=".a.b[0].name" yq 'eval(strenv(myenv)) = "cow"' sample.yml
+valueEnv="moo"  pathEnv=".a.b[0].name" yq 'eval(strenv(pathEnv)) = strenv(valueEnv)' sample.yml
 ```
 will output
 ```yaml
 a:
   b:
-    - name: cow
+    - name: moo
     - name: cat
 ```
 

pkg/yqlib/operator_env_test.go

@@ -7,7 +7,7 @@ import (
 var envOperatorScenarios = []expressionScenario{
 	{
 		description:          "Read string environment variable",
-		environmentVariable: "cat meow",
+		environmentVariables: map[string]string{"myenv": "cat meow"},
 		expression:           `.a = env(myenv)`,
 		expected: []string{
 			"D0, P[], ()::a: cat meow\n",
@@ -15,7 +15,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Read boolean environment variable",
-		environmentVariable: "true",
+		environmentVariables: map[string]string{"myenv": "true"},
 		expression:           `.a = env(myenv)`,
 		expected: []string{
 			"D0, P[], ()::a: true\n",
@@ -23,7 +23,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Read numeric environment variable",
-		environmentVariable: "12",
+		environmentVariables: map[string]string{"myenv": "12"},
 		expression:           `.a = env(myenv)`,
 		expected: []string{
 			"D0, P[], ()::a: 12\n",
@@ -31,7 +31,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Read yaml environment variable",
-		environmentVariable: "{b: fish}",
+		environmentVariables: map[string]string{"myenv": "{b: fish}"},
 		expression:           `.a = env(myenv)`,
 		expected: []string{
 			"D0, P[], ()::a: {b: fish}\n",
@@ -39,7 +39,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Read boolean environment variable as a string",
-		environmentVariable: "true",
+		environmentVariables: map[string]string{"myenv": "true"},
 		expression:           `.a = strenv(myenv)`,
 		expected: []string{
 			"D0, P[], ()::a: \"true\"\n",
@@ -47,25 +47,25 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Read numeric environment variable as a string",
-		environmentVariable: "12",
+		environmentVariables: map[string]string{"myenv": "12"},
 		expression:           `.a = strenv(myenv)`,
 		expected: []string{
 			"D0, P[], ()::a: \"12\"\n",
 		},
 	},
 	{
-		description:         "Dynamically evaluate a path from an environment variable",
+		description:          "Dynamically update a path from an environment variable",
 		subdescription:       "The env variable can be any valid yq expression.",
 		document:             `{a: {b: [{name: dog}, {name: cat}]}}`,
-		environmentVariable: ".a.b[0].name",
-		expression:          `eval(strenv(myenv))`,
+		environmentVariables: map[string]string{"pathEnv": ".a.b[0].name", "valueEnv": "moo"},
+		expression:           `eval(strenv(pathEnv)) = strenv(valueEnv)`,
 		expected: []string{
-			"D0, P[a b 0 name], (!!str)::dog\n",
+			"D0, P[], (doc)::{a: {b: [{name: moo}, {name: cat}]}}\n",
 		},
 	},
 	{
 		description:          "Dynamic key lookup with environment variable",
-		environmentVariable: "cat",
+		environmentVariables: map[string]string{"myenv": "cat"},
 		document:             `{cat: meow, dog: woof}`,
 		expression:           `.[env(myenv)]`,
 		expected: []string{
@@ -74,7 +74,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Replace strings with envsubst",
-		environmentVariable: "cat",
+		environmentVariables: map[string]string{"myenv": "cat"},
 		expression:           `"the ${myenv} meows" | envsubst`,
 		expected: []string{
 			"D0, P[], (!!str)::the cat meows\n",
@@ -82,7 +82,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Replace strings with envsubst, missing variables",
-		environmentVariable: "cat",
+		environmentVariables: map[string]string{"myenv": "cat"},
 		expression:           `"the ${myenvnonexisting} meows" | envsubst`,
 		expected: []string{
 			"D0, P[], (!!str)::the  meows\n",
@@ -90,7 +90,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Replace strings with envsubst, missing variables with defaults",
-		environmentVariable: "cat",
+		environmentVariables: map[string]string{"myenv": "cat"},
 		expression:           `"the ${myenvnonexisting-dog} meows" | envsubst`,
 		expected: []string{
 			"D0, P[], (!!str)::the dog meows\n",
@@ -98,7 +98,7 @@ var envOperatorScenarios = []expressionScenario{
 	},
 	{
 		description:          "Replace string environment variable in document",
-		environmentVariable: "cat meow",
+		environmentVariables: map[string]string{"myenv": "cat meow"},
 		document:             "{v: \"${myenv}\"}",
 		expression:           `.v |= envsubst`,
 		expected: []string{

pkg/yqlib/operator_eval_test.go

@@ -18,10 +18,10 @@ var evalOperatorScenarios = []expressionScenario{
 		description:          "Dynamically update a path from an environment variable",
 		subdescription:       "The env variable can be any valid yq expression.",
 		document:             `{a: {b: [{name: dog}, {name: cat}]}}`,
-		environmentVariable: ".a.b[0].name",
-		expression:          `eval(strenv(myenv)) = "cow"`,
+		environmentVariables: map[string]string{"pathEnv": ".a.b[0].name", "valueEnv": "moo"},
+		expression:           `eval(strenv(pathEnv)) = strenv(valueEnv)`,
 		expected: []string{
-			"D0, P[], (doc)::{a: {b: [{name: cow}, {name: cat}]}}\n",
+			"D0, P[], (doc)::{a: {b: [{name: moo}, {name: cat}]}}\n",
 		},
 	},
 }

pkg/yqlib/operators_test.go

@@ -18,7 +18,7 @@ import (
 type expressionScenario struct {
 	description           string
 	subdescription        string
-	environmentVariable   string
+	environmentVariables  map[string]string
 	document              string
 	document2             string
 	expression            string
@@ -87,8 +87,8 @@ func testScenario(t *testing.T, s *expressionScenario) {
 
 	}
 
-	if s.environmentVariable != "" {
-		os.Setenv("myenv", s.environmentVariable)
+	for name, value := range s.environmentVariables {
+		os.Setenv(name, value)
 	}
 
 	context, err := NewDataTreeNavigator().GetMatchingNodes(Context{MatchingNodes: inputs}, node)
@@ -231,9 +231,13 @@ func documentInput(w *bufio.Writer, s expressionScenario) (string, string) {
 
 	envCommand := ""
 
-	if s.environmentVariable != "" {
-		envCommand = fmt.Sprintf("myenv=\"%v\" ", s.environmentVariable)
-		os.Setenv("myenv", s.environmentVariable)
+	for name, value := range s.environmentVariables {
+		if envCommand == "" {
+			envCommand = fmt.Sprintf("%v=\"%v\" ", name, value)
+		} else {
+			envCommand = fmt.Sprintf("%v %v=\"%v\" ", envCommand, name, value)
+		}
+		os.Setenv(name, value)
 	}
 
 	if s.document != "" {