mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2025-06-26 18:18:24 +00:00
Add required option to new toml config
This change adds a "required" option to the new toml config that controls whether a default config is returned or not. This is useful from the NVIDIA Container Runtime Hook, where /run/driver/nvidia/etc/nvidia-container-runtime/config.toml is checked before the standard path. This fixes a bug where the default config was always applied when this config was not used. See https://github.com/NVIDIA/nvidia-container-toolkit/issues/106 Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
@@ -31,6 +31,7 @@ type Toml toml.Tree
|
||||
|
||||
type options struct {
|
||||
configFile string
|
||||
required bool
|
||||
}
|
||||
|
||||
// Option is a functional option for loading TOML config files.
|
||||
@@ -43,6 +44,14 @@ func WithConfigFile(configFile string) Option {
|
||||
}
|
||||
}
|
||||
|
||||
// WithRequired sets the required option.
|
||||
// If this is set to true, a failure to open the specified file is treated as an error
|
||||
func WithRequired(required bool) Option {
|
||||
return func(o *options) {
|
||||
o.required = required
|
||||
}
|
||||
}
|
||||
|
||||
// New creates a new toml tree based on the provided options
|
||||
func New(opts ...Option) (*Toml, error) {
|
||||
o := &options{}
|
||||
@@ -50,19 +59,25 @@ func New(opts ...Option) (*Toml, error) {
|
||||
opt(o)
|
||||
}
|
||||
|
||||
return loadConfigToml(o.configFile)
|
||||
return o.loadConfigToml()
|
||||
}
|
||||
|
||||
func loadConfigToml(filename string) (*Toml, error) {
|
||||
func (o options) loadConfigToml() (*Toml, error) {
|
||||
filename := o.configFile
|
||||
if filename == "" {
|
||||
return defaultToml()
|
||||
}
|
||||
|
||||
_, err := os.Stat(filename)
|
||||
if os.IsNotExist(err) && o.required {
|
||||
return nil, os.ErrNotExist
|
||||
}
|
||||
|
||||
tomlFile, err := os.Open(filename)
|
||||
if os.IsNotExist(err) {
|
||||
return defaultToml()
|
||||
} else if err != nil {
|
||||
return nil, fmt.Errorf("failed to load specified config file: %v", err)
|
||||
return nil, fmt.Errorf("failed to load specified config file: %w", err)
|
||||
}
|
||||
defer tomlFile.Close()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user