Fin.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -26,7 +26,7 @@ country: Australia
 And we run a command:
 
 ```bash
-yq 'predictWeatherOf(.country)'
+yq eval 'predictWeatherOf(.country)'
 ```
 
 it could output

.github/workflows/go.yml

@@ -14,7 +14,7 @@ jobs:
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Get dependencies
       run: |
@@ -25,7 +25,6 @@ jobs:
         fi
 
     - name: Check the build
-      shell: bash -l {0}
       run: |
         export PATH=${PATH}:`go env GOPATH`/bin
         scripts/devtools.sh

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
   publishGitRelease:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
           go-version: '^1.17.5'
@@ -66,7 +66,7 @@ jobs:
       IMAGE_NAME: mikefarah/yq
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1

.github/workflows/test-yq.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Get test
         uses: mikefarah/yq@master
         with:

.gitignore

@@ -48,8 +48,4 @@ test*.yml
 
 # man page
 man.md
-yq.1
-
-# debian pkg
-_build
-debian/files
+yq.1

.golangci.yml

@@ -18,14 +18,6 @@ linters:
     - revive
     - unconvert
     - unparam
-linters-settings:
-  depguard:
-    list-type: blacklist
-    include-go-root: true
-    packages:
-      - io/ioutil
-    packages-with-error-message:
-      - io/ioutil: "The 'io/ioutil' package is deprecated. Use corresponding 'os' or 'io' functions instead."
 issues:
   exclude-rules:
   - linters:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18.0 as builder
+FROM golang:1.17 as builder
 
 WORKDIR /go/src/mikefarah/yq
 

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM golang:1.18.0
+FROM golang:1.17
 
 COPY scripts/devtools.sh /opt/devtools.sh
 

README.md

@@ -3,75 +3,47 @@
 ![Build](https://github.com/mikefarah/yq/workflows/Build/badge.svg)  ![Docker Pulls](https://img.shields.io/docker/pulls/mikefarah/yq.svg) ![Github Releases (by Release)](https://img.shields.io/github/downloads/mikefarah/yq/total.svg) ![Go Report](https://goreportcard.com/badge/github.com/mikefarah/yq)
 
 
-a lightweight and portable command-line YAML, JSON and XML processor. `yq` uses [jq](https://github.com/stedolan/jq) like syntax but works with yaml files as well as json and xml. It doesn't yet support everything `jq` does - but it does support the most common operations and functions, and more is being added continuously.
+a lightweight and portable command-line YAML processor. `yq` uses [jq](https://github.com/stedolan/jq) like syntax but works with yaml files as well as json. It doesn't yet support everything `jq` does - but it does support the most common operations and functions, and more is being added continuously.
 
 yq is written in go - so you can download a dependency free binary for your platform and you are good to go! If you prefer there are a variety of package managers that can be used as well as Docker and Podman, all listed below.
 
-## Notice for v4.x versions prior to 4.18.1
-Since 4.18.1, yq's 'eval/e' command is the _default_ command and no longer needs to be specified.
-
-Older versions will still need to specify 'eval/e'.
-
-Similarly, '-' is no longer required as a filename to read from STDIN (unless reading from one or more files).
-
-TLDR:
-
-Prior to 4.18.1 
-```bash
-cat file.yaml | yq e '.cool' -
-```
-
-4.18+ 
-```bash
-cat file.yaml | yq '.cool'
-```
-
-When merging multiple files together, `eval-all/ea` is still required to tell `yq` to run the expression against all the document at once.
-
 ## Quick Usage Guide
 
 Read a value:
 ```bash
-yq '.a.b[0].c' file.yaml
+yq e '.a.b[0].c' file.yaml
 ```
 
 Pipe from STDIN:
 ```bash
-cat file.yaml | yq '.a.b[0].c'
+cat file.yaml | yq e '.a.b[0].c' -
 ```
 
 Update a yaml file, inplace
 ```bash
-yq -i '.a.b[0].c = "cool"' file.yaml
+yq e -i '.a.b[0].c = "cool"' file.yaml
 ```
 
 Update using environment variables
 ```bash
-NAME=mike yq -i '.a.b[0].c = strenv(NAME)' file.yaml
+NAME=mike yq e -i '.a.b[0].c = strenv(NAME)' file.yaml
 ```
 
 Merge multiple files
-```bash
-# note the use of `ea` to evaluate all the files at once
-# instead of in sequence
+```
 yq ea '. as $item ireduce ({}; . * $item )' path/to/*.yml
 ```
 
 Multiple updates to a yaml file
 ```bash
-yq -i '
+yq e -i '
   .a.b[0].c = "cool" |
   .x.y.z = "foobar" |
   .person.name = strenv(NAME)
 ' file.yaml
 ```
 
-Convert JSON to YAML
-```bash
-yq -P sample.json
-```
-
-See the [documentation](https://mikefarah.gitbook.io/yq/) for more examples.
+See the [documentation](https://mikefarah.gitbook.io/yq/) for more.
 
 ## Install
 
@@ -110,32 +82,30 @@ snap install yq
 `yq` installs with [_strict confinement_](https://docs.snapcraft.io/snap-confinement/6233) in snap, this means it doesn't have direct access to root files. To read root files you can:
 
 ```
-sudo cat /etc/myfile | yq '.a.path'
+sudo cat /etc/myfile | yq e '.a.path' - 
 ```
 
 And to write to a root file you can either use [sponge](https://linux.die.net/man/1/sponge):
 ```
-sudo cat /etc/myfile | yq '.a.path = "value"' | sudo sponge /etc/myfile
+sudo cat /etc/myfile | yq e '.a.path = "value"' - | sudo sponge /etc/myfile
 ```
 or write to a temporary file:
 ```
-sudo cat /etc/myfile | yq '.a.path = "value"' | sudo tee /etc/myfile.tmp
+sudo cat /etc/myfile | yq e '.a.path = "value"' | sudo tee /etc/myfile.tmp
 sudo mv /etc/myfile.tmp /etc/myfile
 rm /etc/myfile.tmp
 ```
 
 ### Run with Docker or Podman
+
 #### Oneshot use:
 
 ```bash
-docker run --rm -v "${PWD}":/workdir mikefarah/yq [command] [flags] [expression ]FILE...
+docker run --rm -v "${PWD}":/workdir mikefarah/yq <command> [flags] [expression ]FILE...
 ```
 
-Note that you can run `yq` in docker without network access and other privileges if you desire,
-namely `--security-opt=no-new-privileges --cap-drop all --network none`.
-
 ```bash
-podman run --rm -v "${PWD}":/workdir mikefarah/yq [command] [flags] [expression ]FILE...
+podman run --rm -v "${PWD}":/workdir mikefarah/yq <command> [flags] [expression ]FILE...
 ```
 
 #### Pipe in via STDIN:
@@ -143,11 +113,11 @@ podman run --rm -v "${PWD}":/workdir mikefarah/yq [command] [flags] [expression
 You'll need to pass the `-i\--interactive` flag to docker:
 
 ```bash
-cat myfile.yml | docker run -i --rm mikefarah/yq '.this.thing'
+cat myfile.yml | docker run -i --rm mikefarah/yq e . -
 ```
 
 ```bash
-cat myfile.yml | podman run -i --rm mikefarah/yq '.this.thing'
+cat myfile.yml | podman run -i --rm mikefarah/yq e . -
 ```
 
 #### Run commands interactively:
@@ -173,6 +143,8 @@ yq() {
   podman run --rm -i -v "${PWD}":/workdir mikefarah/yq "$@"
 }
 ```
+
+
 #### Running as root:
 
 `yq`'s container image no longer runs under root (https://github.com/mikefarah/yq/pull/860). If you'd like to install more things in the container image, or you're having permissions issues when attempting to read/write files you'll need to either:
@@ -192,18 +164,7 @@ Or, in your Dockerfile:
 FROM mikefarah/yq
 
 USER root
-RUN apk add --no-cache bash
-USER yq
-```
-
-#### Missing timezone data
-By default, the alpine image yq uses does not include timezone data. If you'd like to use the `tz` operator, you'll need to include this data:
-
-```
-FROM mikefarah/yq
-
-USER root
-RUN apk add --no-cache tzdata
+RUN apk add bash
 USER yq
 ```
 
@@ -212,7 +173,7 @@ USER yq
   - name: Set foobar to cool
     uses: mikefarah/yq@master
     with:
-      cmd: yq -i '.foo.bar = "cool"' 'config.yml'
+      cmd: yq eval -i '.foo.bar = "cool"' 'config.yml'
 ```
 
 See https://mikefarah.gitbook.io/yq/usage/github-action for more.
@@ -234,12 +195,6 @@ webi yq
 See [webi](https://webinstall.dev/)
 Supported by @adithyasunil26 (https://github.com/webinstall/webi-installers/tree/master/yq)
 
-### Arch Linux
-
-```
-pacman -S go-yq
-```
-
 ### Windows:
 [![Chocolatey](https://img.shields.io/chocolatey/v/yq.svg)](https://chocolatey.org/packages/yq)
 [![Chocolatey](https://img.shields.io/chocolatey/dt/yq.svg)](https://chocolatey.org/packages/yq)
@@ -277,23 +232,20 @@ Supported by @rmescandon (https://launchpad.net/~rmescandon/+archive/ubuntu/yq)
 ## Features
 - [Detailed documentation with many examples](https://mikefarah.gitbook.io/yq/)
 - Written in portable go, so you can download a lovely dependency free binary
-- Uses similar syntax as `jq` but works with YAML, [JSON](https://mikefarah.gitbook.io/yq/usage/convert) and [XML](https://mikefarah.gitbook.io/yq/usage/xml) files
+- Uses similar syntax as `jq` but works with YAML and JSON files
 - Fully supports multi document yaml files
 - Supports yaml [front matter](https://mikefarah.gitbook.io/yq/usage/front-matter) blocks (e.g. jekyll/assemble)
 - Colorized yaml output
-- [Date/Time manipulation and formatting with TZ](https://mikefarah.gitbook.io/yq/operators/datetime)
-- [Deeply data structures](https://mikefarah.gitbook.io/yq/operators/traverse-read)
-- [Sort keys](https://mikefarah.gitbook.io/yq/operators/sort-keys)
+- [Deeply traverse yaml](https://mikefarah.gitbook.io/yq/operators/traverse-read)
+- [Sort yaml by keys](https://mikefarah.gitbook.io/yq/operators/sort-keys)
 - Manipulate yaml [comments](https://mikefarah.gitbook.io/yq/operators/comment-operators), [styling](https://mikefarah.gitbook.io/yq/operators/style), [tags](https://mikefarah.gitbook.io/yq/operators/tag) and [anchors and aliases](https://mikefarah.gitbook.io/yq/operators/anchor-and-alias-operators).
-- [Update inplace](https://mikefarah.gitbook.io/yq/v/v4.x/commands/evaluate#flags)
+- [Update yaml inplace](https://mikefarah.gitbook.io/yq/v/v4.x/commands/evaluate#flags)
 - [Complex expressions to select and update](https://mikefarah.gitbook.io/yq/operators/select#select-and-update-matching-values-in-map)
 - Keeps yaml formatting and comments when updating (though there are issues with whitespace)
-- [Decode/Encode base64 data](https://mikefarah.gitbook.io/yq/operators/encode-decode)
 - [Load content from other files](https://mikefarah.gitbook.io/yq/operators/load)
 - [Convert to/from json](https://mikefarah.gitbook.io/yq/v/v4.x/usage/convert)
-- [Convert to/from xml](https://mikefarah.gitbook.io/yq/v/v4.x/usage/xml)
-- [Convert to/from properties](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties)
-- [Convert to csv/tsv](https://mikefarah.gitbook.io/yq/usage/csv-tsv)
+- [Convert to properties](https://mikefarah.gitbook.io/yq/v/v4.x/usage/properties)
+- [Pipe data in by using '-'](https://mikefarah.gitbook.io/yq/v/v4.x/commands/evaluate)
 - [General shell completion scripts (bash/zsh/fish/powershell)](https://mikefarah.gitbook.io/yq/v/v4.x/commands/shell-completion)
 - [Reduce](https://mikefarah.gitbook.io/yq/operators/reduce) to merge multiple files or sum an array or other fancy things.
 - [Github Action](https://mikefarah.gitbook.io/yq/usage/github-action) to use in your automated pipeline (thanks @devorbitus)
@@ -307,41 +259,28 @@ Usage:
   yq [flags]
   yq [command]
 
-Examples:
-
-# yq defaults to 'eval' command if no command is specified. See "yq eval --help" for more examples.
-cat myfile.yml | yq '.stuff' # outputs the data at the "stuff" node from "myfile.yml"
-
-yq -i '.stuff = "foo"' myfile.yml # update myfile.yml inplace
-
-
 Available Commands:
-  completion       Generate the autocompletion script for the specified shell
-  eval             (default) Apply the expression to each document in each yaml file in sequence
+  eval             Apply the expression to each document in each yaml file in sequence
   eval-all         Loads _all_ yaml documents of _all_ yaml files and runs expression once
   help             Help about any command
   shell-completion Generate completion script
 
 Flags:
-  -C, --colors                        force print with colors
-  -e, --exit-status                   set exit status if there are no matches or null or false is returned
-  -f, --front-matter string           (extract|process) first input as yaml front-matter. Extract will pull out the yaml content, process will run the expression against the yaml content, leaving the remaining data intact
-      --header-preprocess             Slurp any header comments and separators before processing expression. (default true)
-  -h, --help                          help for yq
-  -I, --indent int                    sets indent level for output (default 2)
-  -i, --inplace                       update the file inplace of first file given.
-  -p, --input-format string           [yaml|y|xml|x] parse format for input. Note that json is a subset of yaml. (default "yaml")
-  -M, --no-colors                     force print with no colors
-  -N, --no-doc                        Don't print document separators (---)
-  -n, --null-input                    Don't read input, simply evaluate the expression given. Useful for creating docs from scratch.
-  -o, --output-format string          [yaml|y|json|j|props|p|xml|x] output format type. (default "yaml")
-  -P, --prettyPrint                   pretty print, shorthand for '... style = ""'
-  -s, --split-exp string              print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter.
-      --unwrapScalar                  unwrap scalar, print the value with no quotes, colors or comments (default true)
-  -v, --verbose                       verbose mode
-  -V, --version                       Print version information and quit
-      --xml-attribute-prefix string   prefix for xml attributes (default "+")
-      --xml-content-name string       name for xml content (if no attribute name is present). (default "+content")
+  -C, --colors                force print with colors
+  -e, --exit-status           set exit status if there are no matches or null or false is returned
+  -f, --front-matter string   (extract|process) first input as yaml front-matter. Extract will pull out the yaml content, process will run the expression against the yaml content, leaving the remaining data intact
+      --header-preprocess     Slurp any header comments and seperators before processing expression. This is a workaround for go-yaml to persist header content (default true)
+  -h, --help                  help for yq
+  -I, --indent int            sets indent level for output (default 2)
+  -i, --inplace               update the yaml file inplace of first yaml file given.
+  -M, --no-colors             force print with no colors
+  -N, --no-doc                Don't print document separators (---)
+  -n, --null-input            Don't read input, simply evaluate the expression given. Useful for creating yaml docs from scratch.
+  -o, --output-format string  [yaml|y|json|j|props|p] output format type. (default "yaml")
+  -P, --prettyPrint           pretty print, shorthand for '... style = ""'
+      --unwrapScalar          unwrap scalar, print the value with no quotes, colors or comments (default true)
+  -v, --verbose               verbose mode
+  -V, --version               Print version information and quit
 
 Use "yq [command] --help" for more information about a command.
 ```

acceptance_tests/basic.sh

@@ -1,163 +1,12 @@
 #!/bin/bash
 
 setUp() {
-  rm test*.yml 2>/dev/null || true
-  rm .xyz 2>/dev/null || true
-  rm instructions.txt 2>/dev/null || true
+  rm test*.yml || true
 }
 
 testBasicEvalRoundTrip() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals 123 "$X"
-}
-
-testBasicPipeWithDot() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat test.yml | ./yq '.')
-  assertEquals "a: 123" "$X"
-}
-
-testBasicExpressionMatchesFileName() {
-  ./yq -n ".xyz = 123" > test.yml
-  touch .xyz
-  
-  X=$(./yq --expression '.xyz' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(./yq ea --expression '.xyz' test.yml)
-  assertEquals "123" "$X"
-}
-
-testBasicExpressionFromFile() {
-  ./yq -n ".xyz = 123" > test.yml
-  echo '.xyz = "meow" | .cool = "frog"' > instructions.txt
-  
-  X=$(./yq --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-
-  X=$(./yq ea --from-file instructions.txt test.yml -o=j -I=0)
-  assertEquals '{"xyz":"meow","cool":"frog"}' "$X"
-}
-
-testBasicGitHubAction() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat /dev/null | ./yq test.yml)
-  assertEquals "a: 123" "$X"
-
-  X=$(cat /dev/null | ./yq e test.yml)
-  assertEquals "a: 123" "$X"
-
-  X=$(cat /dev/null | ./yq ea test.yml)
-  assertEquals "a: 123" "$X"
-}
-
-testBasicGitHubActionWithExpression() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(cat /dev/null | ./yq '.a' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(cat /dev/null | ./yq e '.a' test.yml)
-  assertEquals "123" "$X"
-
-  X=$(cat /dev/null | ./yq ea '.a' test.yml)
-  assertEquals "123" "$X"
-}
-
-
-testBasicEvalAllAllFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(./yq ea test.yml test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-# when given a file, don't read STDIN
-# otherwise strange things start happening
-# in scripts
-# https://github.com/mikefarah/yq/issues/1115
-
-testBasicCatWithFilesNoDash() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq test2.yml)
-  Y=$(./yq e '.' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllCatWithFilesNoDash() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea test2.yml)
-  Y=$(./yq e '.' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicCatWithFilesNoDashWithExp() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq '.a' test2.yml)
-  Y=$(./yq e '.a' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllCatWithFilesNoDashWithExp() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea '.a' test2.yml)
-  Y=$(./yq e '.a' test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-
-testBasicStdInWithFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq - test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllStdInWithFiles() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea - test2.yml)
-  Y=$(./yq e '.' test.yml test2.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicStdInWithFilesReverse() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq test2.yml -)
-  Y=$(./yq e '.' test2.yml test.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalAllStdInWithFilesReverse() {
-  ./yq -n ".a = 123" > test.yml
-  ./yq -n ".a = 124" > test2.yml
-  X=$(cat test.yml | ./yq ea test2.yml -)
-  Y=$(./yq e '.' test2.yml test.yml)
-  assertEquals "$Y" "$X"
-}
-
-testBasicEvalRoundTripNoEval() {
-  ./yq -n ".a = 123" > test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals 123 "$X"
-}
-
-testBasicStdInWithOneArg() {
   ./yq e -n ".a = 123" > test.yml
-  X=$(cat test.yml | ./yq e ".a")
-  assertEquals 123 "$X"
-
-  X=$(cat test.yml | ./yq ea ".a")
-  assertEquals 123 "$X"
-
-  X=$(cat test.yml | ./yq ".a")
+  X=$(./yq e '.a' test.yml)
   assertEquals 123 "$X"
 }
 
@@ -170,15 +19,6 @@ EOL
   assertEquals "10" "$X"
 }
 
-testBasicUpdateInPlaceSequenceNoEval() {
-  cat >test.yml <<EOL
-a: 0
-EOL
-  ./yq -i ".a = 10" test.yml
-  X=$(./yq '.a' test.yml)
-  assertEquals "10" "$X"
-}
-
 testBasicUpdateInPlaceSequenceEvalAll() {
   cat >test.yml <<EOL
 a: 0
@@ -200,12 +40,6 @@ testBasicExitStatus() {
   assertEquals 1 "$?"
 }
 
-testBasicExitStatusNoEval() {
-  echo "a: cat" > test.yml
-  X=$(./yq -e '.z' test.yml 2&>/dev/null)
-  assertEquals 1 "$?"
-}
-
 testBasicExtractFieldWithSeperator() {
     cat >test.yml <<EOL
 ---

acceptance_tests/completion.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-testCompletionRuns() {
-    result=$(./yq __complete "" 2>&1)
-    assertEquals 0 $?
-    assertContains "$result" "Completion ended with directive:"
-}
-
-source ./scripts/shunit2

acceptance_tests/inputs-format.sh

@@ -1,79 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml 2>/dev/null || true
-  rm test*.properties 2>/dev/null || true
-  rm test*.xml 2>/dev/null || true
-}
-
-testInputProperties() {
-  cat >test.properties <<EOL
-mike.things = hello
-EOL
-
-  read -r -d '' expected << EOM
-mike:
-  things: hello
-EOM
-
-  X=$(./yq e -p=props test.properties)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=props test.properties)
-  assertEquals "$expected" "$X"
-}
-
-testInputPropertiesGitHubAction() {
-  cat >test.properties <<EOL
-mike.things = hello
-EOL
-
-  read -r -d '' expected << EOM
-mike:
-  things: hello
-EOM
-
-  X=$(cat /dev/null | ./yq e -p=props test.properties)
-  assertEquals "$expected" "$X"
-
-  X=$(cat /dev/null | ./yq ea -p=props test.properties)
-  assertEquals "$expected" "$X"
-}
-
-testInputXml() {
-  cat >test.yml <<EOL
-<cat legs="4">BiBi</cat>
-EOL
-
-  read -r -d '' expected << EOM
-cat:
-  +content: BiBi
-  +legs: "4"
-EOM
-
-  X=$(./yq e -p=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea -p=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testInputXmlGithubAction() {
-  cat >test.yml <<EOL
-<cat legs="4">BiBi</cat>
-EOL
-
-  read -r -d '' expected << EOM
-cat:
-  +content: BiBi
-  +legs: "4"
-EOM
-
-  X=$(cat /dev/null | ./yq e -p=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(cat /dev/null | ./yq ea -p=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-source ./scripts/shunit2

acceptance_tests/output-format.sh

@@ -102,65 +102,4 @@ EOM
   assertEquals "$expected" "$X"
 }
 
-testOutputXml() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b>
-    <c>cat</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=xml test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=xml test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXmlShort() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat"]}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b>
-    <c>cat</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-}
-
-testOutputXmComplex() {
-  cat >test.yml <<EOL
-a: {b: {c: ["cat", "dog"], +f: meow}}
-EOL
-
-  read -r -d '' expected << EOM
-<a>
-  <b f="meow">
-    <c>cat</c>
-    <c>dog</c>
-  </b>
-</a>
-EOM
-
-  X=$(./yq e --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-
-  X=$(./yq ea --output-format=x test.yml)
-  assertEquals "$expected" "$X"
-}
-
 source ./scripts/shunit2

acceptance_tests/pipe.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-setUp() {
-  rm test*.yml || true
-  cat >test.yml <<EOL
-a: frog
-EOL
-}
-
-testPipeViaCatWithParam() {
-  X=$(cat test.yml | ./yq '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatWithParamEval() {
-  X=$(cat test.yml | ./yq e '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatWithParamEvalAll() {
-  X=$(cat test.yml | ./yq ea '.a')
-  assertEquals "frog" "$X"
-}
-
-testPipeViaCatNoParam() {
-  X=$(cat test.yml | ./yq)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaCatNoParamEval() {
-  X=$(cat test.yml | ./yq e)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaCatNoParamEvalAll() {
-  X=$(cat test.yml | ./yq ea)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishWithParam() {
-  X=$(./yq '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishWithParamEval() {
-  X=$(./yq e '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishWithParamEvalAll() {
-  X=$(./yq ea '.a' < test.yml)
-  assertEquals "frog" "$X"
-}
-
-testPipeViaFileishNoParam() {
-  X=$(./yq < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishNoParamEval() {
-  X=$(./yq e < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-testPipeViaFileishNoParamEvalAll() {
-  X=$(./yq ea < test.yml)
-  assertEquals "a: frog" "$X"
-}
-
-source ./scripts/shunit2

cmd/commands_test.go

@@ -0,0 +1,83 @@
+package cmd
+
+// import (
+// 	"strings"
+// 	"testing"
+
+// 	"github.com/mikefarah/yq/v3/test"
+// 	"github.com/spf13/cobra"
+// )
+
+// func getRootCommand() *cobra.Command {
+// 	return New()
+// }
+
+// func TestRootCmd(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !strings.Contains(result.Output, "Usage:") {
+// 		t.Error("Expected usage message to be printed out, but the usage message was not found.")
+// 	}
+// }
+
+// func TestRootCmd_Help(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "--help")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !strings.Contains(result.Output, "yq is a lightweight and portable command-line YAML processor. It aims to be the jq or sed of yaml files.") {
+// 		t.Error("Expected usage message to be printed out, but the usage message was not found.")
+// 	}
+// }
+
+// func TestRootCmd_VerboseLong(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "--verbose")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !verbose {
+// 		t.Error("Expected verbose to be true")
+// 	}
+// }
+
+// func TestRootCmd_VerboseShort(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "-v")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+
+// 	if !verbose {
+// 		t.Error("Expected verbose to be true")
+// 	}
+// }
+
+// func TestRootCmd_VersionShort(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "-V")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+// 	if !strings.Contains(result.Output, "yq version") {
+// 		t.Error("expected version message to be printed out, but the message was not found.")
+// 	}
+// }
+
+// func TestRootCmd_VersionLong(t *testing.T) {
+// 	cmd := getRootCommand()
+// 	result := test.RunCmd(cmd, "--version")
+// 	if result.Error != nil {
+// 		t.Error(result.Error)
+// 	}
+// 	if !strings.Contains(result.Output, "yq version") {
+// 		t.Error("expected version message to be printed out, but the message was not found.")
+// 	}
+// }

cmd/constant.go

@@ -28,7 +28,3 @@ var frontMatter = ""
 var splitFileExp = ""
 
 var completedSuccessfully = false
-
-var forceExpression = ""
-
-var expressionFile = ""

cmd/evaluate_all_command.go

@@ -39,7 +39,7 @@ Note that it consumes more memory than eval.
 	}
 	return cmdEvalAll
 }
-func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
+func evaluateAll(cmd *cobra.Command, args []string) error {
 	// 0 args, read std in
 	// 1 arg, null input, process expression
 	// 1 arg, read file in sequence
@@ -54,22 +54,6 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
 
 	stat, _ := os.Stdin.Stat()
 	pipingStdIn := (stat.Mode() & os.ModeCharDevice) == 0
-	yqlib.GetLogger().Debug("pipingStdIn: %v", pipingStdIn)
-
-	yqlib.GetLogger().Debug("stat.Mode(): %v", stat.Mode())
-	yqlib.GetLogger().Debug("ModeDir: %v", stat.Mode()&os.ModeDir)
-	yqlib.GetLogger().Debug("ModeAppend: %v", stat.Mode()&os.ModeAppend)
-	yqlib.GetLogger().Debug("ModeExclusive: %v", stat.Mode()&os.ModeExclusive)
-	yqlib.GetLogger().Debug("ModeTemporary: %v", stat.Mode()&os.ModeTemporary)
-	yqlib.GetLogger().Debug("ModeSymlink: %v", stat.Mode()&os.ModeSymlink)
-	yqlib.GetLogger().Debug("ModeDevice: %v", stat.Mode()&os.ModeDevice)
-	yqlib.GetLogger().Debug("ModeNamedPipe: %v", stat.Mode()&os.ModeNamedPipe)
-	yqlib.GetLogger().Debug("ModeSocket: %v", stat.Mode()&os.ModeSocket)
-	yqlib.GetLogger().Debug("ModeSetuid: %v", stat.Mode()&os.ModeSetuid)
-	yqlib.GetLogger().Debug("ModeSetgid: %v", stat.Mode()&os.ModeSetgid)
-	yqlib.GetLogger().Debug("ModeCharDevice: %v", stat.Mode()&os.ModeCharDevice)
-	yqlib.GetLogger().Debug("ModeSticky: %v", stat.Mode()&os.ModeSticky)
-	yqlib.GetLogger().Debug("ModeIrregular: %v", stat.Mode()&os.ModeIrregular)
 
 	out := cmd.OutOrStdout()
 
@@ -83,11 +67,7 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
 		}
 		// need to indirectly call the function so  that completedSuccessfully is
 		// passed when we finish execution as opposed to now
-		defer func() {
-			if cmdError == nil {
-				cmdError = writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully)
-			}
-		}()
+		defer func() { writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully) }()
 	}
 
 	format, err := yqlib.OutputFormatFromString(outputFormat)
@@ -100,13 +80,9 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
 		return err
 	}
 
-	printerWriter, err := configurePrinterWriter(format, out)
-	if err != nil {
-		return err
-	}
-	encoder := configureEncoder(format)
+	printerWriter := configurePrinterWriter(format, out)
 
-	printer := yqlib.NewPrinter(encoder, printerWriter)
+	printer := yqlib.NewPrinter(printerWriter, format, unwrapScalar, colorsEnabled, indent, !noDocSeparators)
 
 	if frontMatter != "" {
 		frontMatterHandler := yqlib.NewFrontMatterHandler(args[firstFileIndex])
@@ -125,23 +101,22 @@ func evaluateAll(cmd *cobra.Command, args []string) (cmdError error) {
 	}
 
 	allAtOnceEvaluator := yqlib.NewAllAtOnceEvaluator()
-
-	expression, args, err := processArgs(pipingStdIn, args)
-	if err != nil {
-		return err
-	}
-	yqlib.GetLogger().Debugf("processed args: %v", args)
-
 	switch len(args) {
 	case 0:
-		if nullInput {
-			err = yqlib.NewStreamEvaluator().EvaluateNew(processExpression(expression), printer, "")
+		if pipingStdIn {
+			err = allAtOnceEvaluator.EvaluateFiles(processExpression(""), []string{"-"}, printer, leadingContentPreProcessing, decoder)
 		} else {
 			cmd.Println(cmd.UsageString())
 			return nil
 		}
+	case 1:
+		if nullInput {
+			err = yqlib.NewStreamEvaluator().EvaluateNew(processExpression(args[0]), printer, "")
+		} else {
+			err = allAtOnceEvaluator.EvaluateFiles(processExpression(""), []string{args[0]}, printer, leadingContentPreProcessing, decoder)
+		}
 	default:
-		err = allAtOnceEvaluator.EvaluateFiles(processExpression(expression), args, printer, leadingContentPreProcessing, decoder)
+		err = allAtOnceEvaluator.EvaluateFiles(processExpression(args[0]), args[1:], printer, leadingContentPreProcessing, decoder)
 	}
 
 	completedSuccessfully = err == nil

cmd/evalute_sequence_command.go

@@ -13,7 +13,7 @@ func createEvaluateSequenceCommand() *cobra.Command {
 	var cmdEvalSequence = &cobra.Command{
 		Use:     "eval [expression] [yaml_file1]...",
 		Aliases: []string{"e"},
-		Short:   "(default) Apply the expression to each document in each yaml file in sequence",
+		Short:   "Apply the expression to each document in each yaml file in sequence",
 		Example: `
 # Reads field under the given path for each file
 yq e '.a.b' f1.yml f2.yml 
@@ -44,16 +44,16 @@ expression and prints the result in sequence.`,
 }
 
 func processExpression(expression string) string {
-
+	var prettyPrintExp = `(... | (select(tag != "!!str"), select(tag == "!!str") | select(test("(?i)^(y|yes|n|no|on|off)$") | not))  ) style=""`
 	if prettyPrint && expression == "" {
-		return yqlib.PrettyPrintExp
+		return prettyPrintExp
 	} else if prettyPrint {
-		return fmt.Sprintf("%v | %v", expression, yqlib.PrettyPrintExp)
+		return fmt.Sprintf("%v | %v", expression, prettyPrintExp)
 	}
 	return expression
 }
 
-func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
+func evaluateSequence(cmd *cobra.Command, args []string) error {
 	// 0 args, read std in
 	// 1 arg, null input, process expression
 	// 1 arg, read file in sequence
@@ -67,27 +67,6 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
 
 	stat, _ := os.Stdin.Stat()
 	pipingStdIn := (stat.Mode() & os.ModeCharDevice) == 0
-	yqlib.GetLogger().Debug("pipingStdIn: %v", pipingStdIn)
-
-	yqlib.GetLogger().Debug("stat.Mode(): %v", stat.Mode())
-	yqlib.GetLogger().Debug("ModeDir: %v", stat.Mode()&os.ModeDir)
-	yqlib.GetLogger().Debug("ModeAppend: %v", stat.Mode()&os.ModeAppend)
-	yqlib.GetLogger().Debug("ModeExclusive: %v", stat.Mode()&os.ModeExclusive)
-	yqlib.GetLogger().Debug("ModeTemporary: %v", stat.Mode()&os.ModeTemporary)
-	yqlib.GetLogger().Debug("ModeSymlink: %v", stat.Mode()&os.ModeSymlink)
-	yqlib.GetLogger().Debug("ModeDevice: %v", stat.Mode()&os.ModeDevice)
-	yqlib.GetLogger().Debug("ModeNamedPipe: %v", stat.Mode()&os.ModeNamedPipe)
-	yqlib.GetLogger().Debug("ModeSocket: %v", stat.Mode()&os.ModeSocket)
-	yqlib.GetLogger().Debug("ModeSetuid: %v", stat.Mode()&os.ModeSetuid)
-	yqlib.GetLogger().Debug("ModeSetgid: %v", stat.Mode()&os.ModeSetgid)
-	yqlib.GetLogger().Debug("ModeCharDevice: %v", stat.Mode()&os.ModeCharDevice)
-	yqlib.GetLogger().Debug("ModeSticky: %v", stat.Mode()&os.ModeSticky)
-	yqlib.GetLogger().Debug("ModeIrregular: %v", stat.Mode()&os.ModeIrregular)
-
-	// Mask for the type bits. For regular files, none will be set.
-	yqlib.GetLogger().Debug("ModeType: %v", stat.Mode()&os.ModeType)
-
-	yqlib.GetLogger().Debug("ModePerm: %v", stat.Mode()&os.ModePerm)
 
 	out := cmd.OutOrStdout()
 
@@ -101,11 +80,7 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
 		}
 		// need to indirectly call the function so  that completedSuccessfully is
 		// passed when we finish execution as opposed to now
-		defer func() {
-			if cmdError == nil {
-				cmdError = writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully)
-			}
-		}()
+		defer func() { writeInPlaceHandler.FinishWriteInPlace(completedSuccessfully) }()
 	}
 
 	format, err := yqlib.OutputFormatFromString(outputFormat)
@@ -113,22 +88,18 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
 		return err
 	}
 
-	printerWriter, err := configurePrinterWriter(format, out)
-	if err != nil {
-		return err
-	}
-	encoder := configureEncoder(format)
+	printerWriter := configurePrinterWriter(format, out)
 
-	printer := yqlib.NewPrinter(encoder, printerWriter)
+	printer := yqlib.NewPrinter(printerWriter, format, unwrapScalar, colorsEnabled, indent, !noDocSeparators)
 
 	decoder, err := configureDecoder()
 	if err != nil {
 		return err
 	}
+
 	streamEvaluator := yqlib.NewStreamEvaluator()
 
 	if frontMatter != "" {
-		yqlib.GetLogger().Debug("using front matter handler")
 		frontMatterHandler := yqlib.NewFrontMatterHandler(args[firstFileIndex])
 		err = frontMatterHandler.Split()
 		if err != nil {
@@ -143,21 +114,23 @@ func evaluateSequence(cmd *cobra.Command, args []string) (cmdError error) {
 		}
 		defer frontMatterHandler.CleanUp()
 	}
-	expression, args, err := processArgs(pipingStdIn, args)
-	if err != nil {
-		return err
-	}
 
 	switch len(args) {
 	case 0:
-		if nullInput {
-			err = streamEvaluator.EvaluateNew(processExpression(expression), printer, "")
+		if pipingStdIn {
+			err = streamEvaluator.EvaluateFiles(processExpression(""), []string{"-"}, printer, leadingContentPreProcessing, decoder)
 		} else {
 			cmd.Println(cmd.UsageString())
 			return nil
 		}
+	case 1:
+		if nullInput {
+			err = streamEvaluator.EvaluateNew(processExpression(args[0]), printer, "")
+		} else {
+			err = streamEvaluator.EvaluateFiles(processExpression(""), []string{args[0]}, printer, leadingContentPreProcessing, decoder)
+		}
 	default:
-		err = streamEvaluator.EvaluateFiles(processExpression(expression), args, printer, leadingContentPreProcessing, decoder)
+		err = streamEvaluator.EvaluateFiles(processExpression(args[0]), args[1:], printer, leadingContentPreProcessing, decoder)
 	}
 	completedSuccessfully = err == nil
 

cmd/root.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"os"
 
-	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/spf13/cobra"
 	logging "gopkg.in/op/go-logging.v1"
 )
@@ -14,30 +13,17 @@ func New() *cobra.Command {
 		Short: "yq is a lightweight and portable command-line YAML processor.",
 		Long: `yq is a portable command-line YAML processor (https://github.com/mikefarah/yq/) 
 See https://mikefarah.gitbook.io/yq/ for detailed documentation and examples.`,
-		Example: `
-# yq defaults to 'eval' command if no command is specified. See "yq eval --help" for more examples.
-
-# read the "stuff" node from "myfile.yml"
-cat myfile.yml | yq '.stuff' 
-
-# update myfile.yml in place
-yq -i '.stuff = "foo"' myfile.yml
-
-# print contents of sample.json as idiomatic YAML
-yq -P sample.json
-`,
-
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if version {
 				cmd.Print(GetVersionDisplay())
 				return nil
 			}
-			return evaluateSequence(cmd, args)
+			cmd.Println(cmd.UsageString())
+			return nil
 
 		},
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			cmd.SetOut(cmd.OutOrStdout())
-
 			var format = logging.MustStringFormatter(
 				`%{color}%{time:15:04:05} %{shortfunc} [%{level:.4s}]%{color:reset} %{message}`,
 			)
@@ -51,9 +37,6 @@ yq -P sample.json
 			}
 
 			logging.SetBackend(backend)
-			yqlib.InitExpressionParser()
-			yqlib.XMLPreferences.AttributePrefix = xmlAttributePrefix
-			yqlib.XMLPreferences.ContentName = xmlContentName
 		},
 	}
 
@@ -65,18 +48,18 @@ yq -P sample.json
 		panic(err)
 	}
 
-	rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "yaml", "[yaml|y|json|j|props|p|xml|x] output format type.")
-	rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "yaml", "[yaml|y|props|p|xml|x] parse format for input. Note that json is a subset of yaml.")
+	rootCmd.PersistentFlags().StringVarP(&outputFormat, "output-format", "o", "yaml", "[yaml|y|json|j|props|p] output format type.")
+	rootCmd.PersistentFlags().StringVarP(&inputFormat, "input-format", "p", "yaml", "[yaml|y|xml|x] input format type.")
 
 	rootCmd.PersistentFlags().StringVar(&xmlAttributePrefix, "xml-attribute-prefix", "+", "prefix for xml attributes")
 	rootCmd.PersistentFlags().StringVar(&xmlContentName, "xml-content-name", "+content", "name for xml content (if no attribute name is present).")
 
-	rootCmd.PersistentFlags().BoolVarP(&nullInput, "null-input", "n", false, "Don't read input, simply evaluate the expression given. Useful for creating docs from scratch.")
+	rootCmd.PersistentFlags().BoolVarP(&nullInput, "null-input", "n", false, "Don't read input, simply evaluate the expression given. Useful for creating yaml docs from scratch.")
 	rootCmd.PersistentFlags().BoolVarP(&noDocSeparators, "no-doc", "N", false, "Don't print document separators (---)")
 
 	rootCmd.PersistentFlags().IntVarP(&indent, "indent", "I", 2, "sets indent level for output")
 	rootCmd.Flags().BoolVarP(&version, "version", "V", false, "Print version information and quit")
-	rootCmd.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the file inplace of first file given.")
+	rootCmd.PersistentFlags().BoolVarP(&writeInplace, "inplace", "i", false, "update the yaml file inplace of first yaml file given.")
 	rootCmd.PersistentFlags().BoolVarP(&unwrapScalar, "unwrapScalar", "", true, "unwrap scalar, print the value with no quotes, colors or comments")
 	rootCmd.PersistentFlags().BoolVarP(&prettyPrint, "prettyPrint", "P", false, "pretty print, shorthand for '... style = \"\"'")
 	rootCmd.PersistentFlags().BoolVarP(&exitStatus, "exit-status", "e", false, "set exit status if there are no matches or null or false is returned")
@@ -84,13 +67,10 @@ yq -P sample.json
 	rootCmd.PersistentFlags().BoolVarP(&forceColor, "colors", "C", false, "force print with colors")
 	rootCmd.PersistentFlags().BoolVarP(&forceNoColor, "no-colors", "M", false, "force print with no colors")
 	rootCmd.PersistentFlags().StringVarP(&frontMatter, "front-matter", "f", "", "(extract|process) first input as yaml front-matter. Extract will pull out the yaml content, process will run the expression against the yaml content, leaving the remaining data intact")
-	rootCmd.PersistentFlags().StringVarP(&forceExpression, "expression", "", "", "forcibly set the expression argument. Useful when yq argument detection thinks your expression is a file.")
-	rootCmd.PersistentFlags().BoolVarP(&leadingContentPreProcessing, "header-preprocess", "", true, "Slurp any header comments and separators before processing expression.")
+	rootCmd.PersistentFlags().BoolVarP(&leadingContentPreProcessing, "header-preprocess", "", true, "Slurp any header comments and separators before processing expression. This is a workaround for go-yaml to persist header content properly.")
 
 	rootCmd.PersistentFlags().StringVarP(&splitFileExp, "split-exp", "s", "", "print each result (or doc) into a file named (exp). [exp] argument must return a string. You can use $index in the expression as the result counter.")
 
-	rootCmd.PersistentFlags().StringVarP(&expressionFile, "from-file", "", "", "Load expression from specified file.")
-
 	rootCmd.AddCommand(
 		createEvaluateSequenceCommand(),
 		createEvaluateAllCommand(),

cmd/utils.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"github.com/spf13/cobra"
-	"gopkg.in/op/go-logging.v1"
 )
 
 func initCommand(cmd *cobra.Command, args []string) (firstFileIndex int, err error) {
@@ -52,107 +51,25 @@ func configureDecoder() (yqlib.Decoder, error) {
 		return nil, err
 	}
 	switch yqlibInputFormat {
-	case yqlib.XMLInputFormat:
-		return yqlib.NewXMLDecoder(xmlAttributePrefix, xmlContentName), nil
-	case yqlib.PropertiesInputFormat:
-		return yqlib.NewPropertiesDecoder(), nil
+	case yqlib.XmlInputFormat:
+		return yqlib.NewXmlDecoder(xmlAttributePrefix, xmlContentName), nil
 	}
-
 	return yqlib.NewYamlDecoder(), nil
 }
 
-func configurePrinterWriter(format yqlib.PrinterOutputFormat, out io.Writer) (yqlib.PrinterWriter, error) {
+func configurePrinterWriter(format yqlib.PrinterOutputFormat, out io.Writer) yqlib.PrinterWriter {
 
 	var printerWriter yqlib.PrinterWriter
 
 	if splitFileExp != "" {
 		colorsEnabled = forceColor
-		splitExp, err := yqlib.ExpressionParser.ParseExpression(splitFileExp)
+		splitExp, err := yqlib.NewExpressionParser().ParseExpression(splitFileExp)
 		if err != nil {
-			return nil, fmt.Errorf("bad split document expression: %w", err)
+			return nil
 		}
 		printerWriter = yqlib.NewMultiPrinterWriter(splitExp, format)
 	} else {
 		printerWriter = yqlib.NewSinglePrinterWriter(out)
 	}
-	return printerWriter, nil
-}
-
-func configureEncoder(format yqlib.PrinterOutputFormat) yqlib.Encoder {
-	switch format {
-	case yqlib.JSONOutputFormat:
-		return yqlib.NewJONEncoder(indent)
-	case yqlib.PropsOutputFormat:
-		return yqlib.NewPropertiesEncoder()
-	case yqlib.CSVOutputFormat:
-		return yqlib.NewCsvEncoder(',')
-	case yqlib.TSVOutputFormat:
-		return yqlib.NewCsvEncoder('\t')
-	case yqlib.YamlOutputFormat:
-		return yqlib.NewYamlEncoder(indent, colorsEnabled, !noDocSeparators, unwrapScalar)
-	case yqlib.XMLOutputFormat:
-		return yqlib.NewXMLEncoder(indent, xmlAttributePrefix, xmlContentName)
-	}
-	panic("invalid encoder")
-}
-
-// this is a hack to enable backwards compatibility with githubactions (which pipe /dev/null into everything)
-// and being able to call yq with the filename as a single parameter
-//
-// without this - yq detects there is stdin (thanks githubactions),
-// then tries to parse the filename as an expression
-func maybeFile(str string) bool {
-	yqlib.GetLogger().Debugf("checking '%v' is a file", str)
-	stat, err := os.Stat(str) // #nosec
-	result := err == nil && !stat.IsDir()
-	if yqlib.GetLogger().IsEnabledFor(logging.DEBUG) {
-		if err != nil {
-			yqlib.GetLogger().Debugf("error: %v", err)
-		} else {
-			yqlib.GetLogger().Debugf("error: %v, dir: %v", err, stat.IsDir())
-		}
-		yqlib.GetLogger().Debugf("result: %v", result)
-	}
-	return result
-}
-
-func processStdInArgs(pipingStdin bool, args []string) []string {
-	// if we've been given a file, don't automatically
-	// read from stdin.
-	// this happens if there is more than one argument
-	// or only one argument and its a file
-	if !pipingStdin || len(args) > 1 || (len(args) > 0 && maybeFile(args[0])) {
-		return args
-	}
-
-	for _, arg := range args {
-		if arg == "-" {
-			return args
-		}
-	}
-	yqlib.GetLogger().Debugf("missing '-', adding it to the end")
-
-	// we're piping from stdin, but there's no '-' arg
-	// lets add one to the end
-	return append(args, "-")
-}
-
-func processArgs(pipingStdin bool, originalArgs []string) (string, []string, error) {
-	expression := forceExpression
-	if expressionFile != "" {
-		expressionBytes, err := os.ReadFile(expressionFile)
-		if err != nil {
-			return "", nil, err
-		}
-		expression = string(expressionBytes)
-	}
-
-	args := processStdInArgs(pipingStdin, originalArgs)
-	yqlib.GetLogger().Debugf("processed args: %v", args)
-	if expression == "" && len(args) > 0 && args[0] != "-" && !maybeFile(args[0]) {
-		yqlib.GetLogger().Debug("assuming expression is '%v'", args[0])
-		expression = args[0]
-		args = args[1:]
-	}
-	return expression, args, nil
+	return printerWriter
 }

cmd/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// Version is main version number that is being run at the moment.
-	Version = "4.23.1"
+	Version = "4.16.2"
 
 	// VersionPrerelease is a pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release

debian/changelog

@@ -1,112 +1,3 @@
-yq (4.16.2) focal; urgency=medium
-
-  * Fixed with semicolon space issue
-  * Updating with documentation
-  * Added STDIN example to the top
-  * minor readme cleanup
-  * Help text tweak
-  * Fixed docker timeout - simplify docker builds
-  * New release with docker build fixes
-  * Updating to go 1.17 to fix CVE #944
-  * Fix a typo in root.go
-  * Skip the tests if the nocheck Debian build option is specified
-  * Fixed select bug (#958)
-  * Sped up explode operator
-  * Slight performance improvement to context.ChildContext
-  * Speed up multiply
-  * Update README with recently added / changed options
-  * Make deepMatch report in linear time
-  * Removed leadingContentPreProcessing flag - header preprocessing is stable
-  * Revert "Removed leadingContentPreProcessing flag - header preprocessing is stable"
-  * Keep flag, it is needed in corner cases
-  * Updated Readme
-  * Man page
-  * Fixed expression parsing bug #970
-  * Bumping go-lang, docker versions
-  * Added test release flow
-  * Updated github action release to generate man page
-  * Bumping version
-  * Removing no longer needed github action
-  * Added decoder op
-  * Fixed newline handling when decoding/encoding
-  * Fixed newline handling in encoder/decoder
-  * Can specify indent in encode ops
-  * Added group_by operator
-  * Added flatten operator
-  * Fixed flatten error message
-  * Improving docs
-  * Split printer
-  * Refactored command logic
-  * Fix JSON encoding removing null #985
-  * Fixed acceptance tests
-  * gitbook
-  * Update document generation script
-  * Updating README
-  * Updating release instructions
-  * github action no longer uses data1.yml
-  * Create dependabot.yml
-  * Bump actions/create-release from 1.0.0 to 1.1.4
-  * Bump actions/setup-go from 1 to 2.1.4
-  * Bump github.com/goccy/go-yaml from 1.8.9 to 1.9.4
-  * Bump github.com/jinzhu/copier from 0.2.8 to 0.3.2
-  * Bump github.com/fatih/color from 1.10.0 to 1.13.0
-  * Bump github.com/spf13/cobra from 1.1.3 to 1.2.1
-  * Update dependabot.yml
-  * Update go.yml
-  * add build check to PRs
-  * Include secure as part of build process
-  * Fixing bad label in github action
-  * fixed printer test
-  * remove leading content indicator
-  * Fixed header preprocessing!
-  * lint : define golangci configuration file
-  * Update check.sh
-  * Load file acceptance test
-  * Minor improvement on handling front matter
-  * Improved load doc
-  * feature: detect MANPATh and install there
-  * Update install-man-page.sh
-  * simplify prod stage, move version label to action
-  * add labels, quote some values
-  * enable errorlint linter
-  * Added errorlint to devtools
-  * Added key operator
-  * Added more tests
-  * Fixing comments
-  * Attempt to fix golint problem
-  * Include version query for tools
-  * Clean up errored file?
-  * enable misspell linter
-  * updated readme
-  * update Golangci version to v1.43.0
-  * gci linter
-  * Better merge array by key example
-  * Added credit for merge by array example
-  * Better formatting of merge arrays example
-  * Better merge example
-  * Add accessor for the yq logger instance (#1013)
-  * Fixed collect op when working with multiple nodes
-  * Added map, map_values
-  * Add support for Podman as well as Docker (#1026)
-  * Bump github.com/jinzhu/copier from 0.3.2 to 0.3.4 (#1027)
-  * Added csv, tsv output formats
-  * Added encoder tests
-  * Cleanup test
-  * Fixed docker permission issue #1014
-  * Recording release notes for next release
-  * Assignment op no longer clobbers anchor (#1029)
-  * Added sort_by operator
-  * Improved error message
-  * Improved tips and tricks
-  * Report while filename failed to parse #1030
-  * Added script for extracting checksums
-  * Improved extract-checksum.sh
-  * Bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (#1039)
-  * enable more linters (#1043)
-  * Bump golang compiler #1037
-
- -- Roberto Mier Escandon <rmescandon@gmail.com>  Tue, 21 Dec 2021 09:41:44 +0000
-
 yq (4.13.0) focal; urgency=medium
 
   * New `with` operator for making multiple changes to a given path

debian/control

@@ -3,8 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Roberto Mier Escandón <rmescandon@gmail.com>
 Build-Depends: debhelper (>=10),
-               golang-1.17-go,
-               pandoc,
+               golang-1.15,
                rsync
 Standards-Version: 4.1.4
 Homepage: https://github.com/mikefarah/yq.git

debian/rules

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #
-# Copyright (C) 2018-2021 Roberto Mier Escandón <rmescandon@gmail.com>
+# Copyright (C) 2018 Roberto Mier Escandón <rmescandon@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -17,21 +17,20 @@
 PROJECT := yq
 OWNER := mikefarah
 REPO := github.com
+GOVERSION := 1.15
 
 export DH_OPTIONS
 export DH_GOPKG := ${REPO}/${OWNER}/${PROJECT}
-export GOROOT := /usr/local/go
+export GOROOT := /usr/lib/go-${GOVERSION}
 export GOPATH := ${CURDIR}/_build
 export GOBIN := ${GOPATH}/bin
 export PATH := ${GOROOT}/bin:${GOBIN}:${PATH}
 export GOCACHE := /tmp/gocache
 export GOFLAGS := -mod=vendor
-export GO111MODULE := on
 
 SRCDIR := ${GOPATH}/src/${DH_GOPKG}
 DESTDIR := ${CURDIR}/debian/${PROJECT}
 BINDIR := /usr/bin
-MANDIR := /usr/share/man/man1/
 ASSETSDIR := /usr/share/${PROJECT}
 
 %:
@@ -43,17 +42,7 @@ override_dh_auto_build:
 	# copy project to local srcdir to build from there
 	rsync -avz --progress --exclude=_build --exclude=debian --exclude=tmp. --exclude=go.mod --exclude=docs . $(SRCDIR)
 	# build go code
-	( \
-		cd ${SRCDIR} && \
-		go install -buildmode=pie ./... \
-	)
-
-	# build man page
-	( \
-		cd ${SRCDIR} && \
-		./scripts/generate-man-page-md.sh && \
-		./scripts/generate-man-page.sh \
-	)
+	(cd ${SRCDIR} && go install -buildmode=pie ./...)
 	
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -65,10 +54,6 @@ override_dh_auto_install:
 	cp -f ${SRCDIR}/LICENSE ${DESTDIR}/${ASSETSDIR}
 	chmod a+x ${DESTDIR}/${BINDIR}/yq
 
-	# man
-	mkdir -p "${DESTDIR}"/"${MANDIR}"
-	cp "${SRCDIR}"/yq.1 "${DESTDIR}"/"${MANDIR}" \
-
 override_dh_auto_clean:
 	dh_clean
 	rm -rf ${CURDIR}/_build

examples/base64.txt

@@ -1 +0,0 @@
-bXkgc2VjcmV0IGNoaWxsaSByZWNpcGUgaXMuLi4u

examples/data1.yaml

@@ -1,2 +1,15 @@
-a: mike
-b: [t, f]
+strings:
+  - a: banana
+  - a: cat
+  - a: apple
+
+numbers:
+  - a: 12
+  - a: 13
+  - a: 120
+
+
+obj:
+  - a: {cat: "adog"}
+  - a: {cat: "doga"}
+  - a: apple

examples/example.properties

@@ -1,6 +0,0 @@
-# comments on values appear
-person.name = Mike
-
-# comments on array values appear
-person.pets.0 = cat
-person.food.0 = pizza

examples/mike.xml

@@ -1,14 +1,4 @@
-<!-- before cat -->
-<cat>
-	<!-- in cat before -->
-	<x>3<!-- multi
-line comment
-for x --></x>
-	<y>
-		<!-- in y before -->
-		<d><!-- in d before -->4<!-- in d after --></d>
-		<!-- in y after -->
-	</y>
-	<!-- in_cat_after -->
-</cat>
-<!-- after cat -->
+  <?xml version="1.0" encoding="UTF-8"?>
+  <cat>3f</cat>
+  <dog>meow:as</dog>
+  <dog3>true</dog3>

examples/small.properties

@@ -1 +0,0 @@
-this.is = a properties file

examples/small.xml

@@ -1 +0,0 @@
-<this>is some xml</this>

go.mod

@@ -1,14 +1,12 @@
 module github.com/mikefarah/yq/v4
 
 require (
-	github.com/a8m/envsubst v1.3.0
 	github.com/elliotchance/orderedmap v1.4.0
 	github.com/fatih/color v1.13.0
-	github.com/goccy/go-yaml v1.9.5
-	github.com/jinzhu/copier v0.3.5
-	github.com/magiconair/properties v1.8.6
-	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e
-	github.com/spf13/cobra v1.4.0
+	github.com/goccy/go-yaml v1.9.4
+	github.com/jinzhu/copier v0.3.4
+	github.com/magiconair/properties v1.8.5
+	github.com/spf13/cobra v1.3.0
 	github.com/timtadh/lexmachine v0.2.2
 	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473

go.sum

@@ -1,80 +1,792 @@
-github.com/a8m/envsubst v1.3.0 h1:GmXKmVssap0YtlU3E230W98RWtWCyIZzjtf1apWWyAg=
-github.com/a8m/envsubst v1.3.0/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
+cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
+cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
+github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
+github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/elliotchance/orderedmap v1.4.0 h1:wZtfeEONCbx6in1CZyE6bELEt/vFayMvsxqI5SgsR+A=
 github.com/elliotchance/orderedmap v1.4.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/goccy/go-yaml v1.9.5 h1:Eh/+3uk9kLxG4koCX6lRMAPS1OaMSAi+FJcya0INdB0=
-github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/goccy/go-yaml v1.9.4 h1:S0GCYjwHKVI6IHqio7QWNKNThUl6NLzFd/g8Z65Axw8=
+github.com/goccy/go-yaml v1.9.4/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
+github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
+github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
+github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
+github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
+github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
+github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
+github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
-github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
+github.com/jinzhu/copier v0.3.4 h1:mfU6jI9PtCeUjkjQ322dlff9ELjGDu975C2p/nrubVI=
+github.com/jinzhu/copier v0.3.4/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
-github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
+github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
+github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
+github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=
-github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
+github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
+github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
+github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
+github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0=
+github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
+github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/timtadh/data-structures v0.5.3 h1:F2tEjoG9qWIyUjbvXVgJqEOGJPMIiYn7U5W5mE+i/vQ=
 github.com/timtadh/data-structures v0.5.3/go.mod h1:9R4XODhJ8JdWFEI8P/HJKqxuJctfBQw6fDibMQny2oU=
 github.com/timtadh/lexmachine v0.2.2 h1:g55RnjdYazm5wnKv59pwFcBJHOyvTPfDEoz21s4PHmY=
 github.com/timtadh/lexmachine v0.2.2/go.mod h1:GBJvD5OAfRn/gnp92zb9KTgHLB7akKyxmVivoYCcjQI=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
+go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E=
 golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
+google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
+google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
+google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
+google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
+google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
+google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
+google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
+google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 h1:6D+BvnJ/j6e222UW8s2qTSe3wGBtvo0MbVQG/c5k8RE=
 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

merge-array-by-key.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# ./yq ea '.[]'  examples/data*.yaml
+
+
+./yq ea '
+  ((.[] | {.name: .}) as $item ireduce ({}; . * $item )) as $uniqueMap
+  | ( $uniqueMap  | to_entries | .[]) as $item ireduce([]; . + $item.value)
+' examples/data*.yaml

pkg/yqlib/all_at_once_evaluator.go

@@ -19,11 +19,11 @@ type Evaluator interface {
 
 type allAtOnceEvaluator struct {
 	treeNavigator DataTreeNavigator
+	treeCreator   ExpressionParser
 }
 
 func NewAllAtOnceEvaluator() Evaluator {
-	InitExpressionParser()
-	return &allAtOnceEvaluator{treeNavigator: NewDataTreeNavigator()}
+	return &allAtOnceEvaluator{treeNavigator: NewDataTreeNavigator(), treeCreator: NewExpressionParser()}
 }
 
 func (e *allAtOnceEvaluator) EvaluateNodes(expression string, nodes ...*yaml.Node) (*list.List, error) {
@@ -35,7 +35,7 @@ func (e *allAtOnceEvaluator) EvaluateNodes(expression string, nodes ...*yaml.Nod
 }
 
 func (e *allAtOnceEvaluator) EvaluateCandidateNodes(expression string, inputCandidates *list.List) (*list.List, error) {
-	node, err := ExpressionParser.ParseExpression(expression)
+	node, err := e.treeCreator.ParseExpression(expression)
 	if err != nil {
 		return nil, err
 	}

pkg/yqlib/candidate_node.go

@@ -116,26 +116,15 @@ func (n *CandidateNode) Copy() (*CandidateNode, error) {
 	if err != nil {
 		return nil, err
 	}
-	clone.Node = deepClone(n.Node)
 	return clone, nil
 }
 
 // updates this candidate from the given candidate node
 func (n *CandidateNode) UpdateFrom(other *CandidateNode, prefs assignPreferences) {
 
-	// if this is an empty map or empty array, use the style of other node.
-	if (n.Node.Kind != yaml.ScalarNode && len(n.Node.Content) == 0) ||
-		// if the tag has changed (e.g. from str to bool)
-		(guessTagFromCustomType(n.Node) != guessTagFromCustomType(other.Node)) {
-		n.Node.Style = other.Node.Style
-	}
-
-	n.Node.Content = deepCloneContent(other.Node.Content)
-	n.Node.Kind = other.Node.Kind
-	n.Node.Value = other.Node.Value
-
 	n.UpdateAttributesFrom(other, prefs)
-
+	n.Node.Content = other.Node.Content
+	n.Node.Value = other.Node.Value
 }
 
 func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode, prefs assignPreferences) {
@@ -147,12 +136,7 @@ func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode, prefs assignP
 		n.Node.Value = ""
 	}
 	n.Node.Kind = other.Node.Kind
-
-	// don't clobber custom tags...
-	if strings.HasPrefix(n.Node.Tag, "!!") || n.Node.Tag == "" {
-		n.Node.Tag = other.Node.Tag
-	}
-
+	n.Node.Tag = other.Node.Tag
 	n.Node.Alias = other.Node.Alias
 
 	if !prefs.DontOverWriteAnchor {
@@ -161,7 +145,6 @@ func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode, prefs assignP
 
 	// merge will pickup the style of the new thing
 	// when autocreating nodes
-
 	if n.Node.Style == 0 {
 		n.Node.Style = other.Node.Style
 	}

pkg/yqlib/compare_operators.go

@@ -1,133 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"strconv"
-	"time"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-type compareTypePref struct {
-	OrEqual bool
-	Greater bool
-}
-
-func compareOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
-	log.Debugf("-- compareOperator")
-	prefs := expressionNode.Operation.Preferences.(compareTypePref)
-	return crossFunction(d, context.ReadOnlyClone(), expressionNode, compare(prefs), true)
-}
-
-func compare(prefs compareTypePref) func(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
-	return func(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
-		log.Debugf("-- compare cross function")
-		if lhs == nil && rhs == nil {
-			owner := &CandidateNode{}
-			return createBooleanCandidate(owner, prefs.OrEqual), nil
-		} else if lhs == nil {
-			log.Debugf("lhs nil, but rhs is not")
-			return createBooleanCandidate(rhs, false), nil
-		} else if rhs == nil {
-			log.Debugf("rhs nil, but rhs is not")
-			return createBooleanCandidate(lhs, false), nil
-		}
-
-		lhs.Node = unwrapDoc(lhs.Node)
-		rhs.Node = unwrapDoc(rhs.Node)
-
-		switch lhs.Node.Kind {
-		case yaml.MappingNode:
-			return nil, fmt.Errorf("maps not yet supported for comparison")
-		case yaml.SequenceNode:
-			return nil, fmt.Errorf("arrays not yet supported for comparison")
-		default:
-			if rhs.Node.Kind != yaml.ScalarNode {
-				return nil, fmt.Errorf("%v (%v) cannot be subtracted from %v", rhs.Node.Tag, rhs.Path, lhs.Node.Tag)
-			}
-			target := lhs.CreateReplacement(&yaml.Node{})
-			boolV, err := compareScalars(context, prefs, lhs.Node, rhs.Node)
-
-			return createBooleanCandidate(target, boolV), err
-		}
-	}
-}
-
-func compareDateTime(layout string, prefs compareTypePref, lhs *yaml.Node, rhs *yaml.Node) (bool, error) {
-	lhsTime, err := time.Parse(layout, lhs.Value)
-	if err != nil {
-		return false, err
-	}
-
-	rhsTime, err := time.Parse(layout, rhs.Value)
-	if err != nil {
-		return false, err
-	}
-
-	if prefs.OrEqual && lhsTime.Equal(rhsTime) {
-		return true, nil
-	}
-	if prefs.Greater {
-		return lhsTime.After(rhsTime), nil
-	}
-	return lhsTime.Before(rhsTime), nil
-
-}
-
-func compareScalars(context Context, prefs compareTypePref, lhs *yaml.Node, rhs *yaml.Node) (bool, error) {
-	lhsTag := guessTagFromCustomType(lhs)
-	rhsTag := guessTagFromCustomType(rhs)
-
-	isDateTime := lhs.Tag == "!!timestamp"
-	// if the lhs is a string, it might be a timestamp in a custom format.
-	if lhsTag == "!!str" && context.GetDateTimeLayout() != time.RFC3339 {
-		_, err := time.Parse(context.GetDateTimeLayout(), lhs.Value)
-		isDateTime = err == nil
-	}
-	if isDateTime {
-		return compareDateTime(context.GetDateTimeLayout(), prefs, lhs, rhs)
-	} else if lhsTag == "!!int" && rhsTag == "!!int" {
-		_, lhsNum, err := parseInt(lhs.Value)
-		if err != nil {
-			return false, err
-		}
-		_, rhsNum, err := parseInt(rhs.Value)
-		if err != nil {
-			return false, err
-		}
-
-		if prefs.OrEqual && lhsNum == rhsNum {
-			return true, nil
-		}
-		if prefs.Greater {
-			return lhsNum > rhsNum, nil
-		}
-		return lhsNum < rhsNum, nil
-	} else if (lhsTag == "!!int" || lhsTag == "!!float") && (rhsTag == "!!int" || rhsTag == "!!float") {
-		lhsNum, err := strconv.ParseFloat(lhs.Value, 64)
-		if err != nil {
-			return false, err
-		}
-		rhsNum, err := strconv.ParseFloat(rhs.Value, 64)
-		if err != nil {
-			return false, err
-		}
-		if prefs.OrEqual && lhsNum == rhsNum {
-			return true, nil
-		}
-		if prefs.Greater {
-			return lhsNum > rhsNum, nil
-		}
-		return lhsNum < rhsNum, nil
-	} else if lhsTag == "!!str" && rhsTag == "!!str" {
-		if prefs.OrEqual && lhs.Value == rhs.Value {
-			return true, nil
-		}
-		if prefs.Greater {
-			return lhs.Value > rhs.Value, nil
-		}
-		return lhs.Value < rhs.Value, nil
-	}
-
-	return false, fmt.Errorf("%v not yet supported for comparison", lhs.Tag)
-}

pkg/yqlib/compare_operators_test.go

@@ -1,369 +0,0 @@
-package yqlib
-
-import (
-	"testing"
-)
-
-var compareOperatorScenarios = []expressionScenario{
-	// ints, not equal
-	{
-		description: "Compare numbers (>)",
-		document:    "a: 5\nb: 4",
-		expression:  ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5\nb: 4",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:     true,
-		description: "Compare integers (>=)",
-		document:    "a: 5\nb: 4",
-		expression:  ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5\nb: 4",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-
-	// ints, equal
-	{
-		skipDoc:     true,
-		description: "Compare equal numbers (>)",
-		document:    "a: 5\nb: 5",
-		expression:  ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5\nb: 5",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		description: "Compare equal numbers (>=)",
-		document:    "a: 5\nb: 5",
-		expression:  ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5\nb: 5",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-
-	// floats, not equal
-	{
-		skipDoc:    true,
-		document:   "a: 5.2\nb: 4.1",
-		expression: ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5.2\nb: 4.1",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5.2\nb: 4.1",
-		expression: ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5.5\nb: 4.1",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-
-	// floats, equal
-	{
-		skipDoc:    true,
-		document:   "a: 5.5\nb: 5.5",
-		expression: ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5.5\nb: 5.5",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5.1\nb: 5.1",
-		expression: ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 5.1\nb: 5.1",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-
-	// strings, not equal
-	{
-		description:    "Compare strings",
-		subdescription: "Compares strings by their bytecode.",
-		document:       "a: zoo\nb: apple",
-		expression:     ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: zoo\nb: apple",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: zoo\nb: apple",
-		expression: ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: zoo\nb: apple",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-
-	// strings, equal
-	{
-		skipDoc:    true,
-		document:   "a: cat\nb: cat",
-		expression: ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: cat\nb: cat",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: cat\nb: cat",
-		expression: ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: cat\nb: cat",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-
-	// datetime, not equal
-	{
-		description:    "Compare date times",
-		subdescription: "You can compare date times. Assumes RFC3339 date time format, see [date-time operators](https://mikefarah.gitbook.io/yq/operators/date-time-operators) for more information.",
-		document:       "a: 2021-01-01T03:10:00Z\nb: 2020-01-01T03:10:00Z",
-		expression:     ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2021-01-01T03:10:00Z\nb: 2020-01-01T03:10:00Z",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2021-01-01T03:10:00Z\nb: 2020-01-01T03:10:00Z",
-		expression: ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2021-01-01T03:10:00Z\nb: 2020-01-01T03:10:00Z",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-
-	// datetime, equal
-	{
-		skipDoc:    true,
-		document:   "a: 2021-01-01T03:10:00Z\nb: 2021-01-01T03:10:00Z",
-		expression: ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2021-01-01T03:10:00Z\nb: 2021-01-01T03:10:00Z",
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2021-01-01T03:10:00Z\nb: 2021-01-01T03:10:00Z",
-		expression: ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   "a: 2021-01-01T03:10:00Z\nb: 2021-01-01T03:10:00Z",
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::true\n",
-		},
-	},
-	// both null
-	{
-		description: "Both sides are null: > is false",
-		expression:  ".a > .b",
-		expected: []string{
-			"D0, P[], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[], (!!bool)::false\n",
-		},
-	},
-	{
-		description: "Both sides are null: >= is true",
-		expression:  ".a >= .b",
-		expected: []string{
-			"D0, P[], (!!bool)::true\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[], (!!bool)::true\n",
-		},
-	},
-
-	// one null
-	{
-		description: "One side is null: > is false",
-		document:    `a: 5`,
-		expression:  ".a > .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `a: 5`,
-		expression: ".a < .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		description: "One side is null: >= is false",
-		document:    `a: 5`,
-		expression:  ".a >= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `a: 5`,
-		expression: ".a <= .b",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `a: 5`,
-		expression: ".b <= .a",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-	{
-		skipDoc:    true,
-		document:   `a: 5`,
-		expression: ".b < .a",
-		expected: []string{
-			"D0, P[a], (!!bool)::false\n",
-		},
-	},
-}
-
-func TestCompareOperatorScenarios(t *testing.T) {
-	for _, tt := range compareOperatorScenarios {
-		testScenario(t, &tt)
-	}
-	documentOperatorScenarios(t, "compare", compareOperatorScenarios)
-}

pkg/yqlib/context.go

@@ -3,7 +3,6 @@ package yqlib
 import (
 	"container/list"
 	"fmt"
-	"time"
 
 	"github.com/jinzhu/copier"
 	logging "gopkg.in/op/go-logging.v1"
@@ -13,7 +12,6 @@ type Context struct {
 	MatchingNodes  *list.List
 	Variables      map[string]*list.List
 	DontAutoCreate bool
-	datetimeLayout string
 }
 
 func (n *Context) SingleReadonlyChildContext(candidate *CandidateNode) Context {
@@ -30,17 +28,6 @@ func (n *Context) SingleChildContext(candidate *CandidateNode) Context {
 	return n.ChildContext(list)
 }
 
-func (n *Context) SetDateTimeLayout(newDateTimeLayout string) {
-	n.datetimeLayout = newDateTimeLayout
-}
-
-func (n *Context) GetDateTimeLayout() string {
-	if n.datetimeLayout != "" {
-		return n.datetimeLayout
-	}
-	return time.RFC3339
-}
-
 func (n *Context) GetVariable(name string) *list.List {
 	if n.Variables == nil {
 		return nil
@@ -56,7 +43,7 @@ func (n *Context) SetVariable(name string, value *list.List) {
 }
 
 func (n *Context) ChildContext(results *list.List) Context {
-	clone := Context{DontAutoCreate: n.DontAutoCreate, datetimeLayout: n.datetimeLayout}
+	clone := Context{DontAutoCreate: n.DontAutoCreate}
 	clone.Variables = make(map[string]*list.List)
 	if len(n.Variables) > 0 {
 		err := copier.Copy(&clone.Variables, n.Variables)

pkg/yqlib/decode_xml_test.go

@@ -0,0 +1,110 @@
+package yqlib
+
+import (
+	"bufio"
+	"bytes"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/mikefarah/yq/v4/test"
+	yaml "gopkg.in/yaml.v3"
+)
+
+func decodeXml(t *testing.T, xml string) *CandidateNode {
+	decoder := NewXmlDecoder("+", "+content")
+
+	decoder.Init(strings.NewReader(xml))
+
+	node := &yaml.Node{}
+	err := decoder.Decode(node)
+	if err != nil {
+		t.Error(err, "fail to decode", xml)
+	}
+	return &CandidateNode{Node: node}
+}
+
+type xmlScenario struct {
+	inputXml       string
+	expected       string
+	description    string
+	subdescription string
+	skipDoc        bool
+}
+
+var xmlScenarios = []xmlScenario{
+	{
+		description: "Parse xml: simple",
+		inputXml:    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cat>meow</cat>",
+		expected:    "D0, P[], (doc)::cat: meow\n",
+	},
+	{
+		description:    "Parse xml: array",
+		subdescription: "Consecutive nodes with identical xml names are assumed to be arrays.",
+		inputXml:       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<animal>1</animal>\n<animal>2</animal>",
+		expected:       "D0, P[], (doc)::animal:\n    - \"1\"\n    - \"2\"\n",
+	},
+	{
+		description:    "Parse xml: attributes",
+		subdescription: "Attributes are converted to fields, with the attribute prefix.",
+		inputXml:       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cat legs=\"4\">\n  <legs>7</legs>\n</cat>",
+		expected:       "D0, P[], (doc)::cat:\n    +legs: \"4\"\n    legs: \"7\"\n",
+	},
+	{
+		description:    "Parse xml: attributes with content",
+		subdescription: "Content is added as a field, using the content name",
+		inputXml:       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<cat legs=\"4\">meow</cat>",
+		expected:       "D0, P[], (doc)::cat:\n    +content: meow\n    +legs: \"4\"\n",
+	},
+}
+
+func testXmlScenario(t *testing.T, s *xmlScenario) {
+	var actual = resultToString(t, decodeXml(t, s.inputXml))
+	test.AssertResult(t, s.expected, actual)
+}
+
+func documentXmlScenario(t *testing.T, w *bufio.Writer, i interface{}) {
+	s := i.(xmlScenario)
+
+	if s.skipDoc {
+		return
+	}
+	writeOrPanic(w, fmt.Sprintf("## %v\n", s.description))
+
+	if s.subdescription != "" {
+		writeOrPanic(w, s.subdescription)
+		writeOrPanic(w, "\n\n")
+	}
+
+	writeOrPanic(w, "Given a sample.xml file of:\n")
+	writeOrPanic(w, fmt.Sprintf("```xml\n%v\n```\n", s.inputXml))
+
+	writeOrPanic(w, "then\n")
+	writeOrPanic(w, "```bash\nyq e sample.xml\n```\n")
+	writeOrPanic(w, "will output\n")
+
+	var output bytes.Buffer
+	printer := NewPrinterWithSingleWriter(bufio.NewWriter(&output), YamlOutputFormat, true, false, 2, true)
+
+	node := decodeXml(t, s.inputXml)
+
+	err := printer.PrintResults(node.AsList())
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	writeOrPanic(w, fmt.Sprintf("```yaml\n%v```\n\n", output.String()))
+
+}
+
+func TestXmlScenarios(t *testing.T) {
+	for _, tt := range xmlScenarios {
+		testXmlScenario(t, &tt)
+	}
+	genericScenarios := make([]interface{}, len(xmlScenarios))
+	for i, s := range xmlScenarios {
+		genericScenarios[i] = s
+	}
+	documentScenarios(t, "usage", "xml", genericScenarios, documentXmlScenario)
+}

pkg/yqlib/decoder.go

@@ -1,35 +0,0 @@
-package yqlib
-
-import (
-	"fmt"
-	"io"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-type InputFormat uint
-
-const (
-	YamlInputFormat = 1 << iota
-	XMLInputFormat
-	PropertiesInputFormat
-	Base64InputFormat
-)
-
-type Decoder interface {
-	Init(reader io.Reader)
-	Decode(node *yaml.Node) error
-}
-
-func InputFormatFromString(format string) (InputFormat, error) {
-	switch format {
-	case "yaml", "y":
-		return YamlInputFormat, nil
-	case "xml", "x":
-		return XMLInputFormat, nil
-	case "props", "p":
-		return PropertiesInputFormat, nil
-	default:
-		return 0, fmt.Errorf("unknown format '%v' please use [yaml|xml|props]", format)
-	}
-}

pkg/yqlib/decoder_base64.go

@@ -1,44 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"encoding/base64"
-	"io"
-
-	yaml "gopkg.in/yaml.v3"
-)
-
-type base64Decoder struct {
-	reader   io.Reader
-	finished bool
-	encoding base64.Encoding
-}
-
-func NewBase64Decoder() Decoder {
-	return &base64Decoder{finished: false, encoding: *base64.StdEncoding}
-}
-
-func (dec *base64Decoder) Init(reader io.Reader) {
-	dec.reader = reader
-	dec.finished = false
-}
-
-func (dec *base64Decoder) Decode(rootYamlNode *yaml.Node) error {
-	if dec.finished {
-		return io.EOF
-	}
-	base64Reader := base64.NewDecoder(&dec.encoding, dec.reader)
-	buf := new(bytes.Buffer)
-
-	if _, err := buf.ReadFrom(base64Reader); err != nil {
-		return err
-	}
-	if buf.Len() == 0 {
-		dec.finished = true
-		return io.EOF
-	}
-	rootYamlNode.Kind = yaml.ScalarNode
-	rootYamlNode.Tag = "!!str"
-	rootYamlNode.Value = buf.String()
-	return nil
-}

pkg/yqlib/decoder_properties.go

@@ -1,122 +0,0 @@
-package yqlib
-
-import (
-	"bytes"
-	"io"
-	"strconv"
-	"strings"
-
-	"github.com/magiconair/properties"
-	"gopkg.in/yaml.v3"
-)
-
-type propertiesDecoder struct {
-	reader   io.Reader
-	finished bool
-	d        DataTreeNavigator
-}
-
-func NewPropertiesDecoder() Decoder {
-	return &propertiesDecoder{d: NewDataTreeNavigator(), finished: false}
-}
-
-func (dec *propertiesDecoder) Init(reader io.Reader) {
-	dec.reader = reader
-	dec.finished = false
-}
-
-func parsePropKey(key string) []interface{} {
-	pathStrArray := strings.Split(key, ".")
-	path := make([]interface{}, len(pathStrArray))
-	for i, pathStr := range pathStrArray {
-		num, err := strconv.ParseInt(pathStr, 10, 32)
-		if err == nil {
-			path[i] = num
-		} else {
-			path[i] = pathStr
-		}
-	}
-	return path
-}
-
-func (dec *propertiesDecoder) processComment(c string) string {
-	if c == "" {
-		return ""
-	}
-	return "# " + c
-}
-
-func (dec *propertiesDecoder) applyProperty(properties *properties.Properties, context Context, key string) error {
-	value, _ := properties.Get(key)
-	path := parsePropKey(key)
-
-	rhsNode := &yaml.Node{
-		Value:       value,
-		Tag:         "!!str",
-		Kind:        yaml.ScalarNode,
-		LineComment: dec.processComment(properties.GetComment(key)),
-	}
-
-	rhsNode.Tag = guessTagFromCustomType(rhsNode)
-
-	rhsCandidateNode := &CandidateNode{
-		Path: path,
-		Node: rhsNode,
-	}
-
-	assignmentOp := &Operation{OperationType: assignOpType, Preferences: assignPreferences{}}
-
-	rhsOp := &Operation{OperationType: valueOpType, CandidateNode: rhsCandidateNode}
-
-	assignmentOpNode := &ExpressionNode{
-		Operation: assignmentOp,
-		LHS:       createTraversalTree(path, traversePreferences{}, false),
-		RHS:       &ExpressionNode{Operation: rhsOp},
-	}
-
-	_, err := dec.d.GetMatchingNodes(context, assignmentOpNode)
-	return err
-}
-
-func (dec *propertiesDecoder) Decode(rootYamlNode *yaml.Node) error {
-	if dec.finished {
-		return io.EOF
-	}
-	buf := new(bytes.Buffer)
-
-	if _, err := buf.ReadFrom(dec.reader); err != nil {
-		return err
-	}
-	if buf.Len() == 0 {
-		dec.finished = true
-		return io.EOF
-	}
-	properties, err := properties.LoadString(buf.String())
-	if err != nil {
-		return err
-	}
-	properties.DisableExpansion = true
-
-	rootMap := &CandidateNode{
-		Node: &yaml.Node{
-			Kind: yaml.MappingNode,
-			Tag:  "!!map",
-		},
-	}
-
-	context := Context{}
-	context = context.SingleChildContext(rootMap)
-
-	for _, key := range properties.Keys() {
-		if err := dec.applyProperty(properties, context, key); err != nil {
-			return err
-		}
-
-	}
-
-	rootYamlNode.Kind = yaml.DocumentNode
-	rootYamlNode.Content = []*yaml.Node{rootMap.Node}
-	dec.finished = true
-	return nil
-
-}

pkg/yqlib/decoder_test.go

@@ -1,60 +0,0 @@
-package yqlib
-
-import (
-	"bufio"
-	"bytes"
-	"strings"
-)
-
-type formatScenario struct {
-	input          string
-	indent         int
-	expression     string
-	expected       string
-	description    string
-	subdescription string
-	skipDoc        bool
-	scenarioType   string
-}
-
-func processFormatScenario(s formatScenario, decoder Decoder, encoder Encoder) string {
-
-	var output bytes.Buffer
-	writer := bufio.NewWriter(&output)
-
-	if decoder == nil {
-		decoder = NewYamlDecoder()
-	}
-
-	inputs, err := readDocuments(strings.NewReader(s.input), "sample.yml", 0, decoder)
-	if err != nil {
-		panic(err)
-	}
-
-	expression := s.expression
-	if expression == "" {
-		expression = "."
-	}
-
-	exp, err := getExpressionParser().ParseExpression(expression)
-
-	if err != nil {
-		panic(err)
-	}
-
-	context, err := NewDataTreeNavigator().GetMatchingNodes(Context{MatchingNodes: inputs}, exp)
-
-	if err != nil {
-		panic(err)
-	}
-
-	printer := NewPrinter(encoder, NewSinglePrinterWriter(writer))
-	err = printer.PrintResults(context.MatchingNodes)
-	if err != nil {
-		panic(err)
-	}
-	writer.Flush()
-
-	return output.String()
-
-}

pkg/yqlib/decoder_xml.go

@@ -2,26 +2,44 @@ package yqlib
 
 import (
 	"encoding/xml"
+	"fmt"
 	"io"
-	"strings"
 	"unicode"
 
 	"golang.org/x/net/html/charset"
 	yaml "gopkg.in/yaml.v3"
 )
 
+type InputFormat uint
+
+const (
+	YamlInputFormat = 1 << iota
+	XmlInputFormat
+)
+
+func InputFormatFromString(format string) (InputFormat, error) {
+	switch format {
+	case "yaml", "y":
+		return YamlInputFormat, nil
+	case "xml", "x":
+		return XmlInputFormat, nil
+	default:
+		return 0, fmt.Errorf("unknown format '%v' please use [yaml|xml]", format)
+	}
+}
+
 type xmlDecoder struct {
 	reader          io.Reader
 	attributePrefix string
-	contentName     string
+	contentPrefix   string
 	finished        bool
 }
 
-func NewXMLDecoder(attributePrefix string, contentName string) Decoder {
-	if contentName == "" {
-		contentName = "content"
+func NewXmlDecoder(attributePrefix string, contentPrefix string) Decoder {
+	if contentPrefix == "" {
+		contentPrefix = "content"
 	}
-	return &xmlDecoder{attributePrefix: attributePrefix, contentName: contentName, finished: false}
+	return &xmlDecoder{attributePrefix: attributePrefix, contentPrefix: contentPrefix, finished: false}
 }
 
 func (dec *xmlDecoder) Init(reader io.Reader) {
@@ -42,41 +60,20 @@ func (dec *xmlDecoder) createSequence(nodes []*xmlNode) (*yaml.Node, error) {
 	return yamlNode, nil
 }
 
-func (dec *xmlDecoder) processComment(c string) string {
-	if c == "" {
-		return ""
-	}
-	return "#" + strings.TrimRight(c, " ")
-}
-
 func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
-	log.Debug("createMap: headC: %v, footC: %v", n.HeadComment, n.FootComment)
-	yamlNode := &yaml.Node{Kind: yaml.MappingNode}
+	yamlNode := &yaml.Node{Kind: yaml.MappingNode, HeadComment: n.Comment}
 
 	if len(n.Data) > 0 {
-		label := dec.contentName
-		labelNode := createScalarNode(label, label)
-		labelNode.HeadComment = dec.processComment(n.HeadComment)
-		labelNode.FootComment = dec.processComment(n.FootComment)
-		yamlNode.Content = append(yamlNode.Content, labelNode, createScalarNode(n.Data, n.Data))
+		label := dec.contentPrefix
+		yamlNode.Content = append(yamlNode.Content, createScalarNode(label, label), createScalarNode(n.Data, n.Data))
 	}
 
-	for i, keyValuePair := range n.Children {
+	for _, keyValuePair := range n.Children {
 		label := keyValuePair.K
 		children := keyValuePair.V
 		labelNode := createScalarNode(label, label)
 		var valueNode *yaml.Node
 		var err error
-
-		if i == 0 {
-			labelNode.HeadComment = dec.processComment(n.HeadComment)
-
-		}
-
-		// if i == len(n.Children)-1 {
-		labelNode.FootComment = dec.processComment(keyValuePair.FootComment)
-		// }
-
 		log.Debug("len of children in %v is %v", label, len(children))
 		if len(children) > 1 {
 			valueNode, err = dec.createSequence(children)
@@ -84,13 +81,6 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
 				return nil, err
 			}
 		} else {
-			// comment hack for maps of scalars
-			// if the value is a scalar, the head comment of the scalar needs to go on the key?
-			// add tests for <z/> as well as multiple <ds> of inputXmlWithComments > yaml
-			if len(children[0].Children) == 0 && children[0].HeadComment != "" {
-				labelNode.HeadComment = labelNode.HeadComment + "\n" + strings.TrimSpace(children[0].HeadComment)
-				children[0].HeadComment = ""
-			}
 			valueNode, err = dec.convertToYamlNode(children[0])
 			if err != nil {
 				return nil, err
@@ -107,14 +97,7 @@ func (dec *xmlDecoder) convertToYamlNode(n *xmlNode) (*yaml.Node, error) {
 		return dec.createMap(n)
 	}
 	scalar := createScalarNode(n.Data, n.Data)
-	if n.Data == "" {
-		scalar = createScalarNode(nil, "")
-	}
-	log.Debug("scalar headC: %v, footC: %v", n.HeadComment, n.FootComment)
-	scalar.HeadComment = dec.processComment(n.HeadComment)
-	scalar.LineComment = dec.processComment(n.LineComment)
-	scalar.FootComment = dec.processComment(n.FootComment)
-
+	scalar.HeadComment = n.Comment
 	return scalar, nil
 }
 
@@ -124,7 +107,7 @@ func (dec *xmlDecoder) Decode(rootYamlNode *yaml.Node) error {
 	}
 	root := &xmlNode{}
 	// cant use xj - it doesn't keep map order.
-	err := dec.decodeXML(root)
+	err := dec.decodeXml(root)
 
 	if err != nil {
 		return err
@@ -133,9 +116,6 @@ func (dec *xmlDecoder) Decode(rootYamlNode *yaml.Node) error {
 
 	if err != nil {
 		return err
-	} else if firstNode.Tag == "!!null" {
-		dec.finished = true
-		return io.EOF
 	}
 	rootYamlNode.Kind = yaml.DocumentNode
 	rootYamlNode.Content = []*yaml.Node{firstNode}
@@ -144,17 +124,14 @@ func (dec *xmlDecoder) Decode(rootYamlNode *yaml.Node) error {
 }
 
 type xmlNode struct {
-	Children    []*xmlChildrenKv
-	HeadComment string
-	FootComment string
-	LineComment string
-	Data        string
+	Children []*xmlChildrenKv
+	Comment  string
+	Data     string
 }
 
 type xmlChildrenKv struct {
-	K           string
-	V           []*xmlNode
-	FootComment string
+	K string
+	V []*xmlNode
 }
 
 // AddChild appends a node to the list of children
@@ -181,13 +158,12 @@ type element struct {
 	parent *element
 	n      *xmlNode
 	label  string
-	state  string
 }
 
 // this code is heavily based on https://github.com/basgys/goxml2json
 // main changes are to decode into a structure that preserves the original order
 // of the map keys.
-func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
+func (dec *xmlDecoder) decodeXml(root *xmlNode) error {
 	xmlDec := xml.NewDecoder(dec.reader)
 
 	// That will convert the charset if the provided XML is non-UTF-8
@@ -207,8 +183,6 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 
 		switch se := t.(type) {
 		case xml.StartElement:
-			log.Debug("start element %v", se.Name.Local)
-			elem.state = "started"
 			// Build new a new current element and link it to its parent
 			elem = &element{
 				parent: elem,
@@ -223,13 +197,7 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 		case xml.CharData:
 			// Extract XML data (if any)
 			elem.n.Data = trimNonGraphic(string(se))
-			if elem.n.Data != "" {
-				elem.state = "chardata"
-				log.Debug("chardata [%v] for %v", elem.n.Data, elem.label)
-			}
 		case xml.EndElement:
-			log.Debug("end element %v", elem.label)
-			elem.state = "finished"
 			// And add it to its parent list
 			if elem.parent != nil {
 				elem.parent.n.AddChild(elem.label, elem.n)
@@ -238,49 +206,13 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
 			// Then change the current element to its parent
 			elem = elem.parent
 		case xml.Comment:
-
-			commentStr := string(xml.CharData(se))
-			if elem.state == "started" {
-				applyFootComment(elem, commentStr)
-
-			} else if elem.state == "chardata" {
-				log.Debug("got a line comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
-				elem.n.LineComment = joinFilter([]string{elem.n.LineComment, commentStr})
-			} else {
-				log.Debug("got a head comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
-				elem.n.HeadComment = joinFilter([]string{elem.n.HeadComment, commentStr})
-			}
-
+			elem.n.Comment = trimNonGraphic(string(xml.CharData(se)))
 		}
 	}
 
 	return nil
 }
 
-func applyFootComment(elem *element, commentStr string) {
-
-	// first lets try to put the comment on the last child
-	if len(elem.n.Children) > 0 {
-		lastChildIndex := len(elem.n.Children) - 1
-		childKv := elem.n.Children[lastChildIndex]
-		log.Debug("got a foot comment for %v: [%v]", childKv.K, commentStr)
-		childKv.FootComment = joinFilter([]string{elem.n.FootComment, commentStr})
-	} else {
-		log.Debug("got a foot comment for %v: [%v]", elem.label, commentStr)
-		elem.n.FootComment = joinFilter([]string{elem.n.FootComment, commentStr})
-	}
-}
-
-func joinFilter(rawStrings []string) string {
-	stringsToJoin := make([]string, 0)
-	for _, str := range rawStrings {
-		if str != "" {
-			stringsToJoin = append(stringsToJoin, str)
-		}
-	}
-	return strings.Join(stringsToJoin, " ")
-}
-
 // trimNonGraphic returns a slice of the string s, with all leading and trailing
 // non graphic characters and spaces removed.
 //

pkg/yqlib/decoder_yaml.go

@@ -6,6 +6,11 @@ import (
 	yaml "gopkg.in/yaml.v3"
 )
 
+type Decoder interface {
+	Init(reader io.Reader)
+	Decode(node *yaml.Node) error
+}
+
 type yamlDecoder struct {
 	decoder yaml.Decoder
 }

pkg/yqlib/doc/notification-snippet.md

@@ -1,6 +0,0 @@
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}

pkg/yqlib/doc/operators/add.md

@@ -4,16 +4,31 @@ Add behaves differently according to the type of the LHS:
 * arrays: concatenate
 * number scalars: arithmetic addition
 * string scalars: concatenate
-* maps: shallow merge (use the multiply operator (`*`) to deeply merge)
 
-Use `+=` as a relative append assign for things like increment. Note that `.a += .x` is equivalent to running `.a = .a + .x`.
+Use `+=` as append assign for things like increment. Note that `.a += .x` is equivalent to running `.a = .a + .x`.
 
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
+## Concatenate and assign arrays
+Given a sample.yml file of:
+```yaml
+a:
+  val: thing
+  b:
+    - cat
+    - dog
+```
+then
+```bash
+yq eval '.a.b += ["cow"]' sample.yml
+```
+will output
+```yaml
+a:
+  val: thing
+  b:
+    - cat
+    - dog
+    - cow
+```
 
 ## Concatenate arrays
 Given a sample.yml file of:
@@ -27,7 +42,7 @@ b:
 ```
 then
 ```bash
-yq '.a + .b' sample.yml
+yq eval '.a + .b' sample.yml
 ```
 will output
 ```yaml
@@ -37,28 +52,6 @@ will output
 - 4
 ```
 
-## Concatenate to existing array
-Note that the styling of `a` is kept.
-
-Given a sample.yml file of:
-```yaml
-a: [1,2]
-b:
-  - 3
-  - 4
-```
-then
-```bash
-yq '.a += .b' sample.yml
-```
-will output
-```yaml
-a: [1, 2, 3, 4]
-b:
-  - 3
-  - 4
-```
-
 ## Concatenate null to array
 Given a sample.yml file of:
 ```yaml
@@ -68,7 +61,7 @@ a:
 ```
 then
 ```bash
-yq '.a + null' sample.yml
+yq eval '.a + null' sample.yml
 ```
 will output
 ```yaml
@@ -76,22 +69,6 @@ will output
 - 2
 ```
 
-## Append to existing array
-Note that the styling is copied from existing array elements
-
-Given a sample.yml file of:
-```yaml
-a: ['dog']
-```
-then
-```bash
-yq '.a += "cat"' sample.yml
-```
-will output
-```yaml
-a: ['dog', 'cat']
-```
-
 ## Add new object to array
 Given a sample.yml file of:
 ```yaml
@@ -100,7 +77,7 @@ a:
 ```
 then
 ```bash
-yq '.a + {"cat": "meow"}' sample.yml
+yq eval '.a + {"cat": "meow"}' sample.yml
 ```
 will output
 ```yaml
@@ -108,6 +85,76 @@ will output
 - cat: meow
 ```
 
+## Add string to array
+Given a sample.yml file of:
+```yaml
+a:
+  - 1
+  - 2
+```
+then
+```bash
+yq eval '.a + "hello"' sample.yml
+```
+will output
+```yaml
+- 1
+- 2
+- hello
+```
+
+## Append to array
+Given a sample.yml file of:
+```yaml
+a:
+  - 1
+  - 2
+b:
+  - 3
+  - 4
+```
+then
+```bash
+yq eval '.a = .a + .b' sample.yml
+```
+will output
+```yaml
+a:
+  - 1
+  - 2
+  - 3
+  - 4
+b:
+  - 3
+  - 4
+```
+
+## Append another array using +=
+Given a sample.yml file of:
+```yaml
+a:
+  - 1
+  - 2
+b:
+  - 3
+  - 4
+```
+then
+```bash
+yq eval '.a += .b' sample.yml
+```
+will output
+```yaml
+a:
+  - 1
+  - 2
+  - 3
+  - 4
+b:
+  - 3
+  - 4
+```
+
 ## Relative append
 Given a sample.yml file of:
 ```yaml
@@ -122,7 +169,7 @@ a:
 ```
 then
 ```bash
-yq '.a[].b += ["mouse"]' sample.yml
+yq eval '.a[].b += ["mouse"]' sample.yml
 ```
 will output
 ```yaml
@@ -146,7 +193,7 @@ b: meow
 ```
 then
 ```bash
-yq '.a += .b' sample.yml
+yq eval '.a = .a + .b' sample.yml
 ```
 will output
 ```yaml
@@ -164,7 +211,7 @@ b: 4.9
 ```
 then
 ```bash
-yq '.a = .a + .b' sample.yml
+yq eval '.a = .a + .b' sample.yml
 ```
 will output
 ```yaml
@@ -182,7 +229,7 @@ b: 4
 ```
 then
 ```bash
-yq '.a = .a + .b' sample.yml
+yq eval '.a = .a + .b' sample.yml
 ```
 will output
 ```yaml
@@ -198,7 +245,7 @@ b: 5
 ```
 then
 ```bash
-yq '.[] += 1' sample.yml
+yq eval '.[] += 1' sample.yml
 ```
 will output
 ```yaml
@@ -206,118 +253,15 @@ a: 4
 b: 6
 ```
 
-## Date addition
-You can add durations to dates. Assumes RFC3339 date time format, see [date-time operators](https://mikefarah.gitbook.io/yq/operators/date-time-operators) for more information.
-
-Given a sample.yml file of:
-```yaml
-a: 2021-01-01T00:00:00Z
-```
-then
-```bash
-yq '.a += "3h10m"' sample.yml
-```
-will output
-```yaml
-a: 2021-01-01T03:10:00Z
-```
-
-## Date addition - custom format
-You can add durations to dates. See [date-time operators](https://mikefarah.gitbook.io/yq/operators/date-time-operators) for more information.
-
-Given a sample.yml file of:
-```yaml
-a: Saturday, 15-Dec-01 at 2:59AM GMT
-```
-then
-```bash
-yq 'with_dtf("Monday, 02-Jan-06 at 3:04PM MST", .a += "3h1m")' sample.yml
-```
-will output
-```yaml
-a: Saturday, 15-Dec-01 at 6:00AM GMT
-```
-
 ## Add to null
 Adding to null simply returns the rhs
 
 Running
 ```bash
-yq --null-input 'null + "cat"'
+yq eval --null-input 'null + "cat"'
 ```
 will output
 ```yaml
 cat
 ```
 
-## Add maps to shallow merge
-Adding objects together shallow merges them. Use `*` to deeply merge.
-
-Given a sample.yml file of:
-```yaml
-a:
-  thing:
-    name: Astuff
-    value: x
-  a1: cool
-b:
-  thing:
-    name: Bstuff
-    legs: 3
-  b1: neat
-```
-then
-```bash
-yq '.a += .b' sample.yml
-```
-will output
-```yaml
-a:
-  thing:
-    name: Bstuff
-    legs: 3
-  a1: cool
-  b1: neat
-b:
-  thing:
-    name: Bstuff
-    legs: 3
-  b1: neat
-```
-
-## Custom types: that are really strings
-When custom tags are encountered, yq will try to decode the underlying type.
-
-Given a sample.yml file of:
-```yaml
-a: !horse cat
-b: !goat _meow
-```
-then
-```bash
-yq '.a += .b' sample.yml
-```
-will output
-```yaml
-a: !horse cat_meow
-b: !goat _meow
-```
-
-## Custom types: that are really numbers
-When custom tags are encountered, yq will try to decode the underlying type.
-
-Given a sample.yml file of:
-```yaml
-a: !horse 1.2
-b: !goat 2.3
-```
-then
-```bash
-yq '.a += .b' sample.yml
-```
-will output
-```yaml
-a: !horse 3.5
-b: !goat 2.3
-```
-

pkg/yqlib/doc/operators/alternative-default-value.md

@@ -2,12 +2,6 @@
 
 This operator is used to provide alternative (or default) values when a particular expression is either null or false.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## LHS is defined
 Given a sample.yml file of:
 ```yaml
@@ -15,7 +9,7 @@ a: bridge
 ```
 then
 ```bash
-yq '.a // "hello"' sample.yml
+yq eval '.a // "hello"' sample.yml
 ```
 will output
 ```yaml
@@ -29,7 +23,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.a // "hello"' sample.yml
+yq eval '.a // "hello"' sample.yml
 ```
 will output
 ```yaml
@@ -43,7 +37,7 @@ a: ~
 ```
 then
 ```bash
-yq '.a // "hello"' sample.yml
+yq eval '.a // "hello"' sample.yml
 ```
 will output
 ```yaml
@@ -57,7 +51,7 @@ a: false
 ```
 then
 ```bash
-yq '.a // "hello"' sample.yml
+yq eval '.a // "hello"' sample.yml
 ```
 will output
 ```yaml
@@ -72,7 +66,7 @@ b: cat
 ```
 then
 ```bash
-yq '.a // .b' sample.yml
+yq eval '.a // .b' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/anchor-and-alias-operators.md

@@ -5,12 +5,6 @@ Use the `alias` and `anchor` operators to read and write yaml aliases and anchor
 `yq` supports merge aliases (like `<<: *blah`) however this is no longer in the standard yaml spec (1.2) and so `yq` will automatically add the `!!merge` tag to these nodes as it is effectively a custom tag.
 
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified.&#x20;
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Merge one map
 see https://yaml.org/type/merge.html
 
@@ -31,7 +25,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[4] | explode(.)' sample.yml
+yq eval '.[4] | explode(.)' sample.yml
 ```
 will output
 ```yaml
@@ -61,7 +55,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[4] | explode(.)' sample.yml
+yq eval '.[4] | explode(.)' sample.yml
 ```
 will output
 ```yaml
@@ -93,7 +87,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[4] | explode(.)' sample.yml
+yq eval '.[4] | explode(.)' sample.yml
 ```
 will output
 ```yaml
@@ -109,7 +103,7 @@ a: &billyBob cat
 ```
 then
 ```bash
-yq '.a | anchor' sample.yml
+yq eval '.a | anchor' sample.yml
 ```
 will output
 ```yaml
@@ -123,7 +117,7 @@ a: cat
 ```
 then
 ```bash
-yq '.a anchor = "foobar"' sample.yml
+yq eval '.a anchor = "foobar"' sample.yml
 ```
 will output
 ```yaml
@@ -138,7 +132,7 @@ a:
 ```
 then
 ```bash
-yq '.a anchor |= .b' sample.yml
+yq eval '.a anchor |= .b' sample.yml
 ```
 will output
 ```yaml
@@ -154,7 +148,7 @@ a: *billyBob
 ```
 then
 ```bash
-yq '.a | alias' sample.yml
+yq eval '.a | alias' sample.yml
 ```
 will output
 ```yaml
@@ -169,7 +163,7 @@ a: cat
 ```
 then
 ```bash
-yq '.a alias = "meow"' sample.yml
+yq eval '.a alias = "meow"' sample.yml
 ```
 will output
 ```yaml
@@ -185,7 +179,7 @@ a: cat
 ```
 then
 ```bash
-yq '.a alias = ""' sample.yml
+yq eval '.a alias = ""' sample.yml
 ```
 will output
 ```yaml
@@ -202,7 +196,7 @@ a:
 ```
 then
 ```bash
-yq '.a alias |= .f' sample.yml
+yq eval '.a alias |= .f' sample.yml
 ```
 will output
 ```yaml
@@ -219,7 +213,7 @@ f:
 ```
 then
 ```bash
-yq 'explode(.f)' sample.yml
+yq eval 'explode(.f)' sample.yml
 ```
 will output
 ```yaml
@@ -235,7 +229,7 @@ a: mike
 ```
 then
 ```bash
-yq 'explode(.a)' sample.yml
+yq eval 'explode(.a)' sample.yml
 ```
 will output
 ```yaml
@@ -251,7 +245,7 @@ f:
 ```
 then
 ```bash
-yq 'explode(.f)' sample.yml
+yq eval 'explode(.f)' sample.yml
 ```
 will output
 ```yaml
@@ -284,7 +278,7 @@ foobar:
 ```
 then
 ```bash
-yq 'explode(.)' sample.yml
+yq eval 'explode(.)' sample.yml
 ```
 will output
 ```yaml
@@ -323,7 +317,7 @@ thingTwo:
 ```
 then
 ```bash
-yq '.thingOne |= explode(.) * {"value": false}' sample.yml
+yq eval '.thingOne |= explode(.) * {"value": false}' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/assign-update.md

@@ -7,16 +7,10 @@ Which will assign the LHS node values to the RHS node values. The RHS expression
 
 ### relative form: `|=`
 This will do a similar thing to the plain form, however, the RHS expression is run against _the LHS nodes_. This is useful for updating values based on old values, e.g. increment.
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Create yaml file
 Running
 ```bash
-yq --null-input '.a.b = "cat" | .x = "frog"'
+yq eval --null-input '.a.b = "cat" | .x = "frog"'
 ```
 will output
 ```yaml
@@ -34,7 +28,7 @@ a:
 ```
 then
 ```bash
-yq '.a |= .b' sample.yml
+yq eval '.a |= .b' sample.yml
 ```
 will output
 ```yaml
@@ -51,7 +45,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] |= . * 2' sample.yml
+yq eval '.[] |= . * 2' sample.yml
 ```
 will output
 ```yaml
@@ -90,7 +84,7 @@ b: sibling
 ```
 then
 ```bash
-yq '.a = .b' sample.yml
+yq eval '.a = .b' sample.yml
 ```
 will output
 ```yaml
@@ -107,7 +101,7 @@ c: fieldC
 ```
 then
 ```bash
-yq '(.a, .c) = "potatoe"' sample.yml
+yq eval '(.a, .c) = "potatoe"' sample.yml
 ```
 will output
 ```yaml
@@ -124,7 +118,7 @@ a:
 ```
 then
 ```bash
-yq '.a.b = "frog"' sample.yml
+yq eval '.a.b = "frog"' sample.yml
 ```
 will output
 ```yaml
@@ -142,7 +136,7 @@ a:
 ```
 then
 ```bash
-yq '.a.b |= "frog"' sample.yml
+yq eval '.a.b |= "frog"' sample.yml
 ```
 will output
 ```yaml
@@ -161,7 +155,7 @@ a:
 ```
 then
 ```bash
-yq '(.a[] | select(. == "apple")) = "frog"' sample.yml
+yq eval '(.a[] | select(. == "apple")) = "frog"' sample.yml
 ```
 will output
 ```yaml
@@ -179,7 +173,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '(.[] | select(. == "*andy")) = "bogs"' sample.yml
+yq eval '(.[] | select(. == "*andy")) = "bogs"' sample.yml
 ```
 will output
 ```yaml
@@ -195,7 +189,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.a.b |= "bogs"' sample.yml
+yq eval '.a.b |= "bogs"' sample.yml
 ```
 will output
 ```yaml
@@ -211,7 +205,7 @@ a: &cool cat
 ```
 then
 ```bash
-yq '.a = "dog"' sample.yml
+yq eval '.a = "dog"' sample.yml
 ```
 will output
 ```yaml
@@ -225,7 +219,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.a.b.[0] |= "bogs"' sample.yml
+yq eval '.a.b.[0] |= "bogs"' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/boolean-operators.md

@@ -10,22 +10,10 @@ The `or` and `and` operators take two parameters and return a boolean result.
 
 These are most commonly used with the `select` operator to filter particular nodes.
 
-## Related Operators
-
-- equals / not equals (`==`, `!=`) operators (here)[https://mikefarah.gitbook.io/yq/operators/equals]
-- comparison (`>=`, `<` etc) operators (here)[https://mikefarah.gitbook.io/yq/operators/compare]
-- select operator (here)[https://mikefarah.gitbook.io/yq/operators/select]
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified.&#x20;
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## `or` example
 Running
 ```bash
-yq --null-input 'true or false'
+yq eval --null-input 'true or false'
 ```
 will output
 ```yaml
@@ -35,7 +23,7 @@ true
 ## `and` example
 Running
 ```bash
-yq --null-input 'true and false'
+yq eval --null-input 'true and false'
 ```
 will output
 ```yaml
@@ -54,7 +42,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '[.[] | select(.a == "cat" or .b == "dog")]' sample.yml
+yq eval '[.[] | select(.a == "cat" or .b == "dog")]' sample.yml
 ```
 will output
 ```yaml
@@ -72,7 +60,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'any' sample.yml
+yq eval 'any' sample.yml
 ```
 will output
 ```yaml
@@ -86,7 +74,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'any' sample.yml
+yq eval 'any' sample.yml
 ```
 will output
 ```yaml
@@ -105,7 +93,7 @@ b:
 ```
 then
 ```bash
-yq '.[] |= any_c(. == "awesome")' sample.yml
+yq eval '.[] |= any_c(. == "awesome")' sample.yml
 ```
 will output
 ```yaml
@@ -121,7 +109,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'all' sample.yml
+yq eval 'all' sample.yml
 ```
 will output
 ```yaml
@@ -135,7 +123,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'all' sample.yml
+yq eval 'all' sample.yml
 ```
 will output
 ```yaml
@@ -154,7 +142,7 @@ b:
 ```
 then
 ```bash
-yq '.[] |= all_c(tag == "!!str")' sample.yml
+yq eval '.[] |= all_c(tag == "!!str")' sample.yml
 ```
 will output
 ```yaml
@@ -165,7 +153,7 @@ b: false
 ## Not true is false
 Running
 ```bash
-yq --null-input 'true | not'
+yq eval --null-input 'true | not'
 ```
 will output
 ```yaml
@@ -175,7 +163,7 @@ false
 ## Not false is true
 Running
 ```bash
-yq --null-input 'false | not'
+yq eval --null-input 'false | not'
 ```
 will output
 ```yaml
@@ -185,7 +173,7 @@ true
 ## String values considered to be true
 Running
 ```bash
-yq --null-input '"cat" | not'
+yq eval --null-input '"cat" | not'
 ```
 will output
 ```yaml
@@ -195,7 +183,7 @@ false
 ## Empty string value considered to be true
 Running
 ```bash
-yq --null-input '"" | not'
+yq eval --null-input '"" | not'
 ```
 will output
 ```yaml
@@ -205,7 +193,7 @@ false
 ## Numbers are considered to be true
 Running
 ```bash
-yq --null-input '1 | not'
+yq eval --null-input '1 | not'
 ```
 will output
 ```yaml
@@ -215,7 +203,7 @@ false
 ## Zero is considered to be true
 Running
 ```bash
-yq --null-input '0 | not'
+yq eval --null-input '0 | not'
 ```
 will output
 ```yaml
@@ -225,7 +213,7 @@ false
 ## Null is considered to be false
 Running
 ```bash
-yq --null-input '~ | not'
+yq eval --null-input '~ | not'
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/collect-into-array.md

@@ -3,16 +3,10 @@
 This creates an array using the expression between the square brackets.
 
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Collect empty
 Running
 ```bash
-yq --null-input '[]'
+yq eval --null-input '[]'
 ```
 will output
 ```yaml
@@ -22,7 +16,7 @@ will output
 ## Collect single
 Running
 ```bash
-yq --null-input '["cat"]'
+yq eval --null-input '["cat"]'
 ```
 will output
 ```yaml
@@ -37,7 +31,7 @@ b: dog
 ```
 then
 ```bash
-yq '[.a, .b]' sample.yml
+yq eval '[.a, .b]' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/column.md

@@ -1,66 +0,0 @@
-# Column
-
-Returns the column of the matching node. Starts from 1, 0 indicates there was no column data.
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
-## Returns column of _value_ node
-Given a sample.yml file of:
-```yaml
-a: cat
-b: bob
-```
-then
-```bash
-yq '.b | column' sample.yml
-```
-will output
-```yaml
-4
-```
-
-## Returns column of _key_ node
-Pipe through the key operator to get the column of the key
-
-Given a sample.yml file of:
-```yaml
-a: cat
-b: bob
-```
-then
-```bash
-yq '.b | key | column' sample.yml
-```
-will output
-```yaml
-1
-```
-
-## First column is 1
-Given a sample.yml file of:
-```yaml
-a: cat
-```
-then
-```bash
-yq '.a | key | column' sample.yml
-```
-will output
-```yaml
-1
-```
-
-## No column data is 0
-Running
-```bash
-yq --null-input '{"a": "new entry"} | column'
-```
-will output
-```yaml
-0
-```
-

pkg/yqlib/doc/operators/comment-operators.md

@@ -10,12 +10,6 @@ This will assign the LHS nodes comments to the expression on the RHS. The RHS is
 ### relative form: `|=` 
 Similar to the plain form, however the RHS evaluates against each matching LHS node! This is useful if you want to set the comments as a relative expression of the node, for instance its value or path.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Set line comment
 Given a sample.yml file of:
 ```yaml
@@ -23,7 +17,7 @@ a: cat
 ```
 then
 ```bash
-yq '.a line_comment="single"' sample.yml
+yq eval '.a lineComment="single"' sample.yml
 ```
 will output
 ```yaml
@@ -38,7 +32,7 @@ b: dog
 ```
 then
 ```bash
-yq '.. line_comment |= .' sample.yml
+yq eval '.. lineComment |= .' sample.yml
 ```
 will output
 ```yaml
@@ -53,7 +47,7 @@ a: cat
 ```
 then
 ```bash
-yq '. head_comment="single"' sample.yml
+yq eval '. headComment="single"' sample.yml
 ```
 will output
 ```yaml
@@ -69,7 +63,7 @@ a: cat
 ```
 then
 ```bash
-yq '. foot_comment=.a' sample.yml
+yq eval '. footComment=.a' sample.yml
 ```
 will output
 ```yaml
@@ -86,7 +80,7 @@ b: dog # leave this
 ```
 then
 ```bash
-yq '.a line_comment=""' sample.yml
+yq eval '.a lineComment=""' sample.yml
 ```
 will output
 ```yaml
@@ -105,7 +99,7 @@ b: # key comment
 ```
 then
 ```bash
-yq '... comments=""' sample.yml
+yq eval '... comments=""' sample.yml
 ```
 will output
 ```yaml
@@ -120,7 +114,7 @@ a: cat # meow
 ```
 then
 ```bash
-yq '.a | line_comment' sample.yml
+yq eval '.a | lineComment' sample.yml
 ```
 will output
 ```yaml
@@ -138,7 +132,7 @@ a: cat # meow
 ```
 then
 ```bash
-yq '. | head_comment' sample.yml
+yq eval '. | headComment' sample.yml
 ```
 will output
 ```yaml
@@ -157,7 +151,7 @@ a: cat # meow
 ```
 then
 ```bash
-yq 'head_comment' sample.yml
+yq eval 'headComment' sample.yml
 ```
 will output
 ```yaml
@@ -177,7 +171,7 @@ a: cat # meow
 ```
 then
 ```bash
-yq '. | foot_comment' sample.yml
+yq eval '. | footComment' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/compare.md

@@ -1,164 +0,0 @@
-# Compare Operators
-
-Comparison operators (`>`, `>=`, `<`, `<=`) can be used for comparing scalar values of the same time.
-
-The following types are currently supported:
-
-- numbers
-- strings
-- datetimes
-
-## Related Operators
-
-- equals / not equals (`==`, `!=`) operators (here)[https://mikefarah.gitbook.io/yq/operators/equals]
-- boolean operators (`and`, `or`, `any` etc) (here)[https://mikefarah.gitbook.io/yq/operators/boolean-operators]
-- select operator (here)[https://mikefarah.gitbook.io/yq/operators/select]
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified.&#x20;
-
-`yq e <exp> <file>`
-{% endhint %}
-
-## Both sides are null: > is false
-Running
-```bash
-yq --null-input '.a > .b'
-```
-will output
-```yaml
-false
-```
-
-## Both sides are null: >= is true
-Running
-```bash
-yq --null-input '.a >= .b'
-```
-will output
-```yaml
-true
-```
-
-## One side is null: > is false
-Given a sample.yml file of:
-```yaml
-a: 5
-```
-then
-```bash
-yq '.a > .b' sample.yml
-```
-will output
-```yaml
-false
-```
-
-## One side is null: >= is false
-Given a sample.yml file of:
-```yaml
-a: 5
-```
-then
-```bash
-yq '.a >= .b' sample.yml
-```
-will output
-```yaml
-false
-```
-
-## Compare integers (>)
-Given a sample.yml file of:
-```yaml
-a: 5
-b: 4
-```
-then
-```bash
-yq '.a > .b' sample.yml
-```
-will output
-```yaml
-true
-```
-
-## Compare integers (>=)
-Given a sample.yml file of:
-```yaml
-a: 5
-b: 4
-```
-then
-```bash
-yq '.a >= .b' sample.yml
-```
-will output
-```yaml
-true
-```
-
-## Compare equal numbers
-Given a sample.yml file of:
-```yaml
-a: 5
-b: 5
-```
-then
-```bash
-yq '.a > .b' sample.yml
-```
-will output
-```yaml
-false
-```
-
-## Compare equal numbers (>=)
-Given a sample.yml file of:
-```yaml
-a: 5
-b: 5
-```
-then
-```bash
-yq '.a >= .b' sample.yml
-```
-will output
-```yaml
-true
-```
-
-## Compare strings
-Compares strings by their bytecode.
-
-Given a sample.yml file of:
-```yaml
-a: zoo
-b: apple
-```
-then
-```bash
-yq '.a > .b' sample.yml
-```
-will output
-```yaml
-true
-```
-
-## Compare date times
-You can compare date times. Assumes RFC3339 date time format, see [date-time operators](https://mikefarah.gitbook.io/yq/operators/date-time-operators) for more information.
-
-Given a sample.yml file of:
-```yaml
-a: 2021-01-01T03:10:00Z
-b: 2020-01-01T03:10:00Z
-```
-then
-```bash
-yq '.a > .b' sample.yml
-```
-will output
-```yaml
-true
-```
-

pkg/yqlib/doc/operators/contains.md

@@ -2,12 +2,6 @@
 
 This returns `true` if the context contains the passed in parameter, and false otherwise.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Array contains array
 Array is equal or subset of
 
@@ -19,7 +13,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'contains(["baz", "bar"])' sample.yml
+yq eval 'contains(["baz", "bar"])' sample.yml
 ```
 will output
 ```yaml
@@ -38,7 +32,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'contains({"bar": [{"barp": 12}]})' sample.yml
+yq eval 'contains({"bar": [{"barp": 12}]})' sample.yml
 ```
 will output
 ```yaml
@@ -57,7 +51,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'contains({"foo": 12, "bar": [{"barp": 15}]})' sample.yml
+yq eval 'contains({"foo": 12, "bar": [{"barp": 15}]})' sample.yml
 ```
 will output
 ```yaml
@@ -71,7 +65,7 @@ foobar
 ```
 then
 ```bash
-yq 'contains("bar")' sample.yml
+yq eval 'contains("bar")' sample.yml
 ```
 will output
 ```yaml
@@ -85,7 +79,7 @@ meow
 ```
 then
 ```bash
-yq 'contains("meow")' sample.yml
+yq eval 'contains("meow")' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/create-collect-into-object.md

@@ -2,16 +2,10 @@
 
 This is used to construct objects (or maps). This can be used against existing yaml, or to create fresh yaml documents.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Collect empty object
 Running
 ```bash
-yq --null-input '{}'
+yq eval --null-input '{}'
 ```
 will output
 ```yaml
@@ -25,7 +19,7 @@ name: Mike
 ```
 then
 ```bash
-yq '{"wrap": .}' sample.yml
+yq eval '{"wrap": .}' sample.yml
 ```
 will output
 ```yaml
@@ -43,7 +37,7 @@ pets:
 ```
 then
 ```bash
-yq '{.name: .pets.[]}' sample.yml
+yq eval '{.name: .pets.[]}' sample.yml
 ```
 will output
 ```yaml
@@ -66,7 +60,7 @@ pets:
 ```
 then
 ```bash
-yq '{.name: .pets.[]}' sample.yml
+yq eval '{.name: .pets.[]}' sample.yml
 ```
 will output
 ```yaml
@@ -79,7 +73,7 @@ Rosey: sheep
 ## Creating yaml from scratch
 Running
 ```bash
-yq --null-input '{"wrap": "frog"}'
+yq eval --null-input '{"wrap": "frog"}'
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/datetime.md

@@ -1,203 +0,0 @@
-# Date Time
-
-Various operators for parsing and manipulating dates. 
-
-## Date time formattings
-This uses the golangs built in time library for parsing and formatting date times.
-
-When not specified, the RFC3339 standard is assumed `2006-01-02T15:04:05Z07:00` for parsing.
-
-To specify a custom parsing format, use the `with_dtf` operator. The first parameter sets the datetime parsing format for the expression in the second parameter. The expression can be any valid `yq` expression tree.
-
-```bash
-yq 'with_dtf("myformat"; .a + "3h" | tz("Australia/Melbourne"))'
-```
-
-See https://pkg.go.dev/time#pkg-constants for examples of formatting options.
-
-
-## Timezones
-This uses golangs built in LoadLocation function to parse timezones strings. See https://pkg.go.dev/time#LoadLocation for more details.
-
-
-## Durations
-Durations are parsed using golangs built in [ParseDuration](https://pkg.go.dev/time#ParseDuration) function.
-
-You can durations to time using the `+` operator.
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
-## Format: from standard RFC3339 format
-Providing a single parameter assumes a standard RFC3339 datetime format. If the target format is not a valid yaml datetime format, the result will be a string tagged node.
-
-Given a sample.yml file of:
-```yaml
-a: 2001-12-15T02:59:43.1Z
-```
-then
-```bash
-yq '.a |= format_datetime("Monday, 02-Jan-06 at 3:04PM")' sample.yml
-```
-will output
-```yaml
-a: Saturday, 15-Dec-01 at 2:59AM
-```
-
-## Format: from custom date time
-Use with_dtf to set a custom datetime format for parsing.
-
-Given a sample.yml file of:
-```yaml
-a: Saturday, 15-Dec-01 at 2:59AM
-```
-then
-```bash
-yq '.a |= with_dtf("Monday, 02-Jan-06 at 3:04PM"; format_datetime("2006-01-02"))' sample.yml
-```
-will output
-```yaml
-a: 2001-12-15
-```
-
-## Format: get the day of the week
-Given a sample.yml file of:
-```yaml
-a: 2001-12-15T02:59:43.1Z
-```
-then
-```bash
-yq '.a | format_datetime("Monday")' sample.yml
-```
-will output
-```yaml
-Saturday
-```
-
-## Now
-Given a sample.yml file of:
-```yaml
-a: cool
-```
-then
-```bash
-yq '.updated = now' sample.yml
-```
-will output
-```yaml
-a: cool
-updated: 2021-05-19T01:02:03Z
-```
-
-## Timezone: from standard RFC3339 format
-Returns a new datetime in the specified timezone. Specify standard IANA Time Zone format or 'utc', 'local'. When given a single parameter, this assumes the datetime is in RFC3339 format.
-
-Given a sample.yml file of:
-```yaml
-a: cool
-```
-then
-```bash
-yq '.updated = (now | tz("Australia/Sydney"))' sample.yml
-```
-will output
-```yaml
-a: cool
-updated: 2021-05-19T11:02:03+10:00
-```
-
-## Timezone: with custom format
-Specify standard IANA Time Zone format or 'utc', 'local'
-
-Given a sample.yml file of:
-```yaml
-a: Saturday, 15-Dec-01 at 2:59AM GMT
-```
-then
-```bash
-yq '.a |= with_dtf("Monday, 02-Jan-06 at 3:04PM MST"; tz("Australia/Sydney"))' sample.yml
-```
-will output
-```yaml
-a: Saturday, 15-Dec-01 at 1:59PM AEDT
-```
-
-## Add and tz custom format
-Specify standard IANA Time Zone format or 'utc', 'local'
-
-Given a sample.yml file of:
-```yaml
-a: Saturday, 15-Dec-01 at 2:59AM GMT
-```
-then
-```bash
-yq '.a |= with_dtf("Monday, 02-Jan-06 at 3:04PM MST"; tz("Australia/Sydney"))' sample.yml
-```
-will output
-```yaml
-a: Saturday, 15-Dec-01 at 1:59PM AEDT
-```
-
-## Date addition
-Given a sample.yml file of:
-```yaml
-a: 2021-01-01T00:00:00Z
-```
-then
-```bash
-yq '.a += "3h10m"' sample.yml
-```
-will output
-```yaml
-a: 2021-01-01T03:10:00Z
-```
-
-## Date subtraction
-You can subtract durations from dates. Assumes RFC3339 date time format, see [date-time operators](https://mikefarah.gitbook.io/yq/operators/date-time-operators) for more information.
-
-Given a sample.yml file of:
-```yaml
-a: 2021-01-01T03:10:00Z
-```
-then
-```bash
-yq '.a -= "3h10m"' sample.yml
-```
-will output
-```yaml
-a: 2021-01-01T00:00:00Z
-```
-
-## Date addition - custom format
-Given a sample.yml file of:
-```yaml
-a: Saturday, 15-Dec-01 at 2:59AM GMT
-```
-then
-```bash
-yq 'with_dtf("Monday, 02-Jan-06 at 3:04PM MST"; .a += "3h1m")' sample.yml
-```
-will output
-```yaml
-a: Saturday, 15-Dec-01 at 6:00AM GMT
-```
-
-## Date script with custom format
-You can embed full expressions in with_dtf if needed.
-
-Given a sample.yml file of:
-```yaml
-a: Saturday, 15-Dec-01 at 2:59AM GMT
-```
-then
-```bash
-yq 'with_dtf("Monday, 02-Jan-06 at 3:04PM MST"; .a = (.a + "3h1m" | tz("Australia/Perth")))' sample.yml
-```
-will output
-```yaml
-a: Saturday, 15-Dec-01 at 2:00PM AWST
-```
-

pkg/yqlib/doc/operators/delete.md

@@ -2,12 +2,6 @@
 
 Deletes matching entries in maps or arrays.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Delete entry in map
 Given a sample.yml file of:
 ```yaml
@@ -16,7 +10,7 @@ b: dog
 ```
 then
 ```bash
-yq 'del(.b)' sample.yml
+yq eval 'del(.b)' sample.yml
 ```
 will output
 ```yaml
@@ -32,7 +26,7 @@ a:
 ```
 then
 ```bash
-yq 'del(.a.a1)' sample.yml
+yq eval 'del(.a.a1)' sample.yml
 ```
 will output
 ```yaml
@@ -49,7 +43,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'del(.[1])' sample.yml
+yq eval 'del(.[1])' sample.yml
 ```
 will output
 ```yaml
@@ -65,7 +59,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'del(.[0].a)' sample.yml
+yq eval 'del(.[0].a)' sample.yml
 ```
 will output
 ```yaml
@@ -80,7 +74,7 @@ b: dog
 ```
 then
 ```bash
-yq 'del(.c)' sample.yml
+yq eval 'del(.c)' sample.yml
 ```
 will output
 ```yaml
@@ -97,7 +91,7 @@ c: bat
 ```
 then
 ```bash
-yq 'del( .[] | select(. == "*at") )' sample.yml
+yq eval 'del( .[] | select(. == "*at") )' sample.yml
 ```
 will output
 ```yaml
@@ -115,7 +109,7 @@ a:
 ```
 then
 ```bash
-yq 'del(.. | select(has("name")).name)' sample.yml
+yq eval 'del(.. | select(has("name")).name)' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/document-index.md

@@ -2,12 +2,6 @@
 
 Use the `documentIndex` operator (or the `di` shorthand) to select nodes of a particular document.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Retrieve a document index
 Given a sample.yml file of:
 ```yaml
@@ -17,7 +11,7 @@ a: frog
 ```
 then
 ```bash
-yq '.a | document_index' sample.yml
+yq eval '.a | documentIndex' sample.yml
 ```
 will output
 ```yaml
@@ -35,7 +29,7 @@ a: frog
 ```
 then
 ```bash
-yq '.a | di' sample.yml
+yq eval '.a | di' sample.yml
 ```
 will output
 ```yaml
@@ -53,7 +47,7 @@ a: frog
 ```
 then
 ```bash
-yq 'select(document_index == 1)' sample.yml
+yq eval 'select(documentIndex == 1)' sample.yml
 ```
 will output
 ```yaml
@@ -69,7 +63,7 @@ a: frog
 ```
 then
 ```bash
-yq 'select(di == 1)' sample.yml
+yq eval 'select(di == 1)' sample.yml
 ```
 will output
 ```yaml
@@ -85,7 +79,7 @@ a: frog
 ```
 then
 ```bash
-yq '.a | ({"match": ., "doc": document_index})' sample.yml
+yq eval '.a | ({"match": ., "doc": documentIndex})' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/encode-decode.md

@@ -14,22 +14,10 @@ These operators are useful to process yaml documents that have stringified embed
 | Properties |  | to_props/@props |
 | CSV |  | to_csv/@csv |
 | TSV |  | to_tsv/@tsv |
-| XML | from_xml | to_xml(i)/@xml |
-| Base64 | @base64d | @base64 |
 
 
 CSV and TSV format both accept either a single array or scalars (representing a single row), or an array of array of scalars (representing multiple rows). 
 
-XML uses the `--xml-attribute-prefix` and `xml-content-name` flags to identify attributes and content fields.
-
-
-Base64 assumes [rfc4648](https://rfc-editor.org/rfc/rfc4648.html) encoding. Encoding and decoding both assume that the content is a string.
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
 
 ## Encode value as json string
 Given a sample.yml file of:
@@ -39,7 +27,7 @@ a:
 ```
 then
 ```bash
-yq '.b = (.a | to_json)' sample.yml
+yq eval '.b = (.a | to_json)' sample.yml
 ```
 will output
 ```yaml
@@ -61,7 +49,7 @@ a:
 ```
 then
 ```bash
-yq '.b = (.a | to_json(0))' sample.yml
+yq eval '.b = (.a | to_json(0))' sample.yml
 ```
 will output
 ```yaml
@@ -80,7 +68,7 @@ a:
 ```
 then
 ```bash
-yq '.b = (.a | @json)' sample.yml
+yq eval '.b = (.a | @json)' sample.yml
 ```
 will output
 ```yaml
@@ -98,7 +86,7 @@ a: '{"cool":"thing"}'
 ```
 then
 ```bash
-yq '.a | from_json | ... style=""' sample.yml
+yq eval '.a | from_json | ... style=""' sample.yml
 ```
 will output
 ```yaml
@@ -113,7 +101,7 @@ a:
 ```
 then
 ```bash
-yq '.b = (.a | @props)' sample.yml
+yq eval '.b = (.a | @props)' sample.yml
 ```
 will output
 ```yaml
@@ -134,7 +122,7 @@ a:
 ```
 then
 ```bash
-yq '.b = (.a | to_yaml)' sample.yml
+yq eval '.b = (.a | to_yaml)' sample.yml
 ```
 will output
 ```yaml
@@ -157,7 +145,7 @@ a:
 ```
 then
 ```bash
-yq '.b = (.a | to_yaml(8))' sample.yml
+yq eval '.b = (.a | to_yaml(8))' sample.yml
 ```
 will output
 ```yaml
@@ -176,7 +164,7 @@ a: 'foo: bar'
 ```
 then
 ```bash
-yq '.b = (.a | from_yaml)' sample.yml
+yq eval '.b = (.a | from_yaml)' sample.yml
 ```
 will output
 ```yaml
@@ -195,7 +183,7 @@ a: |
 ```
 then
 ```bash
-yq '.a |= (from_yaml | .foo = "cat" | to_yaml)' sample.yml
+yq eval '.a |= (from_yaml | .foo = "cat" | to_yaml)' sample.yml
 ```
 will output
 ```yaml
@@ -211,7 +199,7 @@ a: 'foo: bar'
 ```
 then
 ```bash
-yq '.a |= (from_yaml | .foo = "cat" | to_yaml)' sample.yml
+yq eval '.a |= (from_yaml | .foo = "cat" | to_yaml)' sample.yml
 ```
 will output
 ```yaml
@@ -230,7 +218,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '@csv' sample.yml
+yq eval '@csv' sample.yml
 ```
 will output
 ```yaml
@@ -251,7 +239,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '@csv' sample.yml
+yq eval '@csv' sample.yml
 ```
 will output
 ```yaml
@@ -275,7 +263,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '@tsv' sample.yml
+yq eval '@tsv' sample.yml
 ```
 will output
 ```yaml
@@ -283,64 +271,6 @@ cat	thing1,thing2	true	3.40
 dog	thing3	false	12
 ```
 
-## Encode value as xml string
-Given a sample.yml file of:
-```yaml
-a:
-  cool:
-    foo: bar
-    +id: hi
-```
-then
-```bash
-yq '.a | to_xml' sample.yml
-```
-will output
-```yaml
-<cool id="hi">
-  <foo>bar</foo>
-</cool>
-
-```
-
-## Encode value as xml string on a single line
-Given a sample.yml file of:
-```yaml
-a:
-  cool:
-    foo: bar
-    +id: hi
-```
-then
-```bash
-yq '.a | @xml' sample.yml
-```
-will output
-```yaml
-<cool id="hi"><foo>bar</foo></cool>
-
-```
-
-## Encode value as xml string with custom indentation
-Given a sample.yml file of:
-```yaml
-a:
-  cool:
-    foo: bar
-    +id: hi
-```
-then
-```bash
-yq '{"cat": .a | to_xml(1)}' sample.yml
-```
-will output
-```yaml
-cat: |
-  <cool id="hi">
-   <foo>bar</foo>
-  </cool>
-```
-
 ## Decode a xml encoded string
 Given a sample.yml file of:
 ```yaml
@@ -348,7 +278,7 @@ a: <foo>bar</foo>
 ```
 then
 ```bash
-yq '.b = (.a | from_xml)' sample.yml
+yq eval '.b = (.a | from_xml)' sample.yml
 ```
 will output
 ```yaml
@@ -357,66 +287,3 @@ b:
   foo: bar
 ```
 
-## Encode a string to base64
-Given a sample.yml file of:
-```yaml
-coolData: a special string
-```
-then
-```bash
-yq '.coolData | @base64' sample.yml
-```
-will output
-```yaml
-YSBzcGVjaWFsIHN0cmluZw==
-```
-
-## Encode a yaml document to base64
-Pipe through @yaml first to convert to a string, then use @base64 to encode it.
-
-Given a sample.yml file of:
-```yaml
-a: apple
-```
-then
-```bash
-yq '@yaml | @base64' sample.yml
-```
-will output
-```yaml
-YTogYXBwbGUK
-```
-
-## Decode a base64 encoded string
-Decoded data is assumed to be a string.
-
-Given a sample.yml file of:
-```yaml
-coolData: V29ya3Mgd2l0aCBVVEYtMTYg8J+Yig==
-```
-then
-```bash
-yq '.coolData | @base64d' sample.yml
-```
-will output
-```yaml
-Works with UTF-16 😊
-```
-
-## Decode a base64 encoded yaml document
-Pipe through `from_yaml` to parse the decoded base64 string as a yaml document.
-
-Given a sample.yml file of:
-```yaml
-coolData: YTogYXBwbGUK
-```
-then
-```bash
-yq '.coolData |= (@base64d | from_yaml)' sample.yml
-```
-will output
-```yaml
-coolData:
-  a: apple
-```
-

pkg/yqlib/doc/operators/entries.md

@@ -2,12 +2,6 @@
 
 Similar to the same named functions in `jq` these functions convert to/from an object and an array of key-value pairs. This is most useful for performing operations on keys of maps.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## to_entries Map
 Given a sample.yml file of:
 ```yaml
@@ -16,7 +10,7 @@ b: 2
 ```
 then
 ```bash
-yq 'to_entries' sample.yml
+yq eval 'to_entries' sample.yml
 ```
 will output
 ```yaml
@@ -34,7 +28,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'to_entries' sample.yml
+yq eval 'to_entries' sample.yml
 ```
 will output
 ```yaml
@@ -51,7 +45,7 @@ null
 ```
 then
 ```bash
-yq 'to_entries' sample.yml
+yq eval 'to_entries' sample.yml
 ```
 will output
 ```yaml
@@ -65,7 +59,7 @@ b: 2
 ```
 then
 ```bash
-yq 'to_entries | from_entries' sample.yml
+yq eval 'to_entries | from_entries' sample.yml
 ```
 will output
 ```yaml
@@ -83,7 +77,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'to_entries | from_entries' sample.yml
+yq eval 'to_entries | from_entries' sample.yml
 ```
 will output
 ```yaml
@@ -99,7 +93,7 @@ b: 2
 ```
 then
 ```bash
-yq 'with_entries(.key |= "KEY_" + .)' sample.yml
+yq eval 'with_entries(.key |= "KEY_" + .)' sample.yml
 ```
 will output
 ```yaml
@@ -117,7 +111,7 @@ c:
 ```
 then
 ```bash
-yq 'with_entries(select(.value | has("b")))' sample.yml
+yq eval 'with_entries(select(.value | has("b")))' sample.yml
 ```
 will output
 ```yaml

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

@@ -1,45 +1,11 @@
 # Env Variable Operators
 
-These operators are used to handle environment variables usage in expressions and documents. While environment variables can, of course, be passed in via your CLI with string interpolation, this often comes with complex quote escaping and can be tricky to write and read. 
-
-There are three operators:
-
--  `env` which takes a single environment variable name and parse the variable as a yaml node (be it a map, array, string, number of boolean) 
-- `strenv` which also takes a single environment variable name, and always parses the variable as a string.
-- `envsubst` which you pipe strings into and it interpolates environment variables in strings using [envsubst](https://github.com/a8m/envsubst). 
-
-
-## EnvSubst Options
-You can optionally pass envsubst any of the following options:
-
-  - nu: NoUnset, this will fail if there are any referenced variables that are not set
-  - ne: NoEmpty, this will fail if there are any referenced variables that are empty
-  - ff: FailFast, this will abort on the first failure (rather than collect all the errors)
-
-E.g:
-`envsubst(ne, ff)` will fail on the first empty variable.
-
-See [Imposing Restrictions](https://github.com/a8m/envsubst#imposing-restrictions) in the `envsubst` documentation for more information, and below for examples.
-
-## Tip
-To replace environment variables across all values in a document, `envsubst` can be used with the recursive descent operator
-as follows:
-
-```bash
-yq '(.. | select(tag == "!!str")) |= envsubst' file.yaml
-```
-
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
+This operator is used to handle environment variables usage in path expressions. While environment variables can, of course, be passed in via your CLI with string interpolation, this often comes with complex quote escaping and can be tricky to write and read. Note that there are two forms, `env` which will parse the environment variable as a yaml (be it a map, array, string, number of boolean) and `strenv` which will always parse the argument as a string.
 
 ## Read string environment variable
 Running
 ```bash
-myenv="cat meow" yq --null-input '.a = env(myenv)'
+myenv="cat meow" yq eval --null-input '.a = env(myenv)'
 ```
 will output
 ```yaml
@@ -49,7 +15,7 @@ a: cat meow
 ## Read boolean environment variable
 Running
 ```bash
-myenv="true" yq --null-input '.a = env(myenv)'
+myenv="true" yq eval --null-input '.a = env(myenv)'
 ```
 will output
 ```yaml
@@ -59,7 +25,7 @@ a: true
 ## Read numeric environment variable
 Running
 ```bash
-myenv="12" yq --null-input '.a = env(myenv)'
+myenv="12" yq eval --null-input '.a = env(myenv)'
 ```
 will output
 ```yaml
@@ -69,7 +35,7 @@ a: 12
 ## Read yaml environment variable
 Running
 ```bash
-myenv="{b: fish}" yq --null-input '.a = env(myenv)'
+myenv="{b: fish}" yq eval --null-input '.a = env(myenv)'
 ```
 will output
 ```yaml
@@ -79,7 +45,7 @@ a: {b: fish}
 ## Read boolean environment variable as a string
 Running
 ```bash
-myenv="true" yq --null-input '.a = strenv(myenv)'
+myenv="true" yq eval --null-input '.a = strenv(myenv)'
 ```
 will output
 ```yaml
@@ -89,35 +55,13 @@ a: "true"
 ## Read numeric environment variable as a string
 Running
 ```bash
-myenv="12" yq --null-input '.a = strenv(myenv)'
+myenv="12" yq eval --null-input '.a = strenv(myenv)'
 ```
 will output
 ```yaml
 a: "12"
 ```
 
-## Dynamically update a path from an environment variable
-The env variable can be any valid yq expression.
-
-Given a sample.yml file of:
-```yaml
-a:
-  b:
-    - name: dog
-    - name: cat
-```
-then
-```bash
-pathEnv=".a.b[0].name"  valueEnv="moo" yq 'eval(strenv(pathEnv)) = strenv(valueEnv)' sample.yml
-```
-will output
-```yaml
-a:
-  b:
-    - name: moo
-    - name: cat
-```
-
 ## Dynamic key lookup with environment variable
 Given a sample.yml file of:
 ```yaml
@@ -126,137 +70,10 @@ dog: woof
 ```
 then
 ```bash
-myenv="cat" yq '.[env(myenv)]' sample.yml
+myenv="cat" yq eval '.[env(myenv)]' sample.yml
 ```
 will output
 ```yaml
 meow
 ```
 
-## Replace strings with envsubst
-Running
-```bash
-myenv="cat" yq --null-input '"the ${myenv} meows" | envsubst'
-```
-will output
-```yaml
-the cat meows
-```
-
-## Replace strings with envsubst, missing variables
-Running
-```bash
-yq --null-input '"the ${myenvnonexisting} meows" | envsubst'
-```
-will output
-```yaml
-the  meows
-```
-
-## Replace strings with envsubst(nu), missing variables
-(nu) not unset, will fail if there are unset (missing) variables
-
-Running
-```bash
-yq --null-input '"the ${myenvnonexisting} meows" | envsubst(nu)'
-```
-will output
-```bash
-Error: variable ${myenvnonexisting} not set
-```
-
-## Replace strings with envsubst(ne), missing variables
-(ne) not empty, only validates set variables
-
-Running
-```bash
-yq --null-input '"the ${myenvnonexisting} meows" | envsubst(ne)'
-```
-will output
-```yaml
-the  meows
-```
-
-## Replace strings with envsubst(ne), empty variable
-(ne) not empty, will fail if a references variable is empty
-
-Running
-```bash
-myenv="" yq --null-input '"the ${myenv} meows" | envsubst(ne)'
-```
-will output
-```bash
-Error: variable ${myenv} set but empty
-```
-
-## Replace strings with envsubst, missing variables with defaults
-Running
-```bash
-yq --null-input '"the ${myenvnonexisting-dog} meows" | envsubst'
-```
-will output
-```yaml
-the dog meows
-```
-
-## Replace strings with envsubst(nu), missing variables with defaults
-Having a default specified skips over the missing variable.
-
-Running
-```bash
-yq --null-input '"the ${myenvnonexisting-dog} meows" | envsubst(nu)'
-```
-will output
-```yaml
-the dog meows
-```
-
-## Replace strings with envsubst(ne), missing variables with defaults
-Fails, because the variable is explicitly set to blank.
-
-Running
-```bash
-myEmptyEnv="" yq --null-input '"the ${myEmptyEnv-dog} meows" | envsubst(ne)'
-```
-will output
-```bash
-Error: variable ${myEmptyEnv} set but empty
-```
-
-## Replace string environment variable in document
-Given a sample.yml file of:
-```yaml
-v: ${myenv}
-```
-then
-```bash
-myenv="cat meow" yq '.v |= envsubst' sample.yml
-```
-will output
-```yaml
-v: cat meow
-```
-
-## (Default) Return all envsubst errors
-By default, all errors are returned at once.
-
-Running
-```bash
-yq --null-input '"the ${notThere} ${alsoNotThere}" | envsubst(nu)'
-```
-will output
-```bash
-Error: variable ${notThere} not set
-variable ${alsoNotThere} not set
-```
-
-## Fail fast, return the first envsubst error (and abort)
-Running
-```bash
-yq --null-input '"the ${notThere} ${alsoNotThere}" | envsubst(nu,ff)'
-```
-will output
-```bash
-Error: variable ${notThere} not set
-```
-

pkg/yqlib/doc/operators/equals.md

@@ -1,4 +1,4 @@
-# Equals / Not Equals
+# Equals
 
 This is a boolean operator that will return `true` if the LHS is equal to the RHS and `false` otherwise.
 
@@ -12,21 +12,6 @@ It is most often used with the select operator to find particular nodes:
 select(.a == .b)
 ```
 
-The not equals `!=` operator returns `false` if the LHS is equal to the RHS.
-
-## Related Operators
-
-- comparison (`>=`, `<` etc) operators (here)[https://mikefarah.gitbook.io/yq/operators/compare]
-- boolean operators (`and`, `or`, `any` etc) (here)[https://mikefarah.gitbook.io/yq/operators/boolean-operators]
-- select operator (here)[https://mikefarah.gitbook.io/yq/operators/select]
-
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified.&#x20;
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Match string
 Given a sample.yml file of:
 ```yaml
@@ -36,7 +21,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] | (. == "*at")' sample.yml
+yq eval '.[] | (. == "*at")' sample.yml
 ```
 will output
 ```yaml
@@ -54,7 +39,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] | (. != "*at")' sample.yml
+yq eval '.[] | (. != "*at")' sample.yml
 ```
 will output
 ```yaml
@@ -72,7 +57,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] | (. == 4)' sample.yml
+yq eval '.[] | (. == 4)' sample.yml
 ```
 will output
 ```yaml
@@ -90,7 +75,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] | (. != 4)' sample.yml
+yq eval '.[] | (. != 4)' sample.yml
 ```
 will output
 ```yaml
@@ -102,7 +87,7 @@ true
 ## Match nulls
 Running
 ```bash
-yq --null-input 'null == ~'
+yq eval --null-input 'null == ~'
 ```
 will output
 ```yaml
@@ -116,7 +101,7 @@ a: frog
 ```
 then
 ```bash
-yq 'select(.b != "thing")' sample.yml
+yq eval 'select(.b != "thing")' sample.yml
 ```
 will output
 ```yaml
@@ -130,7 +115,7 @@ a: frog
 ```
 then
 ```bash
-yq 'select(.b == .c)' sample.yml
+yq eval 'select(.b == .c)' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/eval.md

@@ -1,54 +0,0 @@
-# Eval
-
-Use `eval` to dynamically process an expression - for instance from an environment variable.
-
-`eval` takes a single argument, and evaluates that as a `yq` expression. Any valid expression can be used, beit a path `.a.b.c | select(. == "cat")`, or an update `.a.b.c = "gogo"`.
-
-Tip: This can be useful way parameterise complex scripts.
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
-## Dynamically evaluate a path
-Given a sample.yml file of:
-```yaml
-pathExp: .a.b[] | select(.name == "cat")
-a:
-  b:
-    - name: dog
-    - name: cat
-```
-then
-```bash
-yq 'eval(.pathExp)' sample.yml
-```
-will output
-```yaml
-name: cat
-```
-
-## Dynamically update a path from an environment variable
-The env variable can be any valid yq expression.
-
-Given a sample.yml file of:
-```yaml
-a:
-  b:
-    - name: dog
-    - name: cat
-```
-then
-```bash
-pathEnv=".a.b[0].name"  valueEnv="moo" yq 'eval(strenv(pathEnv)) = strenv(valueEnv)' sample.yml
-```
-will output
-```yaml
-a:
-  b:
-    - name: moo
-    - name: cat
-```
-

pkg/yqlib/doc/operators/file-operators.md

@@ -10,12 +10,6 @@ Note the use of eval-all to ensure all documents are loaded into memory.
 yq eval-all 'select(fi == 0) * select(filename == "file2.yaml")' file1.yaml file2.yaml
 ```
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Get filename
 Given a sample.yml file of:
 ```yaml
@@ -23,7 +17,7 @@ a: cat
 ```
 then
 ```bash
-yq 'filename' sample.yml
+yq eval 'filename' sample.yml
 ```
 will output
 ```yaml
@@ -37,7 +31,7 @@ a: cat
 ```
 then
 ```bash
-yq 'file_index' sample.yml
+yq eval 'fileIndex' sample.yml
 ```
 will output
 ```yaml
@@ -55,7 +49,7 @@ a: cat
 ```
 then
 ```bash
-yq eval-all 'file_index' sample.yml another.yml
+yq eval-all 'fileIndex' sample.yml another.yml
 ```
 will output
 ```yaml
@@ -71,7 +65,7 @@ a: cat
 ```
 then
 ```bash
-yq 'fi' sample.yml
+yq eval 'fi' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/flatten.md

@@ -1,12 +1,6 @@
 # Flatten
 This recursively flattens arrays.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Flatten
 Recursively flattens all arrays
 
@@ -18,7 +12,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'flatten' sample.yml
+yq eval 'flatten' sample.yml
 ```
 will output
 ```yaml
@@ -36,7 +30,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'flatten(1)' sample.yml
+yq eval 'flatten(1)' sample.yml
 ```
 will output
 ```yaml
@@ -52,7 +46,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'flatten' sample.yml
+yq eval 'flatten' sample.yml
 ```
 will output
 ```yaml
@@ -67,7 +61,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'flatten' sample.yml
+yq eval 'flatten' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/group-by.md

@@ -2,12 +2,6 @@
 
 This is used to group items in an array by an expression.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Group by field
 Given a sample.yml file of:
 ```yaml
@@ -20,7 +14,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'group_by(.foo)' sample.yml
+yq eval 'group_by(.foo)' sample.yml
 ```
 will output
 ```yaml
@@ -46,7 +40,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'group_by(.foo)' sample.yml
+yq eval 'group_by(.foo)' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/has.md

@@ -2,12 +2,6 @@
 
 This is operation that returns true if the key exists in a map (or index in an array), false otherwise.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Has map key
 Given a sample.yml file of:
 ```yaml
@@ -18,7 +12,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] | has("a")' sample.yml
+yq eval '.[] | has("a")' sample.yml
 ```
 will output
 ```yaml
@@ -42,7 +36,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] | select(.a.b | has("c"))' sample.yml
+yq eval '.[] | select(.a.b | has("c"))' sample.yml
 ```
 will output
 ```yaml
@@ -63,7 +57,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[] | has(1)' sample.yml
+yq eval '.[] | has(1)' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/headers/Main.md

@@ -5,7 +5,7 @@
 
 yq [eval/eval-all] [expression] files..
 
-eval/e  - (default) Apply the expression to each document in each yaml file in sequence
+eval/e  - Apply the expression to each document in each yaml file in sequence
 
 eval-all/ea - Loads all yaml documents of all yaml files and runs expression once
 
@@ -18,33 +18,32 @@ This documentation is also available at https://mikefarah.gitbook.io/yq/
 
 ## Read a value:
 ```bash
-yq '.a.b[0].c' file.yaml
+yq e '.a.b[0].c' file.yaml
 ```
 
 ## Pipe from STDIN:
 ```bash
-cat file.yaml | yq '.a.b[0].c'
+cat file.yaml | yq e '.a.b[0].c' -
 ```
 
 ## Update a yaml file, inplace
 ```bash
-yq -i '.a.b[0].c = "cool"' file.yaml
+yq e -i '.a.b[0].c = "cool"' file.yaml
 ```
 
 ## Update using environment variables
 ```bash
-NAME=mike yq -i '.a.b[0].c = strenv(NAME)' file.yaml
+NAME=mike yq e -i '.a.b[0].c = strenv(NAME)' file.yaml
 ```
 
 ## Merge multiple files
 ```
 yq ea '. as $item ireduce ({}; . * $item )' path/to/*.yml
 ```
-Note the use of `ea` to evaluate all files at once (instead of in sequence.)
 
 ## Multiple updates to a yaml file
 ```bash
-yq -i '
+yq e -i '
   .a.b[0].c = "cool" |
   .x.y.z = "foobar" |
   .person.name = strenv(NAME)

pkg/yqlib/doc/operators/headers/add.md

@@ -4,7 +4,5 @@ Add behaves differently according to the type of the LHS:
 * arrays: concatenate
 * number scalars: arithmetic addition
 * string scalars: concatenate
-* maps: shallow merge (use the multiply operator (`*`) to deeply merge)
-
-Use `+=` as a relative append assign for things like increment. Note that `.a += .x` is equivalent to running `.a = .a + .x`.
 
+Use `+=` as append assign for things like increment. Note that `.a += .x` is equivalent to running `.a = .a + .x`.

pkg/yqlib/doc/operators/headers/boolean-operators.md

@@ -9,9 +9,3 @@ The `or` and `and` operators take two parameters and return a boolean result.
 `any_c(condition)` and `all_c(condition)` are like `any` and `all` but they take a condition expression that is used against each element to determine if it's `true`. Note: in `jq` you can simply pass a condition to `any` or `all` and it simply works - `yq` isn't that clever..yet
 
 These are most commonly used with the `select` operator to filter particular nodes.
-
-## Related Operators
-
-- equals / not equals (`==`, `!=`) operators (here)[https://mikefarah.gitbook.io/yq/operators/equals]
-- comparison (`>=`, `<` etc) operators (here)[https://mikefarah.gitbook.io/yq/operators/compare]
-- select operator (here)[https://mikefarah.gitbook.io/yq/operators/select]

pkg/yqlib/doc/operators/headers/column.md

@@ -1,3 +0,0 @@
-# Column
-
-Returns the column of the matching node. Starts from 1, 0 indicates there was no column data.

pkg/yqlib/doc/operators/headers/compare.md

@@ -1,15 +0,0 @@
-# Compare Operators
-
-Comparison operators (`>`, `>=`, `<`, `<=`) can be used for comparing scalar values of the same time.
-
-The following types are currently supported:
-
-- numbers
-- strings
-- datetimes
-
-## Related Operators
-
-- equals / not equals (`==`, `!=`) operators (here)[https://mikefarah.gitbook.io/yq/operators/equals]
-- boolean operators (`and`, `or`, `any` etc) (here)[https://mikefarah.gitbook.io/yq/operators/boolean-operators]
-- select operator (here)[https://mikefarah.gitbook.io/yq/operators/select]

pkg/yqlib/doc/operators/headers/datetime.md

@@ -1,26 +0,0 @@
-# Date Time
-
-Various operators for parsing and manipulating dates. 
-
-## Date time formattings
-This uses the golangs built in time library for parsing and formatting date times.
-
-When not specified, the RFC3339 standard is assumed `2006-01-02T15:04:05Z07:00` for parsing.
-
-To specify a custom parsing format, use the `with_dtf` operator. The first parameter sets the datetime parsing format for the expression in the second parameter. The expression can be any valid `yq` expression tree.
-
-```bash
-yq 'with_dtf("myformat"; .a + "3h" | tz("Australia/Melbourne"))'
-```
-
-See https://pkg.go.dev/time#pkg-constants for examples of formatting options.
-
-
-## Timezones
-This uses golangs built in LoadLocation function to parse timezones strings. See https://pkg.go.dev/time#LoadLocation for more details.
-
-
-## Durations
-Durations are parsed using golangs built in [ParseDuration](https://pkg.go.dev/time#ParseDuration) function.
-
-You can durations to time using the `+` operator.

pkg/yqlib/doc/operators/headers/encode-decode.md

@@ -14,13 +14,8 @@ These operators are useful to process yaml documents that have stringified embed
 | Properties |  | to_props/@props |
 | CSV |  | to_csv/@csv |
 | TSV |  | to_tsv/@tsv |
-| XML | from_xml | to_xml(i)/@xml |
-| Base64 | @base64d | @base64 |
+| XML | from_xml |  |
 
 
 CSV and TSV format both accept either a single array or scalars (representing a single row), or an array of array of scalars (representing multiple rows). 
 
-XML uses the `--xml-attribute-prefix` and `xml-content-name` flags to identify attributes and content fields.
-
-
-Base64 assumes [rfc4648](https://rfc-editor.org/rfc/rfc4648.html) encoding. Encoding and decoding both assume that the content is a string.

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

@@ -1,31 +1,3 @@
 # Env Variable Operators
 
-These operators are used to handle environment variables usage in expressions and documents. While environment variables can, of course, be passed in via your CLI with string interpolation, this often comes with complex quote escaping and can be tricky to write and read. 
-
-There are three operators:
-
--  `env` which takes a single environment variable name and parse the variable as a yaml node (be it a map, array, string, number of boolean) 
-- `strenv` which also takes a single environment variable name, and always parses the variable as a string.
-- `envsubst` which you pipe strings into and it interpolates environment variables in strings using [envsubst](https://github.com/a8m/envsubst). 
-
-
-## EnvSubst Options
-You can optionally pass envsubst any of the following options:
-
-  - nu: NoUnset, this will fail if there are any referenced variables that are not set
-  - ne: NoEmpty, this will fail if there are any referenced variables that are empty
-  - ff: FailFast, this will abort on the first failure (rather than collect all the errors)
-
-E.g:
-`envsubst(ne, ff)` will fail on the first empty variable.
-
-See [Imposing Restrictions](https://github.com/a8m/envsubst#imposing-restrictions) in the `envsubst` documentation for more information, and below for examples.
-
-## Tip
-To replace environment variables across all values in a document, `envsubst` can be used with the recursive descent operator
-as follows:
-
-```bash
-yq '(.. | select(tag == "!!str")) |= envsubst' file.yaml
-```
-
+This operator is used to handle environment variables usage in path expressions. While environment variables can, of course, be passed in via your CLI with string interpolation, this often comes with complex quote escaping and can be tricky to write and read. Note that there are two forms, `env` which will parse the environment variable as a yaml (be it a map, array, string, number of boolean) and `strenv` which will always parse the argument as a string.

pkg/yqlib/doc/operators/headers/equals.md

@@ -1,4 +1,4 @@
-# Equals / Not Equals
+# Equals
 
 This is a boolean operator that will return `true` if the LHS is equal to the RHS and `false` otherwise.
 
@@ -11,12 +11,3 @@ It is most often used with the select operator to find particular nodes:
 ```
 select(.a == .b)
 ```
-
-The not equals `!=` operator returns `false` if the LHS is equal to the RHS.
-
-## Related Operators
-
-- comparison (`>=`, `<` etc) operators (here)[https://mikefarah.gitbook.io/yq/operators/compare]
-- boolean operators (`and`, `or`, `any` etc) (here)[https://mikefarah.gitbook.io/yq/operators/boolean-operators]
-- select operator (here)[https://mikefarah.gitbook.io/yq/operators/select]
-

pkg/yqlib/doc/operators/headers/eval.md

@@ -1,7 +0,0 @@
-# Eval
-
-Use `eval` to dynamically process an expression - for instance from an environment variable.
-
-`eval` takes a single argument, and evaluates that as a `yq` expression. Any valid expression can be used, beit a path `.a.b.c | select(. == "cat")`, or an update `.a.b.c = "gogo"`.
-
-Tip: This can be useful way parameterise complex scripts.

pkg/yqlib/doc/operators/headers/line.md

@@ -1,3 +0,0 @@
-# Line
-
-Returns the line of the matching node. Starts from 1, 0 indicates there was no line data.

pkg/yqlib/doc/operators/headers/load.md

@@ -1,46 +1,14 @@
 # Load
 
-The load operators allows you to load in content from another file.
+The `load`/`strload` operator allows you to load in content from another file referenced in your yaml document.
 
 Note that you can use string operators like `+` and `sub` to modify the value in the yaml file to a path that exists in your system.
 
-You can load files of the following supported types:
+Use `strload` to load text based content as a string block, and `load` to interpret the file as yaml.
 
-|Format | Load Operator |
-| --- | --- |
-| Yaml | load |
-| XML | load_xml |
-| Properties | load_props |
-| Plain String | load_str |
-| Base64 | load_base64 |
-
-## Samples files for tests:
-
-### yaml
-
-`../../examples/thing.yml`:
+Lets say there is a file `../../examples/thing.yml`:
 
 ```yaml
 a: apple is included
 b: cool
 ```
-
-### xml
-`small.xml`:
-
-```xml
-<this>is some xml</this>
-```
-
-### properties
-`small.properties`:
-
-```properties
-this.is = a properties file
-```
-
-### base64
-`base64.txt`:
-```
-bXkgc2VjcmV0IGNoaWxsaSByZWNpcGUgaXMuLi4u
-```

pkg/yqlib/doc/operators/headers/multiply-merge.md

@@ -10,21 +10,13 @@ Note that when merging objects, this operator returns the merged object (not the
 ### Merge Flags
 You can control how objects are merged by using one or more of the following flags. Multiple flags can be used together, e.g. `.a *+? .b`.  See examples below
 
-- `+` append arrays
-- `d` deeply merge arrays
-- `?` only merge _existing_ fields
-- `n` only merge _new_ fields
+- `+` to append arrays
+- `?` to only merge existing fields
+- `d` to deeply merge arrays
 
-
-### Merge two files together
-This uses the load operator to merge file2 into file1.
-```bash
-yq '. *= load("file2.yml")' file1.yml
-```
-
-### Merging all files
+### Merging files
 Note the use of `eval-all` to ensure all documents are loaded into memory.
 
 ```bash
-yq eval-all '. as $item ireduce ({}; . * $item )' *.yml
+yq eval-all 'select(fileIndex == 0) * select(fileIndex == 1)' file1.yaml file2.yaml
 ```

pkg/yqlib/doc/operators/headers/pick.md

@@ -1,5 +0,0 @@
-# Pick
-
-Filter a map by the specified list of keys. Map is returned with the key in the order of the pick list.
-
-Similarly, filter an array by the specified list of indices.

pkg/yqlib/doc/operators/headers/recursive-descent-glob.md

@@ -8,7 +8,7 @@ This will, like the `jq` equivalent, recursively match all _value_ nodes. Use it
 For instance to set the `style` of all _value_ nodes in a yaml doc, excluding map keys:
 
 ```bash
-yq '.. style= "flow"' file.yaml
+yq eval '.. style= "flow"' file.yaml
 ```
 
 ## match values and map keys form `...`
@@ -17,5 +17,5 @@ The also includes map keys in the results set. This is particularly useful in YA
 For instance to set the `style` of all nodes in a yaml doc, including the map keys:
 
 ```bash
-yq '... style= "flow"' file.yaml
+yq eval '... style= "flow"' file.yaml
 ```

pkg/yqlib/doc/operators/headers/reverse.md

@@ -1,3 +0,0 @@
-# Reverse
-
-Reverses the order of the items in an array 

pkg/yqlib/doc/operators/headers/select.md

@@ -1,9 +1,3 @@
 # Select
 
 Select is used to filter arrays and maps by a boolean expression.
-
-## Related Operators
-
-- equals / not equals (`==`, `!=`) operators (here)[https://mikefarah.gitbook.io/yq/operators/equals]
-- comparison (`>=`, `<` etc) operators (here)[https://mikefarah.gitbook.io/yq/operators/compare]
-- boolean operators (`and`, `or`, `any` etc) (here)[https://mikefarah.gitbook.io/yq/operators/boolean-operators]

pkg/yqlib/doc/operators/headers/sort-keys.md

@@ -5,9 +5,7 @@ The Sort Keys operator sorts maps by their keys (based on their string value). T
 Sort is particularly useful for diffing two different yaml documents:
 
 ```bash
-yq -i -P 'sort_keys(..)' file1.yml
-yq -i -P 'sort_keys(..)' file2.yml
+yq eval -i -P 'sort_keys(..)' file1.yml
+yq eval -i -P 'sort_keys(..)' file2.yml
 diff file1.yml file2.yml
 ```
-
-Note that `yq` does not yet consider anchors when sorting by keys - this may result in invalid yaml documents if your are using merge anchors.

pkg/yqlib/doc/operators/headers/sort.md

@@ -2,7 +2,4 @@
 
 Sorts an array. Use `sort` to sort an array as is, or `sort_by(exp)` to sort by a particular expression (e.g. subfield).
 
-To sort by descending order, pipe the results through the `reverse` operator after sorting.
-
 Note that at this stage, `yq` only sorts scalar fields.
-

pkg/yqlib/doc/operators/headers/string-operators.md

@@ -3,17 +3,6 @@
 ## RegEx
 This uses golangs native regex functions under the hood - See https://github.com/google/re2/wiki/Syntax for the supported syntax.
 
-### match(regEx)
-This operator returns the substring match details of the given regEx.
-
-### capture(regEx)
-Capture returns named RegEx capture groups in a map. Can be more convenient than `match` depending on what you are doing.
-
-# test(regEx)
-Returns true if the string matches the RegEx, false otherwise.
-
-## sub(regEx, replacement)
-Substitutes matched substrings. The first parameter is the regEx to match substrings within the original string. The second is a what to replace those matches with. This can refer to capture groups from the first RegEx.
 
 ## String blocks, bash and newlines
 Bash is notorious for chomping on precious trailing newline characters, making it tricky to set strings with newlines properly. In particular, the `$( exp )` _will trim trailing newlines_.
@@ -28,13 +17,13 @@ a: |
 Using `$( exp )` wont work, as it will trim the trailing new line.
 
 ```
-m=$(echo "cat\n") yq -n '.a = strenv(m)'
+m=$(echo "cat\n") yq e -n '.a = strenv(m)'
 a: cat
 ```
 
 However, using printf works:
 ```
-printf -v m "cat\n" ; m="$m" yq -n '.a = strenv(m)'
+printf -v m "cat\n" ; m="$m" yq e -n '.a = strenv(m)'
 a: |
   cat
 ```
@@ -42,7 +31,7 @@ a: |
 As well as having multiline expressions:
 ```
 m="cat
-"  yq -n '.a = strenv(m)'
+"  yq e -n '.a = strenv(m)'
 a: |
   cat
 ```
@@ -51,5 +40,5 @@ Similarly, if you're trying to set the content from a file, and want a trailing
 
 ```
 IFS= read -rd '' output < <(cat my_file)
-output=$output ./yq '.data.values = strenv(output)' first.yml
+output=$output ./yq e '.data.values = strenv(output)' first.yml
 ```

pkg/yqlib/doc/operators/keys.md

@@ -2,12 +2,6 @@
 
 Use the `keys` operator to return map keys or array indices. 
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Map keys
 Given a sample.yml file of:
 ```yaml
@@ -16,7 +10,7 @@ cat: meow
 ```
 then
 ```bash
-yq 'keys' sample.yml
+yq eval 'keys' sample.yml
 ```
 will output
 ```yaml
@@ -32,7 +26,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'keys' sample.yml
+yq eval 'keys' sample.yml
 ```
 will output
 ```yaml
@@ -49,7 +43,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq '.[1] | key' sample.yml
+yq eval '.[1] | key' sample.yml
 ```
 will output
 ```yaml
@@ -63,7 +57,7 @@ a: thing
 ```
 then
 ```bash
-yq '.a | key' sample.yml
+yq eval '.a | key' sample.yml
 ```
 will output
 ```yaml
@@ -77,7 +71,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'key' sample.yml
+yq eval 'key' sample.yml
 ```
 will output
 ```yaml
@@ -92,7 +86,7 @@ a:
 ```
 then
 ```bash
-yq '(.a.x | key) = "meow"' sample.yml
+yq eval '(.a.x | key) = "meow"' sample.yml
 ```
 will output
 ```yaml
@@ -111,7 +105,7 @@ a:
 ```
 then
 ```bash
-yq '.a.x | key | headComment' sample.yml
+yq eval '.a.x | key | headComment' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/length.md

@@ -2,12 +2,6 @@
 
 Returns the lengths of the nodes. Length is defined according to the type of the node.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## String length
 returns length of string
 
@@ -17,7 +11,7 @@ a: cat
 ```
 then
 ```bash
-yq '.a | length' sample.yml
+yq eval '.a | length' sample.yml
 ```
 will output
 ```yaml
@@ -31,7 +25,7 @@ a: null
 ```
 then
 ```bash
-yq '.a | length' sample.yml
+yq eval '.a | length' sample.yml
 ```
 will output
 ```yaml
@@ -48,7 +42,7 @@ c: dog
 ```
 then
 ```bash
-yq 'length' sample.yml
+yq eval 'length' sample.yml
 ```
 will output
 ```yaml
@@ -67,7 +61,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'length' sample.yml
+yq eval 'length' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/line.md

@@ -1,68 +0,0 @@
-# Line
-
-Returns the line of the matching node. Starts from 1, 0 indicates there was no line data.
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
-## Returns line of _value_ node
-Given a sample.yml file of:
-```yaml
-a: cat
-b:
-  c: cat
-```
-then
-```bash
-yq '.b | line' sample.yml
-```
-will output
-```yaml
-3
-```
-
-## Returns line of _key_ node
-Pipe through the key operator to get the line of the key
-
-Given a sample.yml file of:
-```yaml
-a: cat
-b:
-  c: cat
-```
-then
-```bash
-yq '.b | key| line' sample.yml
-```
-will output
-```yaml
-2
-```
-
-## First line is 1
-Given a sample.yml file of:
-```yaml
-a: cat
-```
-then
-```bash
-yq '.a | line' sample.yml
-```
-will output
-```yaml
-1
-```
-
-## No line data is 0
-Running
-```bash
-yq --null-input '{"a": "new entry"} | line'
-```
-will output
-```yaml
-0
-```
-

pkg/yqlib/doc/operators/load.md

@@ -1,56 +1,18 @@
 # Load
 
-The load operators allows you to load in content from another file.
+The `load`/`strload` operator allows you to load in content from another file referenced in your yaml document.
 
 Note that you can use string operators like `+` and `sub` to modify the value in the yaml file to a path that exists in your system.
 
-You can load files of the following supported types:
+Use `strload` to load text based content as a string block, and `load` to interpret the file as yaml.
 
-|Format | Load Operator |
-| --- | --- |
-| Yaml | load |
-| XML | load_xml |
-| Properties | load_props |
-| Plain String | load_str |
-| Base64 | load_base64 |
-
-## Samples files for tests:
-
-### yaml
-
-`../../examples/thing.yml`:
+Lets say there is a file `../../examples/thing.yml`:
 
 ```yaml
 a: apple is included
 b: cool
 ```
 
-### xml
-`small.xml`:
-
-```xml
-<this>is some xml</this>
-```
-
-### properties
-`small.properties`:
-
-```properties
-this.is = a properties file
-```
-
-### base64
-`base64.txt`:
-```
-bXkgc2VjcmV0IGNoaWxsaSByZWNpcGUgaXMuLi4u
-```
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified.&#x20;
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Simple example
 Given a sample.yml file of:
 ```yaml
@@ -58,7 +20,7 @@ myFile: ../../examples/thing.yml
 ```
 then
 ```bash
-yq 'load(.myFile)' sample.yml
+yq eval 'load(.myFile)' sample.yml
 ```
 will output
 ```yaml
@@ -76,7 +38,7 @@ something:
 ```
 then
 ```bash
-yq '.something |= load("../../examples/" + .file)' sample.yml
+yq eval '.something |= load("../../examples/" + .file)' sample.yml
 ```
 will output
 ```yaml
@@ -98,7 +60,7 @@ over:
 ```
 then
 ```bash
-yq '(.. | select(has("file"))) |= load("../../examples/" + .file)' sample.yml
+yq eval '(.. | select(has("file"))) |= load("../../examples/" + .file)' sample.yml
 ```
 will output
 ```yaml
@@ -121,7 +83,7 @@ something:
 ```
 then
 ```bash
-yq '.something |= load_str("../../examples/" + .file)' sample.yml
+yq eval '.something |= strload("../../examples/" + .file)' sample.yml
 ```
 will output
 ```yaml
@@ -130,71 +92,3 @@ something: |-
   b: cool.
 ```
 
-## Load from XML
-Given a sample.yml file of:
-```yaml
-cool: things
-```
-then
-```bash
-yq '.more_stuff = load_xml("../../examples/small.xml")' sample.yml
-```
-will output
-```yaml
-cool: things
-more_stuff:
-  this: is some xml
-```
-
-## Load from Properties
-Given a sample.yml file of:
-```yaml
-cool: things
-```
-then
-```bash
-yq '.more_stuff = load_props("../../examples/small.properties")' sample.yml
-```
-will output
-```yaml
-cool: things
-more_stuff:
-  this:
-    is: a properties file
-```
-
-## Merge from properties
-This can be used as a convenient way to update a yaml document
-
-Given a sample.yml file of:
-```yaml
-this:
-  is: from yaml
-  cool: ay
-```
-then
-```bash
-yq '. *= load_props("../../examples/small.properties")' sample.yml
-```
-will output
-```yaml
-this:
-  is: a properties file
-  cool: ay
-```
-
-## Load from base64 encoded file
-Given a sample.yml file of:
-```yaml
-cool: things
-```
-then
-```bash
-yq '.more_stuff = load_base64("../../examples/base64.txt")' sample.yml
-```
-will output
-```yaml
-cool: things
-more_stuff: my secret chilli recipe is....
-```
-

pkg/yqlib/doc/operators/map.md

@@ -2,12 +2,6 @@
 
 Maps values of an array. Use `map_values` to map values of an object.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Map array
 Given a sample.yml file of:
 ```yaml
@@ -17,7 +11,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'map(. + 1)' sample.yml
+yq eval 'map(. + 1)' sample.yml
 ```
 will output
 ```yaml
@@ -35,7 +29,7 @@ c: 3
 ```
 then
 ```bash
-yq 'map_values(. + 1)' sample.yml
+yq eval 'map_values(. + 1)' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/multiply-merge.md

@@ -10,45 +10,25 @@ Note that when merging objects, this operator returns the merged object (not the
 ### Merge Flags
 You can control how objects are merged by using one or more of the following flags. Multiple flags can be used together, e.g. `.a *+? .b`.  See examples below
 
-- `+` append arrays
-- `d` deeply merge arrays
-- `?` only merge _existing_ fields
-- `n` only merge _new_ fields
+- `+` to append arrays
+- `?` to only merge existing fields
+- `d` to deeply merge arrays
 
-
-### Merge two files together
-This uses the load operator to merge file2 into file1.
-```bash
-yq '. *= load("file2.yml")' file1.yml
-```
-
-### Merging all files
+### Merging files
 Note the use of `eval-all` to ensure all documents are loaded into memory.
 
 ```bash
-yq eval-all '. as $item ireduce ({}; . * $item )' *.yml
+yq eval-all 'select(fileIndex == 0) * select(fileIndex == 1)' file1.yaml file2.yaml
 ```
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Multiply integers
-Given a sample.yml file of:
-```yaml
-a: 3
-b: 4
-```
-then
+Running
 ```bash
-yq '.a *= .b' sample.yml
+yq eval --null-input '3 * 4'
 ```
 will output
 ```yaml
-a: 12
-b: 4
+12
 ```
 
 ## Merge objects together, returning merged result only
@@ -64,7 +44,7 @@ b:
 ```
 then
 ```bash
-yq '.a * .b' sample.yml
+yq eval '.a * .b' sample.yml
 ```
 will output
 ```yaml
@@ -87,7 +67,7 @@ b:
 ```
 then
 ```bash
-yq '. * {"a":.b}' sample.yml
+yq eval '. * {"a":.b}' sample.yml
 ```
 will output
 ```yaml
@@ -111,7 +91,7 @@ b:
 ```
 then
 ```bash
-yq '. * {"a":.b}' sample.yml
+yq eval '. * {"a":.b}' sample.yml
 ```
 will output
 ```yaml
@@ -134,7 +114,7 @@ b:
 ```
 then
 ```bash
-yq '. * {"a":.b}' sample.yml
+yq eval '. * {"a":.b}' sample.yml
 ```
 will output
 ```yaml
@@ -160,7 +140,7 @@ b:
 ```
 then
 ```bash
-yq '.a *? .b' sample.yml
+yq eval '.a *? .b' sample.yml
 ```
 will output
 ```yaml
@@ -168,27 +148,6 @@ thing: two
 cat: frog
 ```
 
-## Merge, only new fields
-Given a sample.yml file of:
-```yaml
-a:
-  thing: one
-  cat: frog
-b:
-  missing: two
-  thing: two
-```
-then
-```bash
-yq '.a *n .b' sample.yml
-```
-will output
-```yaml
-thing: one
-cat: frog
-missing: two
-```
-
 ## Merge, appending arrays
 Given a sample.yml file of:
 ```yaml
@@ -207,7 +166,7 @@ b:
 ```
 then
 ```bash
-yq '.a *+ .b' sample.yml
+yq eval '.a *+ .b' sample.yml
 ```
 will output
 ```yaml
@@ -237,7 +196,7 @@ b:
 ```
 then
 ```bash
-yq '.a *?+ .b' sample.yml
+yq eval '.a *?+ .b' sample.yml
 ```
 will output
 ```yaml
@@ -264,7 +223,7 @@ b:
 ```
 then
 ```bash
-yq '.a *d .b' sample.yml
+yq eval '.a *d .b' sample.yml
 ```
 will output
 ```yaml
@@ -275,23 +234,18 @@ will output
 ```
 
 ## Merge arrays of objects together, matching on a key
-
-This is a fairly complex expression - you can use it as is by providing the environment variables as seen in the example below.
-
-It merges in the array provided in the second file into the first - matching on equal keys.
-
-Explanation:
-
 The approach, at a high level, is to reduce into a merged map (keyed by the unique key)
 and then convert that back into an array.
 
-First the expression will create a map from the arrays keyed by the idPath, the unique field we want to merge by.
+First the expression will create a map from the arrays keyed by '.a', the unique field we want to merge by.
 The reduce operator is merging '({}; . * $item )', so array elements with the matching key will be merged together.
 
 Next, we convert the map back to an array, using reduce again, concatenating all the map values together.
 
 Finally, we set the result of the merged array back into the first doc.
 
+To use this, you will need to update '.myArray' in the expression to your array (e.g. .my.array), and '.a' to be the key field of your array (e.g. '.name')
+
 Thanks Kev from [stackoverflow](https://stackoverflow.com/a/70109529/1168223)
 
 
@@ -308,7 +262,7 @@ something: else
 ```
 And another sample another.yml file of:
 ```yaml
-newArray:
+myArray:
   - a: banana
     c: bananaC
   - a: apple
@@ -318,12 +272,12 @@ newArray:
 ```
 then
 ```bash
-idPath=".a"  originalPath=".myArray"  otherPath=".newArray" yq eval-all '
+yq eval-all '
 (
-  (( (eval(strenv(originalPath)) + eval(strenv(otherPath)))  | .[] | {(eval(strenv(idPath))):  .}) as $item ireduce ({}; . * $item )) as $uniqueMap
+  ((.myArray[] | {.a: .}) as $item ireduce ({}; . * $item )) as $uniqueMap
   | ( $uniqueMap  | to_entries | .[]) as $item ireduce([]; . + $item.value)
 ) as $mergedArray
-| select(fi == 0) | (eval(strenv(originalPath))) = $mergedArray
+| select(fi == 0) | .myArray = $mergedArray
 ' sample.yml another.yml
 ```
 will output
@@ -349,7 +303,7 @@ b: dog
 ```
 then
 ```bash
-yq '. * {"a": {"c": .a}}' sample.yml
+yq eval '. * {"a": {"c": .a}}' sample.yml
 ```
 will output
 ```yaml
@@ -370,7 +324,7 @@ c:
 ```
 then
 ```bash
-yq '.c * .b' sample.yml
+yq eval '.c * .b' sample.yml
 ```
 will output
 ```yaml
@@ -390,7 +344,7 @@ c:
 ```
 then
 ```bash
-yq '.c * .a' sample.yml
+yq eval '.c * .a' sample.yml
 ```
 will output
 ```yaml
@@ -422,7 +376,7 @@ foobar:
 ```
 then
 ```bash
-yq '.foobar * .foobarList' sample.yml
+yq eval '.foobar * .foobarList' sample.yml
 ```
 will output
 ```yaml
@@ -434,44 +388,3 @@ thing: foobar_thing
 b: foobarList_b
 ```
 
-## Custom types: that are really numbers
-When custom tags are encountered, yq will try to decode the underlying type.
-
-Given a sample.yml file of:
-```yaml
-a: !horse 2
-b: !goat 3
-```
-then
-```bash
-yq '.a = .a * .b' sample.yml
-```
-will output
-```yaml
-a: !horse 6
-b: !goat 3
-```
-
-## Custom types: that are really maps
-Custom tags will be maintained.
-
-Given a sample.yml file of:
-```yaml
-a: !horse
-  cat: meow
-b: !goat
-  dog: woof
-```
-then
-```bash
-yq '.a = .a * .b' sample.yml
-```
-will output
-```yaml
-a: !horse
-  cat: meow
-  dog: woof
-b: !goat
-  dog: woof
-```
-

pkg/yqlib/doc/operators/parent.md

@@ -2,12 +2,6 @@
 
 Parent simply returns the parent nodes of the matching nodes.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Simple example
 Given a sample.yml file of:
 ```yaml
@@ -16,7 +10,7 @@ a:
 ```
 then
 ```bash
-yq '.a.nested | parent' sample.yml
+yq eval '.a.nested | parent' sample.yml
 ```
 will output
 ```yaml
@@ -35,7 +29,7 @@ b:
 ```
 then
 ```bash
-yq '.. | select(. == "banana") | parent' sample.yml
+yq eval '.. | select(. == "banana") | parent' sample.yml
 ```
 will output
 ```yaml
@@ -50,7 +44,7 @@ Given a sample.yml file of:
 ```
 then
 ```bash
-yq 'parent' sample.yml
+yq eval 'parent' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/path.md

@@ -4,12 +4,6 @@ The path operator can be used to get the traversal paths of matching nodes in an
 
 You can get the key/index of matching nodes by using the `path` operator to return the path array then piping that through `.[-1]` to get the last element of that array, the key.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Map path
 Given a sample.yml file of:
 ```yaml
@@ -18,7 +12,7 @@ a:
 ```
 then
 ```bash
-yq '.a.b | path' sample.yml
+yq eval '.a.b | path' sample.yml
 ```
 will output
 ```yaml
@@ -34,7 +28,7 @@ a:
 ```
 then
 ```bash
-yq '.a.b | path | .[-1]' sample.yml
+yq eval '.a.b | path | .[-1]' sample.yml
 ```
 will output
 ```yaml
@@ -50,7 +44,7 @@ a:
 ```
 then
 ```bash
-yq '.a.[] | select(. == "dog") | path' sample.yml
+yq eval '.a.[] | select(. == "dog") | path' sample.yml
 ```
 will output
 ```yaml
@@ -67,7 +61,7 @@ a:
 ```
 then
 ```bash
-yq '.a.[] | select(. == "dog") | path | .[-1]' sample.yml
+yq eval '.a.[] | select(. == "dog") | path | .[-1]' sample.yml
 ```
 will output
 ```yaml
@@ -84,7 +78,7 @@ a:
 ```
 then
 ```bash
-yq '.a[] | select(. == "*og") | [{"path":path, "value":.}]' sample.yml
+yq eval '.a[] | select(. == "*og") | [{"path":path, "value":.}]' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/pick.md

@@ -1,53 +0,0 @@
-# Pick
-
-Filter a map by the specified list of keys. Map is returned with the key in the order of the pick list.
-
-Similarly, filter an array by the specified list of indices.
-
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
-## Pick keys from map
-Note that the order of the keys matches the pick order and non existent keys are skipped.
-
-Given a sample.yml file of:
-```yaml
-myMap:
-  cat: meow
-  dog: bark
-  thing: hamster
-  hamster: squeek
-```
-then
-```bash
-yq '.myMap |= pick(["hamster", "cat", "goat"])' sample.yml
-```
-will output
-```yaml
-myMap:
-  hamster: squeek
-  cat: meow
-```
-
-## Pick indices from array
-Note that the order of the indexes matches the pick order and non existent indexes are skipped.
-
-Given a sample.yml file of:
-```yaml
-- cat
-- leopard
-- lion
-```
-then
-```bash
-yq 'pick([2, 0, 734, -5])' sample.yml
-```
-will output
-```yaml
-- lion
-- cat
-```
-

pkg/yqlib/doc/operators/pipe.md

@@ -2,12 +2,6 @@
 
 Pipe the results of an expression into another. Like the bash operator.
 
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Simple Pipe
 Given a sample.yml file of:
 ```yaml
@@ -16,7 +10,7 @@ a:
 ```
 then
 ```bash
-yq '.a | .b' sample.yml
+yq eval '.a | .b' sample.yml
 ```
 will output
 ```yaml
@@ -32,7 +26,7 @@ c: same
 ```
 then
 ```bash
-yq '.a = "cat" | .b = "dog"' sample.yml
+yq eval '.a = "cat" | .b = "dog"' sample.yml
 ```
 will output
 ```yaml

pkg/yqlib/doc/operators/recursive-descent-glob.md

@@ -8,7 +8,7 @@ This will, like the `jq` equivalent, recursively match all _value_ nodes. Use it
 For instance to set the `style` of all _value_ nodes in a yaml doc, excluding map keys:
 
 ```bash
-yq '.. style= "flow"' file.yaml
+yq eval '.. style= "flow"' file.yaml
 ```
 
 ## match values and map keys form `...`
@@ -17,14 +17,8 @@ The also includes map keys in the results set. This is particularly useful in YA
 For instance to set the `style` of all nodes in a yaml doc, including the map keys:
 
 ```bash
-yq '... style= "flow"' file.yaml
+yq eval '... style= "flow"' file.yaml
 ```
-{% hint style="warning" %}
-Note that versions prior to 4.18 require the 'eval/e' command to be specified. 
-
-`yq e <exp> <file>`
-{% endhint %}
-
 ## Recurse map (values only)
 Given a sample.yml file of:
 ```yaml
@@ -32,7 +26,7 @@ a: frog
 ```
 then
 ```bash
-yq '..' sample.yml
+yq eval '..' sample.yml
 ```
 will output
 ```yaml
@@ -53,7 +47,7 @@ a:
 ```
 then
 ```bash
-yq '[.. | select(has("name"))]' sample.yml
+yq eval '[.. | select(has("name"))]' sample.yml
 ```
 will output
 ```yaml
@@ -76,7 +70,7 @@ a:
 ```
 then
 ```bash
-yq '.. | select(. == "frog")' sample.yml
+yq eval '.. | select(. == "frog")' sample.yml
 ```
 will output
 ```yaml
@@ -93,7 +87,7 @@ a: frog
 ```
 then
 ```bash
-yq '...' sample.yml
+yq eval '...' sample.yml
 ```
 will output
 ```yaml
@@ -111,7 +105,7 @@ b: *cat
 ```
 then
 ```bash
-yq '[..]' sample.yml
+yq eval '[..]' sample.yml
 ```
 will output
 ```yaml
@@ -148,7 +142,7 @@ foobar:
 ```
 then
 ```bash
-yq '.foobar | [..]' sample.yml
+yq eval '.foobar | [..]' sample.yml
 ```
 will output
 ```yaml