UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-02-19 18:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use functional options when constructing Symlink locator

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2023-07-18 11:57:26 +02:00
parent 99cc0aebd6
commit 9b64d74f6a
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/nvidia-ctk/hook/create-symlinks/create-symlinks.go
View File

@ -101,7 +101,10 @@ func (m command) run(c *cli.Context, cfg *config) error {
csvFiles := cfg.filenames.Value() csvFiles := cfg.filenames.Value()
chainLocator := lookup.NewSymlinkChainLocator(m.logger, cfg.hostRoot) chainLocator := lookup.NewSymlinkChainLocator(
lookup.WithLogger(m.logger),
lookup.WithRoot(cfg.hostRoot),
)
var candidates []string var candidates []string
for _, file := range csvFiles { for _, file := range csvFiles {

5
internal/discover/csv.go
View File

@ -33,7 +33,10 @@ func NewFromCSVFiles(logger logger.Interface, files []string, driverRoot string)
return None{}, nil return None{}, nil
} }
symlinkLocator := lookup.NewSymlinkLocator(logger, driverRoot) symlinkLocator := lookup.NewSymlinkLocator(
lookup.WithLogger(logger),
lookup.WithRoot(driverRoot),
)
locators := map[csv.MountSpecType]lookup.Locator{ locators := map[csv.MountSpecType]lookup.Locator{
csv.MountSpecDev: lookup.NewCharDeviceLocator(lookup.WithLogger(logger), lookup.WithRoot(driverRoot)), csv.MountSpecDev: lookup.NewCharDeviceLocator(lookup.WithLogger(logger), lookup.WithRoot(driverRoot)),
csv.MountSpecDir: lookup.NewDirectoryLocator(logger, driverRoot), csv.MountSpecDir: lookup.NewDirectoryLocator(logger, driverRoot),

5
internal/discover/symlinks.go
View File

@ -113,7 +113,10 @@ func (d symlinkHook) getSpecificLinks() ([]string, error) {
} }
func (d symlinkHook) getCSVFileSymlinks() []string { func (d symlinkHook) getCSVFileSymlinks() []string {
chainLocator := lookup.NewSymlinkChainLocator(d.logger, d.driverRoot) chainLocator := lookup.NewSymlinkChainLocator(
lookup.WithLogger(d.logger),
lookup.WithRoot(d.driverRoot),
)
var candidates []string var candidates []string
for _, file := range d.csvFiles { for _, file := range d.csvFiles {

2
internal/lookup/library.go
View File

@ -41,7 +41,7 @@ func NewLibraryLocator(logger logger.Interface, root string) (Locator, error) {
l := library{ l := library{
logger: logger, logger: logger,
symlink: NewSymlinkLocator(logger, root), symlink: NewSymlinkLocator(WithLogger(logger), WithRoot(root)),
cache: cache, cache: cache,
} }

11
internal/lookup/symlinks.go
View File

@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"path/filepath" "path/filepath"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/symlinks" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/symlinks"
) )
@ -33,9 +32,8 @@ type symlink struct {
} }
// NewSymlinkChainLocator creats a locator that can be used for locating files through symlinks. // NewSymlinkChainLocator creats a locator that can be used for locating files through symlinks.
// A logger can also be specified. func NewSymlinkChainLocator(opts ...Option) Locator {
func NewSymlinkChainLocator(logger logger.Interface, root string) Locator { f := newFileLocator(opts...)
f := newFileLocator(WithLogger(logger), WithRoot(root))
l := symlinkChain{ l := symlinkChain{
file: *f, file: *f,
} }
@ -44,9 +42,8 @@ func NewSymlinkChainLocator(logger logger.Interface, root string) Locator {
} }
// NewSymlinkLocator creats a locator that can be used for locating files through symlinks. // NewSymlinkLocator creats a locator that can be used for locating files through symlinks.
// A logger can also be specified. func NewSymlinkLocator(opts ...Option) Locator {
func NewSymlinkLocator(logger logger.Interface, root string) Locator { f := newFileLocator(opts...)
f := newFileLocator(WithLogger(logger), WithRoot(root))
l := symlink{ l := symlink{
file: *f, file: *f,
} }