Merge pull request #386 from jkroepke/remove-version

jkroepke · Aug 1, 2023 · dea1469 · dea1469
2 parents 2ed062c + 4d865a4
commit dea1469
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Avoid quoting issues with literals and `vals` backend
+- Remove `helm secrets version` to avoid a conflict with `helm version`
 
 ## [4.4.2] - 2023-03-11
 

diff --git a/scripts/run.sh b/scripts/run.sh
@@ -169,7 +169,7 @@ while true; do
         help_usage
         break
         ;;
-    --version | -v | version)
+    --version | -v)
         # shellcheck source=scripts/commands/version.sh
         . "${SCRIPT_DIR}/commands/version.sh"
         version

diff --git a/tests/unit/helm-plugin.bats b/tests/unit/helm-plugin.bats
@@ -39,10 +39,10 @@ load '../bats/extensions/bats-file/load'
     assert_output --partial "${VERSION}"
 }
 
-@test "helm-plugin: helm secrets version" {
+@test "helm-plugin: helm secrets version + HELM_SECRETS_WRAPPER_ENABLED" {
     VERSION=$(grep version "${GIT_ROOT}/plugin.yaml" | cut -d'"' -f2) >&2
 
-    run "${HELM_BIN}" secrets version
+    run env HELM_SECRETS_WRAPPER_ENABLED=true "${GIT_ROOT}/scripts/wrapper/helm.sh" version
     assert_success
-    assert_output --partial "${VERSION}"
+    assert_output --partial "v3"
 }