diff options
Diffstat (limited to 'vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/cdi/qualified-device.go')
-rw-r--r-- | vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/cdi/qualified-device.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/cdi/qualified-device.go b/vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/cdi/qualified-device.go index 54f19143c..ccfab7094 100644 --- a/vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/cdi/qualified-device.go +++ b/vendor/github.com/container-orchestrated-devices/container-device-interface/pkg/cdi/qualified-device.go @@ -130,7 +130,7 @@ func ValidateVendorName(vendor string) error { } } if !isAlphaNumeric(rune(vendor[len(vendor)-1])) { - return errors.Errorf("invalid vendor %q, should end with letter", vendor) + return errors.Errorf("invalid vendor %q, should end with a letter or digit", vendor) } return nil @@ -158,7 +158,7 @@ func ValidateClassName(class string) error { } } if !isAlphaNumeric(rune(class[len(class)-1])) { - return errors.Errorf("invalid class %q, should end with letter", class) + return errors.Errorf("invalid class %q, should end with a letter or digit", class) } return nil } @@ -172,8 +172,11 @@ func ValidateDeviceName(name string) error { if name == "" { return errors.Errorf("invalid (empty) device name") } - if !isLetter(rune(name[0])) { - return errors.Errorf("invalid name %q, should start with letter", name) + if !isAlphaNumeric(rune(name[0])) { + return errors.Errorf("invalid class %q, should start with a letter or digit", name) + } + if len(name) == 1 { + return nil } for _, c := range string(name[1 : len(name)-1]) { switch { @@ -185,7 +188,7 @@ func ValidateDeviceName(name string) error { } } if !isAlphaNumeric(rune(name[len(name)-1])) { - return errors.Errorf("invalid name %q, should start with letter", name) + return errors.Errorf("invalid name %q, should end with a letter or digit", name) } return nil } |