From 12dacf0781a50ea2e19714f94f1f1d1e01195f6c Mon Sep 17 00:00:00 2001 From: Sergei Karpov Date: Sun, 25 Dec 2022 12:10:08 +0200 Subject: [PATCH] fix(pkg/plugin/installer): unix-style paths in HELM_PLUGINS for helm install Supports unix-style paths (with a colon) in the HELM_PLUGINS env for installing new plugins. Closes #11310 Signed-off-by: Sergei Karpov --- pkg/plugin/installer/base.go | 3 ++- pkg/plugin/installer/base_test.go | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/plugin/installer/base.go b/pkg/plugin/installer/base.go index ba6a55d55..e44d857d5 100644 --- a/pkg/plugin/installer/base.go +++ b/pkg/plugin/installer/base.go @@ -30,9 +30,10 @@ type base struct { func newBase(source string) base { settings := cli.New() + pluginsDirs := filepath.SplitList(settings.PluginsDirectory) return base{ Source: source, - PluginsDirectory: settings.PluginsDirectory, + PluginsDirectory: pluginsDirs[0], } } diff --git a/pkg/plugin/installer/base_test.go b/pkg/plugin/installer/base_test.go index 38ef28c3e..104dbadeb 100644 --- a/pkg/plugin/installer/base_test.go +++ b/pkg/plugin/installer/base_test.go @@ -32,6 +32,10 @@ func TestPath(t *testing.T) { source: "https://github.com/jkroepke/helm-secrets", helmPluginsDir: "/helm/data/plugins", expectPath: "/helm/data/plugins/helm-secrets", + }, { + source: "https://github.com/jkroepke/helm-secrets", + helmPluginsDir: "/helm/data/plugins:/remote/helm/data/plugins", + expectPath: "/helm/data/plugins/helm-secrets", }, }