Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(golang-rewrite): allow directories returned by list-bin-paths to be absent from the file system #81

Merged
merged 1 commit into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions internal/shims/shims.go
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,10 @@ func ToolExecutables(conf config.Config, plugin plugins.Plugin, versionType, ver

for _, path := range paths {
entries, err := os.ReadDir(path)
if err != nil {
if _, ok := err.(*os.PathError); err != nil && !ok {
return executables, err
}

for _, entry := range entries {
// If entry is dir or cannot be executed by the current user ignore it
filePath := filepath.Join(path, entry.Name())
Expand All @@ -320,9 +321,6 @@ func ToolExecutables(conf config.Config, plugin plugins.Plugin, versionType, ver

executables = append(executables, filePath)
}
if err != nil {
return executables, err
}
}
return executables, err
}
Expand Down
16 changes: 16 additions & 0 deletions internal/shims/shims_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,22 @@ func TestToolExecutables(t *testing.T) {

assert.Equal(t, filenames, []string{"dummy"})
})

t.Run("returns list of executables even when one directory printed by list-bin-paths doesn't exist", func(t *testing.T) {
// foo is first in list returned by list-bin-paths but doesn't exist, do
// we still get the executables in the bin/ dir?
repotest.WritePluginCallback(plugin.Dir, "list-bin-paths", "#!/usr/bin/env bash\necho 'foo bin'")
executables, err := ToolExecutables(conf, plugin, "version", version.Value)
assert.Nil(t, err)

var filenames []string
for _, executablePath := range executables {
assert.True(t, strings.HasPrefix(executablePath, conf.DataDir))
filenames = append(filenames, filepath.Base(executablePath))
}

assert.Equal(t, filenames, []string{"dummy"})
})
}

func TestExecutableDirs(t *testing.T) {
Expand Down
5 changes: 5 additions & 0 deletions repotest/repotest.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ func Setup(asdfDataDir string) error {
return nil
}

// WritePluginCallback is for creating new plugin callbacks on the fly.
func WritePluginCallback(pluginDir, callbackName, script string) error {
return os.WriteFile(filepath.Join(pluginDir, "bin", callbackName), []byte(script), 0o777)
}

// InstallPlugin copies in the specified plugin fixture into the asdfDataDir's
// plugin directory and initializes a Git repo for it so asdf treats it as
// installed.
Expand Down