diff --git a/cmd/version.go b/cmd/version.go index c200d248db5..80754748325 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -11,7 +11,7 @@ var ( GitDescribe string // Version is main version number that is being run at the moment. - Version = "4.21.1" + Version = "4.22.1" // 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 diff --git a/pkg/yqlib/doc/operators/headers/pick.md b/pkg/yqlib/doc/operators/headers/pick.md index f5a0d6028be..153675ee7f7 100644 --- a/pkg/yqlib/doc/operators/headers/pick.md +++ b/pkg/yqlib/doc/operators/headers/pick.md @@ -2,4 +2,4 @@ Filter a map by the specified list of keys. Map is returned with the key in the order of the pick list. -Similarly, you can filter a map by the specified list of indices. +Similarly, filter an array by the specified list of indices. diff --git a/pkg/yqlib/doc/operators/pick.md b/pkg/yqlib/doc/operators/pick.md index fd87a34be52..b93bf04f27d 100644 --- a/pkg/yqlib/doc/operators/pick.md +++ b/pkg/yqlib/doc/operators/pick.md @@ -2,7 +2,7 @@ Filter a map by the specified list of keys. Map is returned with the key in the order of the pick list. -Similarly, you can filter a map by the specified list of indices. +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. diff --git a/pkg/yqlib/doc/usage/base64.md b/pkg/yqlib/doc/usage/base64.md deleted file mode 100644 index 7da21101ea6..00000000000 --- a/pkg/yqlib/doc/usage/base64.md +++ /dev/null @@ -1,23 +0,0 @@ - -{% hint style="warning" %} -Note that versions prior to 4.18 require the 'eval/e' command to be specified. - -`yq e ` -{% endhint %} - -## Decode Base64 -Decoded data is assumed to be a string. - -Given a sample.yml file of: -```yml -V29ya3Mgd2l0aCBVVEYtMTYg8J+Yig== -``` -then -```bash -yq -p=props sample.properties -``` -will output -```yaml -V29ya3Mgd2l0aCBVVEYtMTYg8J+Yig: = -``` - diff --git a/release_notes.txt b/release_notes.txt index 87c2119dd27..8574847a1a0 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,8 @@ +4.22.1: + - Added [pick] (https://mikefarah.gitbook.io/yq/operators/pick) operator + - Can load expression from a file '--from-file' (#1120) + - Fixed property auto expansion (#1127) + 4.21.1: - Added [reverse](https://mikefarah.gitbook.io/yq/operators/reverse) operator - Added [string case](https://mikefarah.gitbook.io/yq/operators/string-operators) operators diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 412fe584bae..bcb09ab188a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: yq -version: '4.21.1' +version: '4.22.1' summary: A lightweight and portable command-line YAML processor description: | The aim of the project is to be the jq or sed of yaml files.