Fix plugin deletion issue

cli/core/pkg/pluginmanager/manager.go

@@ -670,32 +670,42 @@ func DeletePlugin(options DeletePluginOptions) error {
 		return err
 	}
 
+	var matchedPluginDescriptor cliapi.PluginDescriptor
+	var matchedPluginCatalog *catalog.ContextCatalog
+	matchedPluginCount := 0
+
 	// Add empty serverName for standalone plugins
 	serverNames = append(serverNames, "")
-	var catalogContainingPlugin *catalog.ContextCatalog
 
 	for _, serverName := range serverNames {
 		c, err := catalog.NewContextCatalog(serverName)
 		if err != nil {
 			continue
 		}
-		_, ok := c.Get(catalog.PluginNameTarget(options.PluginName, options.Target))
-		if ok {
-			catalogContainingPlugin = c
-			break
+
+		pds := c.List()
+		for i := range pds {
+			if pds[i].Name == options.PluginName && (options.Target == "" || options.Target == pds[i].Target) {
+				matchedPluginDescriptor = pds[i]
+				matchedPluginCatalog = c
+				matchedPluginCount++
+			}
 		}
 	}
 
-	if catalogContainingPlugin == nil {
-		return fmt.Errorf("could not get plugin path for plugin %q", options.PluginName)
+	if matchedPluginCount == 0 {
+		return errors.Errorf("unable to find plugin '%v'", options.PluginName)
+	}
+	if matchedPluginCount > 1 {
+		return errors.Errorf("unable to uniquely identify plugin '%v'. Please specify correct Target(kubernetes[k8s]/mission-control[tmc]) of the plugin with `--target` flag", options.PluginName)
 	}
 
 	if !options.ForceDelete {
 		if err := component.AskForConfirmation(fmt.Sprintf("Deleting Plugin '%s'. Are you sure?", options.PluginName)); err != nil {
 			return err
 		}
 	}
-	err = catalogContainingPlugin.Delete(catalog.PluginNameTarget(options.PluginName, options.Target))
+	err = matchedPluginCatalog.Delete(catalog.PluginNameTarget(matchedPluginDescriptor.Name, matchedPluginDescriptor.Target))
 	if err != nil {
 		return fmt.Errorf("plugin %q could not be deleted from cache", options.PluginName)
 	}

cli/core/pkg/pluginmanager/manager_test.go

@@ -528,34 +528,39 @@ func Test_DeletePlugin(t *testing.T) {
 	defer setupLocalDistoForTesting()()
 
 	// Try to delete plugin when plugin is not installed
-	loginPlugin := DeletePluginOptions{
-		PluginName:  "login",
-		Target:      cliv1alpha1.TargetNone,
-		ForceDelete: true,
-	}
-	err := DeletePlugin(loginPlugin)
+	err := DeletePlugin(DeletePluginOptions{PluginName: "login", Target: cliv1alpha1.TargetNone, ForceDelete: true})
 	assertions.NotNil(err)
-	assertions.Contains(err.Error(), "could not get plugin path for plugin \"login\"")
+	assertions.Contains(err.Error(), "unable to find plugin 'login'")
 
 	// Install login (standalone) package
 	mockInstallPlugin(assertions, "login", "v0.2.0", cliv1alpha1.TargetNone)
 
 	// Try to delete plugin when plugin is installed
-	clusterPlugin := DeletePluginOptions{
-		PluginName:  "cluster",
-		Target:      cliv1alpha1.TargetTMC,
-		ForceDelete: true,
-	}
-	err = DeletePlugin(clusterPlugin)
+	err = DeletePlugin(DeletePluginOptions{PluginName: "cluster", Target: cliv1alpha1.TargetTMC, ForceDelete: true})
 	assertions.NotNil(err)
-	assertions.Contains(err.Error(), "could not get plugin path for plugin \"cluster\"")
+	assertions.Contains(err.Error(), "unable to find plugin 'cluster'")
 
-	// Install cluster (context) package
+	// Install cluster (context) package from TMC target
 	mockInstallPlugin(assertions, "cluster", "v0.2.0", cliv1alpha1.TargetTMC)
 
-	// Try to describe plugin when plugin after installing plugin
-	err = DeletePlugin(clusterPlugin)
+	// Try to Delete plugin after installing plugin
+	err = DeletePlugin(DeletePluginOptions{PluginName: "cluster", Target: cliv1alpha1.TargetTMC, ForceDelete: true})
+	assertions.Nil(err)
+
+	// Install cluster (context) package from TMC target
+	mockInstallPlugin(assertions, "cluster", "v0.2.0", cliv1alpha1.TargetTMC)
+
+	// Try to Delete plugin after installing plugin
+	err = DeletePlugin(DeletePluginOptions{PluginName: "cluster", Target: "", ForceDelete: true})
 	assertions.Nil(err)
+
+	// Install cluster (context) package from TMC target
+	mockInstallPlugin(assertions, "cluster", "v0.2.0", cliv1alpha1.TargetTMC)
+	// Install cluster (context) package from k8s target
+	mockInstallPlugin(assertions, "cluster", "v1.6.0", cliv1alpha1.TargetK8s)
+	// Try to Delete plugin without passing target after installing plugin with different targets
+	err = DeletePlugin(DeletePluginOptions{PluginName: "cluster", Target: "", ForceDelete: true})
+	assertions.Contains(err.Error(), "unable to uniquely identify plugin 'cluster'. Please specify correct Target(kubernetes[k8s]/mission-control[tmc]) of the plugin with `--target` flag")
 }
 
 func Test_ValidatePlugin(t *testing.T) {