fix: return no error from shims.RemoveAll when shims dir missing (#1967)

Author: Stratus3D

internal/cli/cli.go

@@ -1319,6 +1319,16 @@ func reshimCommand(logger *log.Logger, tool, version string) (err error) {
 		return err
 	}
 
+	var plugin plugins.Plugin
+
+	if tool != "" {
+		plugin = plugins.New(conf, tool)
+		if err := plugin.Exists(); err != nil {
+			logger.Printf("No such plugin: %s", plugin.Name)
+			os.Exit(1)
+			return err
+		}
+	}
 	// if either tool or version are missing just regenerate all shims. This is
 	// fast enough now.
 	if tool == "" || version == "" {
@@ -1332,7 +1342,7 @@ func reshimCommand(logger *log.Logger, tool, version string) (err error) {
 
 	// If provided a specific version it could be something special like a path
 	// version so we need to generate it manually
-	return reshimToolVersion(conf, tool, version, os.Stdout, os.Stderr)
+	return reshimToolVersion(conf, plugin, version, os.Stdout, os.Stderr)
 }
 
 func shimVersionsCommand(logger *log.Logger, shimName string) error {
@@ -1504,9 +1514,10 @@ func loadPlugin(logger *log.Logger, conf config.Config, pluginName string) (plug
 	return plugin, err
 }
 
-func reshimToolVersion(conf config.Config, tool, versionStr string, out io.Writer, errOut io.Writer) error {
+func reshimToolVersion(conf config.Config, plugin plugins.Plugin, versionStr string, out io.Writer, errOut io.Writer) error {
 	version := toolversions.Parse(versionStr)
-	return shims.GenerateForVersion(conf, plugins.New(conf, tool), version, out, errOut)
+
+	return shims.GenerateForVersion(conf, plugin, version, out, errOut)
 }
 
 func latestForPlugin(conf config.Config, toolName, pattern string, showStatus bool) error {

internal/shims/shims.go

@@ -4,6 +4,7 @@ package shims
 import (
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"os/exec"
 	"path"
@@ -226,6 +227,11 @@ func RemoveAll(conf config.Config) error {
 	shimDir := filepath.Join(conf.DataDir, shimDirName)
 	entries, err := os.ReadDir(shimDir)
 	if err != nil {
+		if _, ok := err.(*fs.PathError); ok {
+			// if directory doesn't exist we can just return because no shims can
+			// possibly exist.
+			return nil
+		}
 		return err
 	}
 

internal/shims/shims_test.go

@@ -161,6 +161,12 @@ func TestRemoveAll(t *testing.T) {
 			assert.True(t, errors.Is(err, os.ErrNotExist))
 		}
 	})
+
+	t.Run("does not return error when shims directory does not exist", func(t *testing.T) {
+		shimDir := Directory(conf)
+		assert.Nil(t, os.RemoveAll(shimDir))
+		assert.Nil(t, RemoveAll(conf))
+	})
 }
 
 func TestGenerateAll(t *testing.T) {

test/reshim_command.bats

@@ -15,6 +15,12 @@ teardown() {
   clean_asdf_dir
 }
 
+@test "reshim should print error when plugin with name does not exist" {
+  run asdf reshim non-existent 1.0
+  [ "$status" -eq 1 ]
+  [ "$output" = "No such plugin: non-existent" ]
+}
+
 @test "reshim should allow prefixes of other versions" {
   run asdf install dummy 1.0.1
   run asdf install dummy 1.0