address code review feedback

Signed-off-by: Ahmet Alp Balkan <[email protected]>

Author: ahmetb

cmd/krew/cmd/index.go

@@ -28,6 +28,10 @@ import (
 	"sigs.k8s.io/krew/pkg/constants"
 )
 
+var (
+	forceIndexDelete *bool
+)
+
 // indexCmd represents the index command
 var indexCmd = &cobra.Command{
 	Use:    "index",
@@ -86,21 +90,21 @@ installed from them is not supported behavior.`,
 func indexDelete(_ *cobra.Command, args []string) error {
 	name := args[0]
 
-	pl, err := installation.InstalledPluginsFromIndex(paths.InstallReceiptsPath(), name)
+	ps, err := installation.InstalledPluginsFromIndex(paths.InstallReceiptsPath(), name)
 	if err != nil {
 		return errors.Wrap(err, "failed querying plugins installed from the index")
 	}
-	klog.V(4).Infof("Found %d plugins from index", len(pl))
+	klog.V(4).Infof("Found %d plugins from index", len(ps))
 
-	if len(pl) > 0 && !*forceIndexDelete {
+	if len(ps) > 0 && !*forceIndexDelete {
 		var names []string
-		for _, v := range pl {
-			names = append(names, v.Name)
+		for _, pl := range ps {
+			names = append(names, pl.Name)
 		}
 
 		internal.PrintWarning(os.Stderr, `Plugins [%s] are still installed from index %q.
-			"Removing indexes while there are plugins installed from them may result in
-			"unsupported behavior (use --force to ignore this check).`, strings.Join(names, ", "), name)
+Removing indexes while there are plugins installed from them may result in
+unsupported behavior (use --force to ignore this check).`, strings.Join(names, ", "), name)
 		return errors.Errorf("there are still plugins installed from this index")
 	}
 
@@ -115,10 +119,6 @@ func indexDelete(_ *cobra.Command, args []string) error {
 	return errors.Wrap(err, "error while removing the plugin index")
 }
 
-var (
-	forceIndexDelete *bool
-)
-
 func init() {
 	forceIndexDelete = indexDeleteCmd.Flags().Bool("force", false,
 		"Remove index even if it has plugins currently installed (may result in unsupported behavior)")

integration_test/index_test.go

@@ -58,7 +58,8 @@ func TestKrewIndexList(t *testing.T) {
 		t.Fatal("expected at least 1 index in output")
 	}
 
-	test.Krew("index", "add", "foo", test.TempDir().Path("index/"+constants.DefaultIndexName)).RunOrFail()
+	localIndex := test.TempDir().Path("index/" + constants.DefaultIndexName)
+	test.Krew("index", "add", "foo", localIndex).RunOrFail()
 	out = test.Krew("index", "list").RunOrFailOutput()
 	if indexes := lines(out); len(indexes) < 3 {
 		// the first line is the header
@@ -100,10 +101,11 @@ func TestKrewIndexRemove_nonExisting(t *testing.T) {
 func TestKrewIndexRemove_ok(t *testing.T) {
 	skipShort(t)
 	test, cleanup := NewTest(t)
-	test = test.WithEnv(constants.EnableMultiIndexSwitch, 1)
+	test = test.WithEnv(constants.EnableMultiIndexSwitch, 1).WithIndex()
 	defer cleanup()
 
-	test.Krew("index", "add", "foo", constants.IndexURI).RunOrFail()
+	localIndex := test.TempDir().Path("index/" + constants.DefaultIndexName)
+	test.Krew("index", "add", "foo", localIndex).RunOrFail()
 	test.Krew("index", "remove", "foo").RunOrFail()
 }
 
@@ -114,7 +116,7 @@ func TestKrewIndexRemoveFailsWhenPluginsInstalled(t *testing.T) {
 	defer cleanup()
 
 	test.Krew("install", validPlugin).RunOrFailOutput()
-	if err := test.Krew("remove", "default").Run(); err == nil {
+	if err := test.Krew("index", "remove", "default").Run(); err == nil {
 		t.Fatal("expected error while removing index when there are installed plugins")
 	}
 

internal/index/indexoperations/index.go

@@ -38,7 +38,7 @@ type Index struct {
 func ListIndexes(paths environment.Paths) ([]Index, error) {
 	dirs, err := ioutil.ReadDir(paths.IndexBase())
 	if err != nil {
-		return nil, errors.New("failed to list directory")
+		return nil, errors.Wrap(err, "failed to list directory")
 	}
 
 	indexes := []Index{}