Return error when passing canonical name to upgrade/uninstall

cmd/krew/cmd/namingutils.go

@@ -15,10 +15,14 @@
 package cmd
 
 import (
+	"regexp"
+
 	"sigs.k8s.io/krew/pkg/constants"
 	"sigs.k8s.io/krew/pkg/index"
 )
 
+var canonicalNameRegex = regexp.MustCompile(`^[\w-]+/[\w-]+$`)
+
 // indexOf returns the index name of a receipt.
 func indexOf(r index.Receipt) string {
 	if r.Status.Source.Name == "" {
@@ -48,3 +52,7 @@ func canonicalName(p index.Plugin, indexName string) string {
 	}
 	return indexName + "/" + p.Name
 }
+
+func isCanonicalName(s string) bool {
+	return canonicalNameRegex.MatchString(s)
+}

cmd/krew/cmd/namingutils_test.go

@@ -112,3 +112,15 @@ func Test_canonicalName(t *testing.T) {
 		t.Errorf("expected=%q; got=%q", expected, got)
 	}
 }
+
+func Test_isCanonicalName(t *testing.T) {
+	if isCanonicalName("foo") {
+		t.Error("expected foo to not be considered a canonical name")
+	}
+	if isCanonicalName("../index/foo") {
+		t.Error("expected ../index/foo to not be considered a canonical name")
+	}
+	if !isCanonicalName("index/foo") {
+		t.Error("expected index/foo to be considered a canonical name")
+	}
+}

cmd/krew/cmd/uninstall.go

@@ -17,7 +17,6 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -41,8 +40,8 @@ Remarks:
 	RunE: func(cmd *cobra.Command, args []string) error {
 		for _, name := range args {
 			if !validation.IsSafePluginName(name) {
-				if strings.Contains(name, "/") {
-					klog.Warningf("uninstall command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
+				if isCanonicalName(name) {
+					return errors.New("uninstall command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
 				}
 				return unsafePluginNameErr(name)
 			}

cmd/krew/cmd/upgrade.go

@@ -17,7 +17,6 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -63,8 +62,8 @@ kubectl krew upgrade foo bar"`,
 				// Upgrade certain plugins
 				for _, arg := range args {
 					if !validation.IsSafePluginName(arg) {
-						if strings.Contains(arg, "/") {
-							klog.Warning("upgrade command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
+						if isCanonicalName(arg) {
+							return errors.New("upgrade command does not support INDEX/PLUGIN syntax; just specify PLUGIN")
 						}
 						return unsafePluginNameErr(arg)
 					}

integration_test/uninstall_test.go

@@ -47,6 +47,23 @@ func TestKrewUninstall(t *testing.T) {
 	}
 }
 
+func TestKrewUninstallPluginsFromCustomIndex(t *testing.T) {
+	skipShort(t)
+
+	test, cleanup := NewTest(t)
+	defer cleanup()
+
+	test.WithEnv(constants.EnableMultiIndexSwitch, 1).WithIndex()
+	test.Krew("index", "add", "foo", test.TempDir().Path("index/"+constants.DefaultIndexName)).RunOrFail()
+	test.Krew("install", "foo/"+validPlugin).RunOrFail()
+
+	if _, err := test.Krew("uninstall", "foo/"+validPlugin).Run(); err == nil {
+		t.Error("expected error when uninstalling by canonical name")
+	}
+	test.Krew("uninstall", validPlugin).RunOrFail()
+	test.AssertExecutableNotInPATH("kubectl-" + validPlugin)
+}
+
 func TestKrewRemove_AliasSupported(t *testing.T) {
 	skipShort(t)