Merge 46301c2d77 into 53dfa521e0

internal/plugin/installer/base.go

@@ -41,5 +41,11 @@ func (b *base) Path() string {
 	if b.Source == "" {
 		return ""
 	}
-	return filepath.Join(b.PluginsDirectory, filepath.Base(b.Source))
+
+	pluginsDirectory := b.PluginsDirectory
+	if pluginsDirectories := filepath.SplitList(b.PluginsDirectory); len(pluginsDirectories) > 0 {
+		pluginsDirectory = pluginsDirectories[0]
+	}
+
+	return filepath.Join(pluginsDirectory, filepath.Base(b.Source))
 }

internal/plugin/installer/base_test.go

@@ -14,12 +14,18 @@ limitations under the License.
 package installer
 
 import (
+	"fmt"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestPath(t *testing.T) {
+	pluginsDir := filepath.Join(string(filepath.Separator), "helm", "data", "plugins")
+	systemPluginsDir := filepath.Join(string(filepath.Separator), "helm", "system", "plugins")
+	pluginSource := "https://github.com/jkroepke/helm-secrets"
+
 	tests := []struct {
 		source         string
 		helmPluginsDir string
@@ -27,12 +33,16 @@ func TestPath(t *testing.T) {
 	}{
 		{
 			source:         "",
-			helmPluginsDir: "/helm/data/plugins",
+			helmPluginsDir: pluginsDir,
 			expectPath:     "",
 		}, {
-			source:         "https://github.com/jkroepke/helm-secrets",
+			source:         pluginSource,
-			helmPluginsDir: "/helm/data/plugins",
+			helmPluginsDir: pluginsDir,
-			expectPath:     "/helm/data/plugins/helm-secrets",
+			expectPath:     filepath.Join(pluginsDir, filepath.Base(pluginSource)),
+		}, {
+			source:         pluginSource,
+			helmPluginsDir: fmt.Sprintf("%s%c%s", pluginsDir, filepath.ListSeparator, systemPluginsDir),
+			expectPath:     filepath.Join(pluginsDir, filepath.Base(pluginSource)),
 		},
 	}