UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 16:29:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-json-mode' into 'main'

Browse Source 
Remove unused jsonMode and fix output

See merge request nvidia/container-toolkit/container-toolkit!255
This commit is contained in:
Evan Lezar 2022-12-01 16:01:33 +00:00
commit 3e35312537
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/nvidia-ctk/cdi/generate/generate.go
View File

@ -51,7 +51,6 @@ type command struct {
type config struct { type config struct {
output string output string
format string format string
jsonMode bool
} }
// NewCommand constructs a generate-cdi command with the specified logger // NewCommand constructs a generate-cdi command with the specified logger
@ -150,7 +149,7 @@ func (m command) run(c *cli.Context, cfg *config) error {
} }
} }
err = writeToOutput(cfg.jsonMode, data, outputTo) err = writeToOutput(cfg.format, data, outputTo)
if err != nil { if err != nil {
return fmt.Errorf("failed to write output: %v", err) return fmt.Errorf("failed to write output: %v", err)
} }
@ -172,13 +171,12 @@ func formatFromFilename(filename string) string {
return "" return ""
} }
func writeToOutput(jsonMode bool, data []byte, output io.Writer) error { func writeToOutput(format string, data []byte, output io.Writer) error {
if !jsonMode { if format == formatYAML {
_, err := output.Write([]byte("---\n")) _, err := output.Write([]byte("---\n"))
if err != nil { if err != nil {
return fmt.Errorf("failed to write YAML separator: %v", err) return fmt.Errorf("failed to write YAML separator: %v", err)
} }
} }
_, err := output.Write(data) _, err := output.Write(data)
if err != nil { if err != nil {