Add quotes in command (#467)

Author: jkroepke

.github/workflows/ci.yaml

@@ -3,9 +3,9 @@ name: CI
 
 env:
   WSLENV: "HELM_SECRETS_BACKEND:BATS_REPORT_FILENAME:BATS_TEST_NAME_PREFIX"
-  VERSION_HELM: v3.12.3
-  VERSION_SOPS: v3.8.1
-  VERSION_VALS: v0.26.2
+  VERSION_HELM: v3.15.3
+  VERSION_SOPS: v3.9.0
+  VERSION_VALS: v0.37.3
 
 on:
   pull_request:
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run the sh-checker
         uses: luizm/[email protected]
         env:
@@ -133,7 +133,7 @@ jobs:
       # this is to fix https://github.com/actions/checkout/issues/760
       - run: git config --global --add safe.directory /__w/helm-secrets/helm-secrets
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -178,19 +178,14 @@ jobs:
         run: wsl bash -c 'apt-get update -qq && apt-get install -yqq parallel'
 
       - name: Print Environment
+        continue-on-error: true
         run: |-
           bash -c 'echo "Shell: $(readlink /bin/sh || readlink /var/select/sh || echo unknown)"'
           bash tests/bats/core/bin/bats -v
           sops --version
           gpg --version
           vals version
 
-      - name: Print Environment (Windows)
-        if: "contains(matrix.os, 'windows-latest')"
-        run: |-
-          scripts/wrapper/sh.cmd --version
-          scripts/wrapper/sh.cmd -c -- "uname -a"
-
       - name: Run helm-secrets w/o bats
         run: |-
           helm plugin install "${{ github.event_name == 'pull_request'
@@ -232,7 +227,7 @@ jobs:
       BATSLIB_TEMP_PRESERVE: "0"
       BATSLIB_TEMP_PRESERVE_ON_FAILURE: "0"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
@@ -321,7 +316,7 @@ jobs:
 
       - run: kubectl cluster-info
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 

.github/workflows/release.yaml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Package helm-secrets
         run: tar --transform 's,^,helm-secrets/,' --exclude=contrib --exclude=examples --exclude=tests --exclude=helm-secrets.tar.gz -zcvf helm-secrets.tar.gz *
@@ -37,7 +37,7 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - run: >-
         sed -i 's/HELM_SECRETS_VERSION=".*"/HELM_SECRETS_VERSION="'${GITHUB_REF_NAME/v}'"/g' docs/ArgoCD\ Integration.md

.github/workflows/wiki.yaml

@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           repository: ${{ github.repository }}.wiki
           path: wiki

README.md

@@ -37,8 +37,6 @@ Run decrypted command on specific value files.
 This method is preferred over the plugin command below. 
 This mode is used in [ArgoCD](https://github.com/jkroepke/helm-secrets/wiki/ArgoCD-Integration) environments.
 
-On Windows, the command `helm secrets patch windows` needs to be run first.
-
 ```bash
 helm upgrade name . -f secrets://secrets.yaml
 ```

docs/Usage.md

@@ -15,7 +15,6 @@ Available Commands:
   decrypt Decrypt secrets file
   edit    Edit secrets file and encrypt afterwards
   dir     Get plugin directory
-  patch   Enables windows specific adjustments
   <cmd>   wrapper that decrypts encrypted yaml files before running helm <cmd>
 
 Available Options:

plugin.yaml

@@ -7,8 +7,8 @@ useTunnel: false
 command: "$HELM_PLUGIN_DIR/scripts/run.sh"
 platformCommand:
   - os: windows
-    command: "cmd /c $HELM_PLUGIN_DIR\\scripts\\wrapper\\sh.cmd $HELM_PLUGIN_DIR\\scripts\\run.sh"
-    #command: "powershell -noprofile -executionpolicy bypass -file $HELM_PLUGIN_DIR\\scripts\\wrapper\\sh.ps1 $HELM_PLUGIN_DIR\\scripts\\run.sh"
+    command: >-
+      cmd /c $HELM_PLUGIN_DIR\scripts\wrapper\run.cmd
 
 downloaders:
   - command: "scripts/run.sh downloader"

scripts/commands/help.sh

@@ -17,7 +17,6 @@ Available Commands:
   decrypt Decrypt secrets file
   edit    Edit secrets file and encrypt afterwards
   dir     Get plugin directory
-  patch   Enables windows specific adjustments
   <cmd>   wrapper that decrypts encrypted yaml files before running helm <cmd>
 
 Available Options:

scripts/commands/patch.sh

@@ -107,6 +107,8 @@ CYGWIN* | MINGW64_NT*)
         fi
     }
     _helm_winpath() { _winpath "$@"; }
+
+    _sed_i 's!  - command: .*!  - command: "scripts/wrapper/run.cmd downloader"!' "${HELM_PLUGIN_DIR}/plugin.yaml"
     ;;
 Darwin)
     case $(sed --help 2>&1) in
@@ -133,3 +135,7 @@ Darwin)
     fi
     ;;
 esac
+
+if on_wsl || on_cygwin; then
+    _sed_i 's!  - command: .*!  - command: "scripts/wrapper/run.cmd downloader"!' "${HELM_PLUGIN_DIR}/plugin.yaml"
+fi

scripts/lib/common.sh

@@ -79,7 +79,6 @@ if [ "${LOAD_GPG_KEYS}" != "false" ]; then
 fi
 
 if [ -n "${HELM_SECRET_WSL_INTEROP+x}" ]; then
-    shift
     argc=$#
     j=0
 
@@ -158,13 +157,6 @@ while true; do
         downloader "$2" "$3" "$4" "$5"
         break
         ;;
-    patch)
-        # shellcheck source=scripts/commands/patch.sh
-        . "${SCRIPT_DIR}/commands/patch.sh"
-
-        patch "$2"
-        break
-        ;;
     --help | -h | help)
         # shellcheck source=scripts/commands/help.sh
         . "${SCRIPT_DIR}/commands/help.sh"