fix: improve plugin name parsing

Author: christophwitzko

pkg/plugin/client.go

@@ -29,7 +29,7 @@ func StartPlugin(pluginInfo *PluginInfo) (interface{}, error) {
 	runningClientsMx.Lock()
 	defer runningClientsMx.Unlock()
 	logR, logW := io.Pipe()
-	pluginLogger := log.New(os.Stderr, fmt.Sprintf("[%s]: ", pluginInfo.NormalizedName), 0)
+	pluginLogger := log.New(os.Stderr, fmt.Sprintf("[%s]: ", pluginInfo.ShortNormalizedName), 0)
 	go func() {
 		logLineScanner := bufio.NewScanner(logR)
 		for logLineScanner.Scan() {

pkg/plugin/discovery/download.go

@@ -60,7 +60,7 @@ func downloadPlugin(pluginInfo *plugin.PluginInfo, downloadInfo *resolver.Plugin
 
 	res := grab.DefaultClient.Do(req)
 	if showProgress {
-		showDownloadProgressBar(pluginInfo.NormalizedName, res)
+		showDownloadProgressBar(pluginInfo.ShortNormalizedName, res)
 	}
 	if err := res.Err(); err != nil {
 		return "", err

pkg/plugin/plugin.go

@@ -14,13 +14,14 @@ import (
 )
 
 type PluginInfo struct {
-	Type           string
-	Name           string
-	NormalizedName string
-	Constraint     *semver.Constraints
-	Resolver       string
-	PluginPath     string
-	BinPath        string
+	Type                string
+	Name                string
+	NormalizedName      string
+	ShortNormalizedName string
+	Constraint          *semver.Constraints
+	Resolver            string
+	PluginPath          string
+	BinPath             string
 }
 
 func normalizedPluginType(t string) string {
@@ -49,36 +50,47 @@ func GetPluginInfo(pluginType, pluginName string) (*PluginInfo, error) {
 	resolver := "default"
 	name := pluginName
 	normalizedName := fmt.Sprintf("%s-%s", nPluginType, pluginName)
+
 	if strings.Contains(name, ":") {
-		parts := strings.SplitN(name, ":", 2)
+		parts := strings.Split(name, ":")
+		if len(parts) != 2 {
+			return nil, fmt.Errorf("invalid plugin name format")
+		}
 		resolver = parts[0]
 		name = parts[1]
 		normalizedName = strings.ReplaceAll(normalizedName, ":", "-")
 	}
+
 	if strings.Contains(name, "/") {
-		parts := strings.SplitN(name, "/", 2)
+		parts := strings.Split(name, "/")
+		if len(parts) != 2 {
+			return nil, fmt.Errorf("invalid plugin name format")
+		}
 		name = parts[1]
 		normalizedName = strings.ReplaceAll(normalizedName, "/", "-")
 	}
 
 	var constraint *semver.Constraints
 	if strings.Contains(name, "@") {
-		parts := strings.SplitN(name, "@", 2)
+		parts := strings.Split(name, "@")
+		if len(parts) != 2 {
+			return nil, fmt.Errorf("invalid plugin name format")
+		}
 		v, err := semver.NewConstraint(parts[1])
 		if err != nil {
 			return nil, err
 		}
 		name = parts[0]
 		constraint = v
-		parts = strings.SplitN(normalizedName, "@", 2)
-		normalizedName = parts[0]
+		normalizedName, _, _ = strings.Cut(normalizedName, "@")
 	}
 
 	return &PluginInfo{
-		Type:           pluginType,
-		Name:           name,
-		NormalizedName: normalizedName,
-		Constraint:     constraint,
-		Resolver:       resolver,
+		Type:                pluginType,
+		Name:                name,
+		NormalizedName:      normalizedName,
+		ShortNormalizedName: fmt.Sprintf("%s-%s", nPluginType, name),
+		Constraint:          constraint,
+		Resolver:            resolver,
 	}, nil
 }

pkg/plugin/plugin_test.go

@@ -20,21 +20,48 @@ func TestGetPluginInfo(t *testing.T) {
 		results *PluginInfo
 	}{
 		{"provider", "git", &PluginInfo{
-			Type: "provider", Name: "git", NormalizedName: "provider-git", Resolver: "default",
+			Type:                "provider",
+			Name:                "git",
+			NormalizedName:      "provider-git",
+			ShortNormalizedName: "provider-git",
+			Resolver:            "default",
 		}},
 		{"provider", "github:myorg/myplugin", &PluginInfo{
-			Type: "provider", Name: "myplugin", NormalizedName: "provider-github-myorg-myplugin", Resolver: "github",
+			Type:                "provider",
+			Name:                "myplugin",
+			NormalizedName:      "provider-github-myorg-myplugin",
+			ShortNormalizedName: "provider-myplugin",
+			Resolver:            "github",
 		}},
-		{"provider", "github:myorg/myplugin", &PluginInfo{
-			Type: "provider", Name: "myplugin", NormalizedName: "provider-github-myorg-myplugin", Resolver: "github",
+		{"ci_condition", "github:myorg/myplugin", &PluginInfo{
+			Type:                "ci_condition",
+			Name:                "myplugin",
+			NormalizedName:      "condition-github-myorg-myplugin",
+			ShortNormalizedName: "condition-myplugin",
+			Resolver:            "github",
 		}},
 		{"provider", "github:myorg/myplugin@^1.0.0", &PluginInfo{
-			Type: "provider", Name: "myplugin", NormalizedName: "provider-github-myorg-myplugin", Resolver: "github",
-			Constraint: parseConstraint("^1.0.0"),
+			Type:                "provider",
+			Name:                "myplugin",
+			NormalizedName:      "provider-github-myorg-myplugin",
+			ShortNormalizedName: "provider-myplugin",
+			Resolver:            "github",
+			Constraint:          parseConstraint("^1.0.0"),
 		}},
 		{"provider", "git@2.0.0", &PluginInfo{
-			Type: "provider", Name: "git", NormalizedName: "provider-git", Resolver: "default",
-			Constraint: parseConstraint("2.0.0"),
+			Type:                "provider",
+			Name:                "git",
+			NormalizedName:      "provider-git",
+			ShortNormalizedName: "provider-git",
+			Resolver:            "default",
+			Constraint:          parseConstraint("2.0.0"),
+		}},
+		{"hooks", "registry:logger", &PluginInfo{
+			Type:                "hooks",
+			Name:                "logger",
+			NormalizedName:      "hooks-registry-logger",
+			ShortNormalizedName: "hooks-logger",
+			Resolver:            "registry",
 		}},
 	}
 	for _, testCase := range testCases {