UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-05-12 15:51:41 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Skip nil discoverers in merge

Browse Source 
When constructing a list of discoverers using discover.Merge we
explicitly skip `nil` discoverers to simplify usage as we don't
have to explicitly check validity when processing the discoverers
in the list.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2025-04-29 15:51:35 +02:00
parent de3d736663
commit 0c765c6536
No known key found for this signature in database
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/discover/list.go
View File

@ -21,26 +21,28 @@ import "fmt"
// list is a discoverer that contains a list of Discoverers. The output of the // list is a discoverer that contains a list of Discoverers. The output of the
// Mounts functions is the concatenation of the output for each of the // Mounts functions is the concatenation of the output for each of the
// elements in the list. // elements in the list.
type list struct { type list []Discover
discoverers []Discover
}
var _ Discover = (*list)(nil) var _ Discover = (*list)(nil)
// Merge creates a discoverer that is the composite of a list of discoverers. // Merge creates a discoverer that is the composite of a list of discoverers.
func Merge(d ...Discover) Discover { func Merge(discoverers ...Discover) Discover {
l := list{ var l list
discoverers: d, for _, d := range discoverers {
if d == nil {
continue
}
l = append(l, d)
} }
return &l return l
} }
// Devices returns all devices from the included discoverers // Devices returns all devices from the included discoverers
func (d list) Devices() ([]Device, error) { func (d list) Devices() ([]Device, error) {
var allDevices []Device var allDevices []Device
for i, di := range d.discoverers { for i, di := range d {
devices, err := di.Devices() devices, err := di.Devices()
if err != nil { if err != nil {
return nil, fmt.Errorf("error discovering devices for discoverer %v: %v", i, err) return nil, fmt.Errorf("error discovering devices for discoverer %v: %v", i, err)
@ -55,7 +57,7 @@ func (d list) Devices() ([]Device, error) {
func (d list) Mounts() ([]Mount, error) { func (d list) Mounts() ([]Mount, error) {
var allMounts []Mount var allMounts []Mount
for i, di := range d.discoverers { for i, di := range d {
mounts, err := di.Mounts() mounts, err := di.Mounts()
if err != nil { if err != nil {
return nil, fmt.Errorf("error discovering mounts for discoverer %v: %v", i, err) return nil, fmt.Errorf("error discovering mounts for discoverer %v: %v", i, err)
@ -70,7 +72,7 @@ func (d list) Mounts() ([]Mount, error) {
func (d list) Hooks() ([]Hook, error) { func (d list) Hooks() ([]Hook, error) {
var allHooks []Hook var allHooks []Hook
for i, di := range d.discoverers { for i, di := range d {
hooks, err := di.Hooks() hooks, err := di.Hooks()
if err != nil { if err != nil {
return nil, fmt.Errorf("error discovering hooks for discoverer %v: %v", i, err) return nil, fmt.Errorf("error discovering hooks for discoverer %v: %v", i, err)