suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2025-01-23 14:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better error handling will empty env

Browse Source
This commit is contained in:
Mike Farah 2021-01-11 14:38:53 +11:00
parent a0e1f65b20
commit 69386316f3
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/yqlib/doc/Document Index.md
View File

@ -1,4 +1,4 @@
Use the `documentIndex` operator to select nodes of a particular document. Use the `documentIndex` operator (or the `di` shorthand) to select nodes of a particular document.
## Retrieve a document index ## Retrieve a document index
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml

3
pkg/yqlib/operator_env.go
View File

@ -2,6 +2,7 @@ package yqlib
import ( import (
"container/list" "container/list"
"fmt"
"os" "os"
"strings" "strings"
@ -27,6 +28,8 @@ func EnvOperator(d *dataTreeNavigator, matchMap *list.List, pathNode *PathTreeNo
Tag: "!!str", Tag: "!!str",
Value: rawValue, Value: rawValue,
} }
} else if rawValue == "" {
return nil, fmt.Errorf("Value for env variable '%v' not provided in env()", envName)
} else { } else {
var dataBucket yaml.Node var dataBucket yaml.Node
decoder := yaml.NewDecoder(strings.NewReader(rawValue)) decoder := yaml.NewDecoder(strings.NewReader(rawValue))

6
pkg/yqlib/operator_recursive_descent_test.go
View File

@ -63,10 +63,10 @@ var recursiveDescentOperatorScenarios = []expressionScenario{
}, },
}, },
{ {
description: "Recursively find nodes with keys", description: "Recursively find nodes with keys",
subdescription: "Note that this example has wrapped the expression in `[]` to show that there are two matches returned. You do not have to wrap in `[]` in your path expression.", subdescription: "Note that this example has wrapped the expression in `[]` to show that there are two matches returned. You do not have to wrap in `[]` in your path expression.",
document: `{a: {name: frog, b: {name: blog, age: 12}}}`, document: `{a: {name: frog, b: {name: blog, age: 12}}}`,
expression: `[.. | select(has("name"))]`, expression: `[.. | select(has("name"))]`,
expected: []string{ expected: []string{
"D0, P[a], (!!seq)::- {name: frog, b: {name: blog, age: 12}}\n- {name: blog, age: 12}\n", "D0, P[a], (!!seq)::- {name: frog, b: {name: blog, age: 12}}\n- {name: blog, age: 12}\n",
}, },