[no-relnote] Set Commands in declaration

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

cmd/nvidia-cdi-hook/main.go

@@ -49,8 +49,6 @@ func main() {
 		Name:    "NVIDIA CDI Hook",
 		Usage:   "Command to structure files for usage inside a container, called as hooks from a container runtime, defined in a CDI yaml file",
 		Version: info.GetVersionString(),
-		// Define the subcommands
-		Commands: commands.New(logger),
 		// Set log-level for all subcommands
 		Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
 			logLevel := logrus.InfoLevel
@@ -74,6 +72,8 @@ func main() {
 			commands.IssueUnsupportedHookWarning(logger, cmd)
 			return nil
 		},
+		// Define the subcommands
+		Commands: commands.New(logger),
 	}
 
 	// Setup the flags for this command

cmd/nvidia-ctk/cdi/cdi.go

@@ -43,12 +43,11 @@ func (m command) build() *cli.Command {
 	cdi := cli.Command{
 		Name:  "cdi",
 		Usage: "Provide tools for interacting with Container Device Interface specifications",
-	}
-
-	cdi.Commands = []*cli.Command{
-		generate.NewCommand(m.logger),
-		transform.NewCommand(m.logger),
-		list.NewCommand(m.logger),
+		Commands: []*cli.Command{
+			generate.NewCommand(m.logger),
+			transform.NewCommand(m.logger),
+			list.NewCommand(m.logger),
+		},
 	}
 
 	return &cdi

cmd/nvidia-ctk/cdi/transform/transform.go

@@ -40,13 +40,12 @@ func (m command) build() *cli.Command {
 	c := cli.Command{
 		Name:  "transform",
 		Usage: "Apply a transform to a CDI specification",
+		Commands: []*cli.Command{
+			root.NewCommand(m.logger),
+		},
 	}
 
 	c.Flags = []cli.Flag{}
 
-	c.Commands = []*cli.Command{
-		root.NewCommand(m.logger),
-	}
-
 	return &c
 }

cmd/nvidia-ctk/config/config.go

@@ -67,6 +67,9 @@ func (m command) build() *cli.Command {
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			return m.run(&opts)
 		},
+		Commands: []*cli.Command{
+			createdefault.NewCommand(m.logger),
+		},
 	}
 
 	c.Flags = []cli.Flag{
@@ -107,10 +110,6 @@ func (m command) build() *cli.Command {
 		},
 	}
 
-	c.Commands = []*cli.Command{
-		createdefault.NewCommand(m.logger),
-	}
-
 	return &c
 }
 

cmd/nvidia-ctk/hook/hook.go

@@ -54,9 +54,8 @@ func (m hookCommand) build() *cli.Command {
 			commands.IssueUnsupportedHookWarning(m.logger, cmd)
 			return nil
 		},
+		Commands: commands.New(m.logger),
 	}
 
-	hook.Commands = commands.New(m.logger)
-
 	return &hook
 }

cmd/nvidia-ctk/info/info.go

@@ -42,7 +42,5 @@ func (m command) build() *cli.Command {
 		Usage: "Provide information about the system",
 	}
 
-	info.Commands = []*cli.Command{}
-
 	return &info
 }

cmd/nvidia-ctk/main.go

@@ -68,6 +68,15 @@ func main() {
 			logger.SetLevel(logLevel)
 			return ctx, nil
 		},
+		// Define the subcommands
+		Commands: []*cli.Command{
+			hook.NewCommand(logger),
+			runtime.NewCommand(logger),
+			infoCLI.NewCommand(logger),
+			cdi.NewCommand(logger),
+			system.NewCommand(logger),
+			config.NewCommand(logger),
+		},
 	}
 
 	// Setup the flags for this command
@@ -87,16 +96,6 @@ func main() {
 		},
 	}
 
-	// Define the subcommands
-	c.Commands = []*cli.Command{
-		hook.NewCommand(logger),
-		runtime.NewCommand(logger),
-		infoCLI.NewCommand(logger),
-		cdi.NewCommand(logger),
-		system.NewCommand(logger),
-		config.NewCommand(logger),
-	}
-
 	// Run the CLI
 	err := c.Run(context.Background(), os.Args)
 	if err != nil {

cmd/nvidia-ctk/runtime/runtime.go

@@ -40,10 +40,9 @@ func (m runtimeCommand) build() *cli.Command {
 	runtime := cli.Command{
 		Name:  "runtime",
 		Usage: "A collection of runtime-related utilities for the NVIDIA Container Toolkit",
-	}
-
-	runtime.Commands = []*cli.Command{
-		configure.NewCommand(m.logger),
+		Commands: []*cli.Command{
+			configure.NewCommand(m.logger),
+		},
 	}
 
 	return &runtime

cmd/nvidia-ctk/system/system.go

@@ -41,11 +41,10 @@ func (m command) build() *cli.Command {
 	system := cli.Command{
 		Name:  "system",
 		Usage: "A collection of system-related utilities for the NVIDIA Container Toolkit",
-	}
-
-	system.Commands = []*cli.Command{
-		devchar.NewCommand(m.logger),
-		devicenodes.NewCommand(m.logger),
+		Commands: []*cli.Command{
+			devchar.NewCommand(m.logger),
+			devicenodes.NewCommand(m.logger),
+		},
 	}
 
 	return &system