From 20d3bb189b22bbb1738c1d0e3a681064a77fc346 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 6 Mar 2023 11:00:12 +0200
Subject: [PATCH] Rename --discovery-mode to --mode

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 cmd/nvidia-ctk/cdi/generate/generate.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd/nvidia-ctk/cdi/generate/generate.go b/cmd/nvidia-ctk/cdi/generate/generate.go
index c235c90f..b9492cac 100644
--- a/cmd/nvidia-ctk/cdi/generate/generate.go
+++ b/cmd/nvidia-ctk/cdi/generate/generate.go
@@ -48,7 +48,7 @@ type config struct {
 	deviceNameStrategy string
 	driverRoot         string
 	nvidiaCTKPath      string
-	discoveryMode      string
+	mode               string
 }
 
 // NewCommand constructs a generate-cdi command with the specified logger
@@ -88,10 +88,11 @@ func (m command) build() *cli.Command {
 			Destination: &cfg.format,
 		},
 		&cli.StringFlag{
-			Name:        "discovery-mode",
+			Name:        "mode",
+			Aliases:     []string{"discovery-mode"},
 			Usage:       "The mode to use when discovering the available entities. One of [auto | nvml | wsl]. If mode is set to 'auto' the mode will be determined based on the system configuration.",
 			Value:       nvcdi.ModeAuto,
-			Destination: &cfg.discoveryMode,
+			Destination: &cfg.mode,
 		},
 		&cli.StringFlag{
 			Name:        "device-name-strategy",
@@ -124,13 +125,13 @@ func (m command) validateFlags(c *cli.Context, cfg *config) error {
 		return fmt.Errorf("invalid output format: %v", cfg.format)
 	}
 
-	cfg.discoveryMode = strings.ToLower(cfg.discoveryMode)
-	switch cfg.discoveryMode {
+	cfg.mode = strings.ToLower(cfg.mode)
+	switch cfg.mode {
 	case nvcdi.ModeAuto:
 	case nvcdi.ModeNvml:
 	case nvcdi.ModeWsl:
 	default:
-		return fmt.Errorf("invalid discovery mode: %v", cfg.discoveryMode)
+		return fmt.Errorf("invalid discovery mode: %v", cfg.mode)
 	}
 
 	_, err := nvcdi.NewDeviceNamer(cfg.deviceNameStrategy)
@@ -203,7 +204,7 @@ func (m command) generateSpec(cfg *config) (spec.Interface, error) {
 		nvcdi.WithDeviceNamer(deviceNamer),
 		nvcdi.WithDeviceLib(devicelib),
 		nvcdi.WithNvmlLib(nvmllib),
-		nvcdi.WithMode(string(cfg.discoveryMode)),
+		nvcdi.WithMode(string(cfg.mode)),
 	)
 
 	deviceSpecs, err := cdilib.GetAllDeviceSpecs()