[no-relnote] Define struct for csv-specific options

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

Author: elezar

pkg/nvcdi/lib-csv.go

@@ -33,14 +33,28 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/discover"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/edits"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra"
+	"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra/csv"
 )
 
-type csvlib nvcdilib
+type csvOptions struct {
+	Files          []string
+	IgnorePatterns []string
+}
 
+type csvlib nvcdilib
 type mixedcsvlib nvcdilib
 
 var _ deviceSpecGeneratorFactory = (*csvlib)(nil)
 
+// asCSVLib sets any CSV-specific defaults and casts the nvcdilib instance as a
+// *csvlib.
+func (l *nvcdilib) asCSVLib() *csvlib {
+	if len(l.csv.Files) == 0 {
+		l.csv.Files = csv.DefaultFileList()
+	}
+	return (*csvlib)(l)
+}
+
 // DeviceSpecGenerators creates a set of generators for the specified set of
 // devices.
 // If NVML is not available or the disable-multiple-csv-devices feature flag is
@@ -171,7 +185,7 @@ func (l *csvDeviceGenerator) deviceNodeDiscoverer() (discover.Discover, error) {
 
 func (l *csvDeviceGenerator) deviceNodeMountSpecs() tegra.MountSpecPathsByTyper {
 	mountSpecs := tegra.Transform(
-		tegra.MountSpecsFromCSVFiles(l.logger, l.csvFiles...),
+		tegra.MountSpecsFromCSVFiles(l.logger, l.csv.Files...),
 		// We remove non-device nodes.
 		tegra.OnlyDeviceNodes(),
 	)
@@ -388,10 +402,10 @@ func isIntegratedGPU(d nvml.Device) (bool, error) {
 func (l *csvlib) driverDiscoverer() (discover.Discover, error) {
 	mountSpecs := tegra.Transform(
 		tegra.Transform(
-			tegra.MountSpecsFromCSVFiles(l.logger, l.csvFiles...),
+			tegra.MountSpecsFromCSVFiles(l.logger, l.csv.Files...),
 			tegra.WithoutDeviceNodes(),
 		),
-		tegra.IgnoreSymlinkMountSpecsByPattern(l.csvIgnorePatterns...),
+		tegra.IgnoreSymlinkMountSpecsByPattern(l.csv.IgnorePatterns...),
 	)
 	driverDiscoverer, err := tegra.New(
 		tegra.WithLogger(l.logger),

pkg/nvcdi/lib-csv_test.go

@@ -188,7 +188,7 @@ func TestDeviceSpecGenerators(t *testing.T) {
 
 		tc.lib.driverRoot = driverRoot
 		tc.lib.devRoot = driverRoot
-		tc.lib.csvFiles = []string{
+		tc.lib.csv.Files = []string{
 			filepath.Join(driverRoot, "/etc/nvidia-container-runtime/host-files-for-container.d/devices.csv"),
 			filepath.Join(driverRoot, "/etc/nvidia-container-runtime/host-files-for-container.d/drivers.csv"),
 		}

pkg/nvcdi/lib.go

@@ -27,7 +27,6 @@ import (
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup/root"
 	"github.com/NVIDIA/nvidia-container-toolkit/internal/nvsandboxutils"
-	"github.com/NVIDIA/nvidia-container-toolkit/internal/platform-support/tegra/csv"
 	"github.com/NVIDIA/nvidia-container-toolkit/pkg/nvcdi/transform"
 )
 
@@ -45,8 +44,7 @@ type nvcdilib struct {
 	configSearchPaths  []string
 	librarySearchPaths []string
 
-	csvFiles          []string
-	csvIgnorePatterns []string
+	csv csvOptions
 
 	vendor string
 	class  string
@@ -115,10 +113,7 @@ func New(opts ...Option) (Interface, error) {
 	var factory deviceSpecGeneratorFactory
 	switch l.resolveMode() {
 	case ModeCSV:
-		if len(l.csvFiles) == 0 {
-			l.csvFiles = csv.DefaultFileList()
-		}
-		factory = (*csvlib)(l)
+		factory = l.asCSVLib()
 	case ModeManagement:
 		if l.vendor == "" {
 			l.vendor = "management.nvidia.com"

pkg/nvcdi/options.go

@@ -131,14 +131,14 @@ func WithMergedDeviceOptions(opts ...transform.MergedDeviceOption) Option {
 // WithCSVFiles sets the CSV files for the library
 func WithCSVFiles(csvFiles []string) Option {
 	return func(o *nvcdilib) {
-		o.csvFiles = csvFiles
+		o.csv.Files = csvFiles
 	}
 }
 
 // WithCSVIgnorePatterns sets the ignore patterns for entries in the CSV files.
 func WithCSVIgnorePatterns(csvIgnorePatterns []string) Option {
 	return func(o *nvcdilib) {
-		o.csvIgnorePatterns = csvIgnorePatterns
+		o.csv.IgnorePatterns = csvIgnorePatterns
 	}
 }