Fix helmfile init failing to update outdated helm plugins with Helm v4 (#2554)

* Initial plan * Fix helmfile init not updating outdated helm plugins with Helm v4 - UpdatePlugin now handles secrets plugin with Helm 4 by using the split plugin architecture (uninstall old + install via installHelmSecretsV4) - UpdatePlugin falls back to uninstall + reinstall when helm plugin update fails (e.g., with Helm 4 or tarball-installed plugins) - Fix string-based semver comparison for helm-secrets version check in both AddPlugin and UpdatePlugin using proper semver comparison - Add helmSecretsRequiresSplitInstall helper for reuse and correctness - Add tests for update failure fallback scenarios Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/533f1b1c-dda6-4934-af27-051e4eaa9927 Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com> * Address reviewer feedback: preserve update error context and add version assertions in tests - exec.go: include original update error in fallback log message; wrap both errors (update + reinstall) when reinstall also fails so callers get full context - init_test.go: add semver import and GetPluginVersion assertions after CheckHelmPlugins to verify plugins are at required versions on disk Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/c784db7d-7d4c-40a0-97f0-a31eb8901cd6 Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com> * Address second round of reviewer feedback - exec.go: rename UpdatePlugin parameter path→repo for clarity - exec.go: fix uninstallPlugin to only emit INFO log when err == nil - exec_test.go: add Test_helmSecretsRequiresSplitInstall table-driven tests covering v4.6.9, v4.7.0, v4.8.0, v4.10.0, pre-release, invalid and empty - exec_test.go: add Test_UpdatePlugin_Helm4SecretsUsesUninstallReinstall verifying that Helm 4 + secrets uses uninstall+reinstall (not plugin update) Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/cbd3f8c9-ec7d-4500-b168-cb1c2f7c87bc Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com> * Add len(args) >= 3 guards in test mock for plugin update/uninstall cases Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/ea0f5afc-d52d-473b-b759-853a8f841a26 Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com> * Return early with combined error when uninstall fails in UpdatePlugin fallback Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/bb9a675c-309d-4b06-83d4-a6fe078dce64 Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
2026-10-21 08:21:35 +02:00 · 2026-04-25 11:04:23 +08:00
parent 261c605305
commit c57134cda7
4 changed files with 285 additions and 5 deletions
@@ -217,7 +217,7 @@ func (h *HelmfileInit) CheckHelmPlugins() error {
 			if err != nil {
 				return err
 			}
-			err = helm.UpdatePlugin(p.name)
+			err = helm.UpdatePlugin(p.name, p.repo, p.version)
 			if err != nil {
 				// Check if plugin was updated despite the error
 				updatedVersion, verifyErr := helmexec.GetPluginVersion(p.name, pluginsDir)
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"testing"

+	"github.com/Masterminds/semver/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
@@ -207,3 +208,137 @@ func TestCheckHelmPlugins_InstallErrorPluginTrulyMissing(t *testing.T) {
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "sh: not found")
 }
+
+func TestCheckHelmPlugins_UpdateFailsFallbackToReinstall(t *testing.T) {
+	pluginsDir := t.TempDir()
+	t.Setenv("HELM_PLUGINS", pluginsDir)
+
+	// Pre-populate plugins with outdated versions so the update path is triggered.
+	for _, p := range helmPlugins {
+		createPluginYAML(t, pluginsDir, p.name, p.name, "0.0.1")
+	}
+
+	// Track which plugin sub-commands were executed.
+	var calledOps []string
+
+	// The mock runner simulates "helm plugin update" failing and falling back to
+	// "helm plugin uninstall" + "helm plugin install" which succeeds and writes the
+	// required version to disk.
+	runner := &initMockRunner{
+		executeFunc: func(cmd string, args []string, env map[string]string, enableLiveOutput bool) ([]byte, error) {
+			for _, a := range args {
+				if a == "--short" {
+					return []byte("v3.18.6"), nil
+				}
+			}
+			if len(args) >= 2 && args[0] == "plugin" {
+				switch args[1] {
+				case "update":
+					if len(args) >= 3 {
+						calledOps = append(calledOps, "update:"+args[2])
+					}
+					// Simulate helm plugin update failing (as can happen with Helm 4)
+					return nil, helmexec.ExitError{Message: "plugin update failed", Code: 1}
+				case "uninstall":
+					if len(args) >= 3 {
+						calledOps = append(calledOps, "uninstall:"+args[2])
+					}
+					// Simulate successful uninstall
+					return []byte{}, nil
+				case "install":
+					// Find which plugin is being installed by matching the repo URL.
+					if len(args) >= 3 {
+						repo := args[2]
+						for _, p := range helmPlugins {
+							if p.repo == repo {
+								calledOps = append(calledOps, "install:"+p.name)
+								createPluginYAML(t, pluginsDir, p.name, p.name, strings.TrimPrefix(p.version, "v"))
+								break
+							}
+						}
+					}
+					return []byte{}, nil
+				}
+			}
+			return []byte{}, nil
+		},
+	}
+
+	h := NewHelmfileInit("helm", &mockInitConfigProvider{force: true}, newTestLogger(), runner)
+	err := h.CheckHelmPlugins()
+	// Should succeed: update failed but fallback reinstall updated the plugin
+	assert.NoError(t, err)
+
+	// Verify that for each plugin the fallback path was taken:
+	// update was attempted, then uninstall + install were called.
+	for _, p := range helmPlugins {
+		assert.Contains(t, calledOps, "update:"+p.name, "expected update to be attempted for plugin %s", p.name)
+		assert.Contains(t, calledOps, "uninstall:"+p.name, "expected uninstall to be called for plugin %s", p.name)
+		assert.Contains(t, calledOps, "install:"+p.name, "expected install to be called for plugin %s", p.name)
+	}
+
+	// Verify that all plugins are now at (or above) the required version on disk.
+	for _, p := range helmPlugins {
+		requiredVersion, err := semver.NewVersion(p.version)
+		require.NoError(t, err)
+		installedVersion, err := helmexec.GetPluginVersion(p.name, pluginsDir)
+		require.NoError(t, err, "plugin %s should be present after reinstall", p.name)
+		assert.False(t, installedVersion.LessThan(requiredVersion),
+			"plugin %s: installed version %s should be >= required version %s", p.name, installedVersion, requiredVersion)
+	}
+}
+
+func TestCheckHelmPlugins_UpdateErrorButPluginAtRequiredVersion(t *testing.T) {
+	pluginsDir := t.TempDir()
+	t.Setenv("HELM_PLUGINS", pluginsDir)
+
+	// Pre-populate plugins with outdated versions so the update path is triggered.
+	for _, p := range helmPlugins {
+		createPluginYAML(t, pluginsDir, p.name, p.name, "0.0.1")
+	}
+
+	// The mock runner simulates:
+	// 1. "helm plugin update" failing
+	// 2. "helm plugin uninstall" succeeding
+	// 3. "helm plugin install" writing the correct version but returning an error
+	//    (e.g., post-install script error on Windows)
+	// In this case, UpdatePlugin returns the install error, but CheckHelmPlugins
+	// verifies the version and warns instead of returning an error.
+	runner := &initMockRunner{
+		executeFunc: func(cmd string, args []string, env map[string]string, enableLiveOutput bool) ([]byte, error) {
+			for _, a := range args {
+				if a == "--short" {
+					return []byte("v3.18.6"), nil
+				}
+			}
+			if len(args) >= 2 && args[0] == "plugin" {
+				switch args[1] {
+				case "update":
+					return nil, helmexec.ExitError{Message: "plugin update failed", Code: 1}
+				case "uninstall":
+					return []byte{}, nil
+				case "install":
+					// Write the correct version to disk, then return an error
+					// (simulates post-install script failure on Windows)
+					if len(args) >= 3 {
+						repo := args[2]
+						for _, p := range helmPlugins {
+							if p.repo == repo {
+								createPluginYAML(t, pluginsDir, p.name, p.name, strings.TrimPrefix(p.version, "v"))
+								break
+							}
+						}
+					}
+					return nil, helmexec.ExitError{Message: "post-install script failed", Code: 1}
+				}
+			}
+			return []byte{}, nil
+		},
+	}
+
+	h := NewHelmfileInit("helm", &mockInitConfigProvider{force: true}, newTestLogger(), runner)
+	err := h.CheckHelmPlugins()
+	// Should succeed: UpdatePlugin returned an error (from the fallback install step),
+	// but the plugin is present at the required version, so CheckHelmPlugins warns and continues.
+	assert.NoError(t, err)
+}