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

Extend nvidia-ctk config command to allow options to be set

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar
2023-08-08 13:43:45 +02:00
parent 149a8d7bd8
commit 4addb292b1
9 changed files with 408 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
cmd/nvidia-ctk/config/create-default/create-default.go
View File

@@ -18,10 +18,8 @@ package defaultsubcommand
import (
"fmt"
"io"
"os"
"path/filepath"
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk/config/flags"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/urfave/cli/v2"
@@ -31,11 +29,6 @@ type command struct {
logger logger.Interface
}
// options stores the subcommand options
type options struct {
output string
}
// NewCommand constructs a default command with the specified logger
func NewCommand(logger logger.Interface) *cli.Command {
c := command{
@@ -46,7 +39,7 @@ func NewCommand(logger logger.Interface) *cli.Command {
// build creates the CLI command
func (m command) build() *cli.Command {
opts := options{}
opts := flags.Options{}
// Create the 'default' command
c := cli.Command{
@@ -66,24 +59,24 @@ func (m command) build() *cli.Command {
Name: "output",
Aliases: []string{"o"},
Usage: "Specify the output file to write to; If not specified, the output is written to stdout",
Destination: &opts.output,
Destination: &opts.Output,
},
}
return &c
}
func (m command) validateFlags(c *cli.Context, opts *options) error {
return nil
func (m command) validateFlags(c *cli.Context, opts *flags.Options) error {
return opts.Validate()
}
func (m command) run(c *cli.Context, opts *options) error {
func (m command) run(c *cli.Context, opts *flags.Options) error {
cfgToml, err := config.New()
if err != nil {
return fmt.Errorf("unable to load or create config: %v", err)
}
if err := opts.ensureOutputFolder(); err != nil {
if err := opts.EnsureOutputFolder(); err != nil {
return fmt.Errorf("failed to create output directory: %v", err)
}
output, err := opts.CreateOutput()
@@ -99,31 +92,3 @@ func (m command) run(c *cli.Context, opts *options) error {
return nil
}
// ensureOutputFolder creates the output folder if it does not exist.
// If the output folder is not specified (i.e. output to STDOUT), it is ignored.
func (o options) ensureOutputFolder() error {
if o.output == "" {
return nil
}
if dir := filepath.Dir(o.output); dir != "" {
return os.MkdirAll(dir, 0755)
}
return nil
}
func (o options) CreateOutput() (io.WriteCloser, error) {
if o.output != "" {
return os.Create(o.output)
}
return nullCloser{os.Stdout}, nil
}
type nullCloser struct {
io.Writer
}
func (d nullCloser) Close() error {
return nil
}