From 72245db80aebc5d7bb66fb4363e9d4dd4f9bd58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sat, 12 Jun 2021 23:54:12 +0200 Subject: [PATCH] Fix "OUTPUT_DECRYPTED_FILE_PATH: parameter not set" (#123) --- CHANGELOG.md | 10 ++++++++-- README.md | 6 +++--- scripts/run.sh | 15 ++++++++++++++- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7cfb902..5c9e9694 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Allow override sops version on installation -## [3.8.0] - 2021-05-22 +## [3.8.1] - 2021-06-12 + +### Fixed +- OUTPUT_DECRYPTED_FILE_PATH: parameter not set + +## [3.8.0] - 2021-06-12 ### Added - New parameter `--output-decrypt-file-path` (`HELM_SECRETS_OUTPUT_DECRYPTED_FILE_PATH`) that outputs the path of decrypted files only. @@ -143,7 +148,8 @@ Started a fork of https://github.com/zendesk/helm-secrets - Support all helm sub commands and plugins -[Unreleased]: https://github.com/jkroepke/helm-secrets/compare/v3.8.0...HEAD +[Unreleased]: https://github.com/jkroepke/helm-secrets/compare/v3.8.1...HEAD +[3.8.1]: https://github.com/jkroepke/helm-secrets/compare/v3.8.1...v3.8.1 [3.8.0]: https://github.com/jkroepke/helm-secrets/compare/v3.7.0...v3.8.0 [3.7.0]: https://github.com/jkroepke/helm-secrets/compare/v3.6.1...v3.7.0 [3.6.1]: https://github.com/jkroepke/helm-secrets/compare/v3.6.0...v3.6.1 diff --git a/README.md b/README.md index 0ae1b93d..0a800fe6 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ By default, helm plugin install does this for you. Install a specific version (recommend) ```bash -helm plugin install https://github.com/jkroepke/helm-secrets --version v3.8.0 +helm plugin install https://github.com/jkroepke/helm-secrets --version v3.8.1 ``` Install latest unstable version from main branch @@ -114,11 +114,11 @@ curl -LsSf https://github.com/jkroepke/helm-secrets/releases/latest/download/hel Windows (inside cmd, needs to be verified) ```bash -curl -LsSf https://github.com/jkroepke/helm-secrets/releases/download/v3.8.0/helm-secrets.tar.gz | tar -C "%APPDATA%\helm\plugins" -xzf- +curl -LsSf https://github.com/jkroepke/helm-secrets/releases/download/v3.8.1/helm-secrets.tar.gz | tar -C "%APPDATA%\helm\plugins" -xzf- ``` MacOS / Linux ```bash -curl -LsSf https://github.com/jkroepke/helm-secrets/releases/download/v3.8.0/helm-secrets.tar.gz | tar -C "$(helm env HELM_PLUGINS)" -xzf- +curl -LsSf https://github.com/jkroepke/helm-secrets/releases/download/v3.8.1/helm-secrets.tar.gz | tar -C "$(helm env HELM_PLUGINS)" -xzf- ``` ### Installation on Helm 2 diff --git a/scripts/run.sh b/scripts/run.sh index 2cebc804..f0aaa42c 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -33,8 +33,10 @@ TMPDIR="${HELM_SECRETS_DEC_TMP_DIR:-"$(mktemp -d)"}" export TMPDIR mkdir -p "${TMPDIR}" +OUTPUT_DECRYPTED_FILE_PATH="${HELM_SECRETS_OUTPUT_DECRYPTED_FILE_PATH:-false}" + # Output debug infos -QUIET="${HELM_SECRETS_QUIET:-false}" +QUIET="${HELM_SECRETS_QUIET:-"${OUTPUT_DECRYPTED_FILE_PATH}"}" # Define the secret driver engine SECRET_DRIVER="${HELM_SECRETS_DRIVER:-sops}" @@ -133,10 +135,21 @@ while true; do help_usage break ;; + --version | -v | version) + # shellcheck source=scripts/commands/version.sh + . "${SCRIPT_DIR}/commands/version.sh" + version + break + ;; --driver | -d) load_secret_driver "$2" shift ;; + --output-decrypt-file-path) + # shellcheck disable=SC2034 + OUTPUT_DECRYPTED_FILE_PATH=true + QUIET=true + ;; --quiet | -q) # shellcheck disable=SC2034 QUIET=true