Add validateVersion helper to spec validation

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

pkg/cdi/spec.go

@@ -131,8 +131,8 @@ func (s *Spec) edits() *ContainerEdits {
 
 // Validate the Spec.
 func (s *Spec) validate() (map[string]*Device, error) {
-	if _, ok := validSpecVersions[s.Version]; !ok {
-		return nil, errors.Errorf("invalid version %q", s.Version)
+	if err := validateVersion(s.Version); err != nil {
+		return nil, err
 	}
 	if err := ValidateVendorName(s.vendor); err != nil {
 		return nil, err
@@ -159,6 +159,15 @@ func (s *Spec) validate() (map[string]*Device, error) {
 	return devices, nil
 }
 
+// validateVersion checks whether the specified spec version is supported.
+func validateVersion(version string) error {
+	if _, ok := validSpecVersions[version]; !ok {
+		return errors.Errorf("invalid version %q", version)
+	}
+
+	return nil
+}
+
 // Parse raw CDI Spec file data.
 func parseSpec(data []byte) (*cdi.Spec, error) {
 	raw := &cdi.Spec{}

pkg/cdi/spec_test.go

@@ -346,3 +346,7 @@ func mkTestFile(t *testing.T, data []byte) (string, error) {
 	tmp.Close()
 	return file, nil
 }
+
+func TestCurrentVersionIsValid(t *testing.T) {
+	require.NoError(t, validateVersion(cdi.CurrentVersion))
+}