Add config search path option to driver root #327
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elezar
force-pushed
the
add-driver-config
branch
from
d8ff7c6 to
11b2c22
Compare
elezar
force-pushed
the
add-driver-config
branch
3 times, most recently
from
0460bcd to
21e8b05
Compare
Signed-off-by: Evan Lezar <elezar@nvidia.com>
elezar
force-pushed
the
add-driver-config
branch
from
21e8b05 to
8176163
Compare
elezar
changed the title
|
/cc @jmbaur |
tariq1890
reviewed
Apr 2, 2024
internal/lookup/root/root.go
Outdated
| useRoot := r.Root | ||
| searchPaths := []string{"/etc", "/usr/share"} | ||
| if len(r.configSearchPaths) > 0 { | ||
| useRoot = "" |
There was a problem hiding this comment.
Instead of setting this as an empty string, I would prefer if we added the with .WithRoot() to the Options list when configSearchPaths is not set
There was a problem hiding this comment.
I took a stab at reworking this as:
diff --git a/internal/lookup/root/root.go b/internal/lookup/root/root.go
index bfd3ace4..f3176744 100644
--- a/internal/lookup/root/root.go
+++ b/internal/lookup/root/root.go
@@ -59,17 +59,22 @@ func (r *Driver) Libraries() lookup.Locator {
// If configSearchPaths is specified, these paths are used as absolute paths,
// otherwise, /etc and /usr/share are searched.
func (r *Driver) Configs() lookup.Locator {
- useRoot := r.Root
- searchPaths := []string{"/etc", "/usr/share"}
- if len(r.configSearchPaths) > 0 {
- useRoot = ""
- searchPaths = normalizeSearchPaths(r.configSearchPaths...)
+ options := []lookup.Option{
+ lookup.WithLogger(r.logger),
}
+ if len(r.configSearchPaths) == 0 {
+ options = append(options,
+ lookup.WithRoot(r.Root),
+ lookup.WithSearchPaths("/etc", "/usr/share"),
+ )
+ } else {
+ options = append(options,
+ lookup.WithSearchPaths(normalizeSearchPaths(r.configSearchPaths...)...),
+ )
+ }
return lookup.NewFileLocator(
- lookup.WithLogger(r.logger),
- lookup.WithRoot(useRoot),
- lookup.WithSearchPaths(searchPaths...),
+ options...,
)
}
but I find this more verbose and unclear as to what is actually being done here. If you don't mind, I will leave this as is -- possibly renaming some local variables.
tariq1890
reviewed
Apr 2, 2024
|
Aside from @tariq1890 , I don't have comments, once his comments are addressed we can move forward |
Signed-off-by: Evan Lezar <elezar@nvidia.com>
elezar
force-pushed
the
add-driver-config
branch
from
8176163 to
2a9e353
Compare
tariq1890
approved these changes
Apr 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes adds a
Configs()method to the Driver root abstraction that can be used to locate config files.In addition a
--config-search-pathoption is added to thenvidia-ctk cdi generatecommand to allow this to be overridden.