Add Helm version requirements for credential support

- Add version requirement note to README.md for credential support (>=3.14.0)
- Add v3.18.5 to CI test matrix
- Add helm_supports_credentials() version check function
- Scope credential tests to skip on Helm versions < 3.14.0
- Fix linting issues (trailing whitespace)

Co-authored-by: aslafy-z <[email protected]>

Author: Copilot

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        helm: ['2.17.0', '3.4.2', '3.7.1']
+        helm: ['2.17.0', '3.4.2', '3.7.1', '3.18.5']
     env:
       FIXTURES_GIT_REPO: ${{ format('{0}/{1}', github.server_url, github.event.pull_request.head.repo.full_name || github.repository) }}
       FIXTURES_GIT_REF: ${{ github.head_ref || github.ref_name }}

README.md

@@ -102,6 +102,8 @@ As this plugin uses `git` CLI to clone repos. You can configure private access i
 
 #### Helm Credentials Support
 
+> **Note:** This feature requires Helm v3.14.0 or later.
+
 This plugin supports Helm's built-in credential passing mechanism. When you use `helm repo add` with `--username` and `--password` flags, the plugin automatically configures git to use these credentials:
 
 ```bash

helm-git-plugin.sh

@@ -120,12 +120,12 @@ git_fetch_ref() {
 setup_git_credentials() {
   if [ -n "${HELM_PLUGIN_USERNAME:-}" ] && [ -n "${HELM_PLUGIN_PASSWORD:-}" ]; then
     debug "Setting up git credentials using Helm-provided username and password"
-    
+
     # Export credentials as environment variables for the credential helper
     export GIT_USER="${HELM_PLUGIN_USERNAME}"
     export GIT_PASSWORD="${HELM_PLUGIN_PASSWORD}"
     export HELM_GIT_USE_CREDENTIALS="1"
-    
+
     trace "Git credential helper configured with username: ${HELM_PLUGIN_USERNAME}"
   else
     trace "No Helm plugin credentials found, using existing git authentication"
@@ -442,7 +442,7 @@ main() {
   fi
 
   # Setup exit trap
-  # shellcheck disable=SC2317,SC2329 
+  # shellcheck disable=SC2317,SC2329
   exit_trap() {
     [ "$cleanup" = 1 ] || return 0
     rm -rf "$git_root_path" "${helm_home_target_path:-}"

tests/07-credentials.bats

@@ -2,80 +2,110 @@
 
 load 'test-helper'
 
+setup_file() {
+    if ! helm_supports_credentials; then
+        echo "# Skipping credential tests - Helm version < 3.14.0 does not support credential passing" >&2
+    fi
+}
+
 @test "should setup git credentials when HELM_PLUGIN_USERNAME and HELM_PLUGIN_PASSWORD are set" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     export HELM_PLUGIN_USERNAME="testuser"
     export HELM_PLUGIN_PASSWORD="testpass"
-    
+
     # Call setup_git_credentials function in a subshell to check exports
     run bash -c 'source "${HELM_GIT_DIRNAME}/helm-git-plugin.sh" && setup_git_credentials && echo "GIT_USER=${GIT_USER}" && echo "GIT_PASSWORD=${GIT_PASSWORD}"'
     [ $status = 0 ]
-    
+
     # Check that the output contains the expected values
     [[ "$output" == *"GIT_USER=testuser"* ]]
     [[ "$output" == *"GIT_PASSWORD=testpass"* ]]
-    
+
     # Check that HELM_GIT_USE_CREDENTIALS is set to enable git_cmd wrapper
     run bash -c 'source "${HELM_GIT_DIRNAME}/helm-git-plugin.sh" && setup_git_credentials && echo "HELM_GIT_USE_CREDENTIALS=${HELM_GIT_USE_CREDENTIALS}"'
     [ $status = 0 ]
     [[ "$output" == *"HELM_GIT_USE_CREDENTIALS=1"* ]]
 }
 
 @test "should not setup git credentials when HELM_PLUGIN_USERNAME is missing" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     unset HELM_PLUGIN_USERNAME
     export HELM_PLUGIN_PASSWORD="testpass"
-    
+
     # Call setup_git_credentials function
     run setup_git_credentials
     [ $status = 0 ]
-    
+
     # Check that environment variables are not set
     [ -z "${GIT_USER:-}" ]
     [ -z "${GIT_PASSWORD:-}" ]
 }
 
 @test "should not setup git credentials when HELM_PLUGIN_PASSWORD is missing" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     export HELM_PLUGIN_USERNAME="testuser"
     unset HELM_PLUGIN_PASSWORD
-    
+
     # Call setup_git_credentials function
     run setup_git_credentials
     [ $status = 0 ]
-    
+
     # Check that environment variables are not set
     [ -z "${GIT_USER:-}" ]
     [ -z "${GIT_PASSWORD:-}" ]
 }
 
 @test "should not setup git credentials when both are missing" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     unset HELM_PLUGIN_USERNAME
     unset HELM_PLUGIN_PASSWORD
-    
+
     # Call setup_git_credentials function
     run setup_git_credentials
     [ $status = 0 ]
-    
+
     # Check that environment variables are not set
     [ -z "${GIT_USER:-}" ]
     [ -z "${GIT_PASSWORD:-}" ]
 }
 
 @test "helm_git main should call setup_git_credentials with username and password" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     export HELM_PLUGIN_USERNAME="testuser"
     export HELM_PLUGIN_PASSWORD="testpass"
-    
+
     # Test that main function sets up credentials by checking git config
     run bash -c 'source "${HELM_GIT_DIRNAME}/helm-git-plugin.sh" && export HELM_GIT_DEBUG=1 && main "" "" "" "git+https://example.com/[email protected]?ref=master" 2>&1 || true'
-    
+
     # Check that the debug message about setting up credentials appears
     [[ "$output" == *"Setting up git credentials using Helm-provided username and password"* ]]
 }
 
 @test "git credential helper should work with environment variables" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     export HELM_PLUGIN_USERNAME="testuser"
     export HELM_PLUGIN_PASSWORD="testpass"
     export GIT_USER="testuser"
     export GIT_PASSWORD="testpass"
-    
+
     # Test the credential helper directly
     run bash -c 'echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"'
     [ $status = 0 ]
@@ -84,36 +114,48 @@ load 'test-helper'
 }
 
 @test "should handle credentials with special characters" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     export HELM_PLUGIN_USERNAME="[email protected]"
     export HELM_PLUGIN_PASSWORD="pass/with/special&chars"
-    
+
     # Call setup_git_credentials function in a subshell to check exports
     run bash -c 'source "${HELM_GIT_DIRNAME}/helm-git-plugin.sh" && setup_git_credentials && echo "GIT_USER=${GIT_USER}" && echo "GIT_PASSWORD=${GIT_PASSWORD}"'
     [ $status = 0 ]
-    
+
     # Check that the output contains the expected values with special characters
     [[ "$output" == *"[email protected]"* ]]
     [[ "$output" == *"GIT_PASSWORD=pass/with/special&chars"* ]]
 }
 
 @test "git_cmd should use credentials when available" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     export HELM_PLUGIN_USERNAME="testuser"
     export HELM_PLUGIN_PASSWORD="testpass"
-    
+
     # Test git_cmd function
     run bash -c 'source "${HELM_GIT_DIRNAME}/helm-git-plugin.sh" && setup_git_credentials && git_cmd config --list | grep -E "(user|credential)" || echo "No credential config found"'
     [ $status = 0 ]
-    
+
     # Should succeed (exit code 0)
 }
 
 @test "git_cmd should work normally when no credentials" {
+    if ! helm_supports_credentials; then
+        skip "Helm version < 3.14.0 does not support credential passing"
+    fi
+
     unset HELM_PLUGIN_USERNAME
     unset HELM_PLUGIN_PASSWORD
     unset HELM_GIT_USE_CREDENTIALS
-    
+
     # Test git_cmd function without credentials
     run bash -c 'source "${HELM_GIT_DIRNAME}/helm-git-plugin.sh" && setup_git_credentials && git_cmd --version'
     [ $status = 0 ]
     [[ "$output" == *"git version"* ]]
-}
+}

tests/test-helper.bash

@@ -54,3 +54,37 @@ set_chart_cache_strategy() {
     HELM_GIT_CHART_CACHE_STRATEGY="$1"
     export HELM_GIT_CHART_CACHE_STRATEGY
 }
+
+# Check if Helm version supports credential passing (>= 3.14.0)
+helm_supports_credentials() {
+    local helm_version
+    helm_version=$($HELM_BIN version --short 2>/dev/null | head -1 | sed 's/v//' | cut -d'+' -f1 | cut -d'-' -f1)
+
+    # If we can't get version, assume it doesn't support credentials
+    [ -n "$helm_version" ] || return 1
+
+    # Extract major.minor.patch using parameter expansion
+    local major="${helm_version%%.*}"
+    local rest="${helm_version#*.}"
+    local minor="${rest%%.*}"
+    local patch="${rest#*.}"
+
+    # If patch is the same as rest, there was no second dot, so patch is 0
+    [ "$patch" = "$rest" ] && patch=0
+
+    # Ensure we have numeric values (basic check)
+    case "$major" in ''|*[!0-9]*) return 1 ;; esac
+    case "$minor" in ''|*[!0-9]*) return 1 ;; esac
+    case "$patch" in ''|*[!0-9]*) patch=0 ;; esac
+
+    # Check if version >= 3.14.0
+    if [ "$major" -gt 3 ]; then
+        return 0
+    elif [ "$major" -eq 3 ] && [ "$minor" -gt 14 ]; then
+        return 0
+    elif [ "$major" -eq 3 ] && [ "$minor" -eq 14 ] && [ "$patch" -ge 0 ]; then
+        return 0
+    else
+        return 1
+    fi
+}