UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-05-20 11:18:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

FIX: Rename path locator as executable locator

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-04-06 15:24:02 +02:00
parent 0054481e15
commit 96e8eb3dde
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/discover/legacy.go
View File

@ -38,7 +38,7 @@ var _ Discover = (*legacy)(nil)
func NewLegacyDiscoverer(logger *logrus.Logger, root string) (Discover, error) { func NewLegacyDiscoverer(logger *logrus.Logger, root string) (Discover, error) {
d := legacy{ d := legacy{
logger: logger, logger: logger,
lookup: lookup.NewPathLocator(logger, root), lookup: lookup.NewExecutaleLocator(logger, root),
} }
return &d, nil return &d, nil

12
internal/lookup/path.go → internal/lookup/executable.go
View File

@ -31,12 +31,12 @@ const (
var defaultPaths = []string{"/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"} var defaultPaths = []string{"/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin"}
type path struct { type executable struct {
file file
} }
// NewPathLocator creates a locator to fine executable files in the path. A logger can also be specified. // NewExecutaleLocator creates a locator to fine executable files in the path. A logger can also be specified.
func NewPathLocator(logger *log.Logger, root string) Locator { func NewExecutaleLocator(logger *log.Logger, root string) Locator {
pathEnv := os.Getenv(envPath) pathEnv := os.Getenv(envPath)
paths := filepath.SplitList(pathEnv) paths := filepath.SplitList(pathEnv)
@ -48,7 +48,7 @@ func NewPathLocator(logger *log.Logger, root string) Locator {
for _, dir := range paths { for _, dir := range paths {
prefixes = append(prefixes, filepath.Join(root, dir)) prefixes = append(prefixes, filepath.Join(root, dir))
} }
l := path{ l := executable{
file: file{ file: file{
logger: logger, logger: logger,
prefixes: prefixes, prefixes: prefixes,
@ -58,10 +58,10 @@ func NewPathLocator(logger *log.Logger, root string) Locator {
return &l return &l
} }
var _ Locator = (*path)(nil) var _ Locator = (*executable)(nil)
// Locate finds executable files in the path. If a relative or absolute path is specified, the prefix paths are not considered. // Locate finds executable files in the path. If a relative or absolute path is specified, the prefix paths are not considered.
func (p path) Locate(filename string) ([]string, error) { func (p executable) Locate(filename string) ([]string, error) {
// For absolute paths we ensure that it is executable // For absolute paths we ensure that it is executable
if strings.Contains(filename, "/") { if strings.Contains(filename, "/") {
err := assertExecutable(filename) err := assertExecutable(filename)