Fix: Import semver package for version validation

- Use semver.parse on CSV version field

This adds support for versions that use a string after the semver.
Eg: '0.10.1', '5.4.3-alpha1' and '0.0.3-beta5+build.3' are valid

Author: Sami Shahin

Pipfile

@@ -4,12 +4,11 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-
 validators = "*"
 requests = "*"
 pytest = "*"
 pyyaml = "*"
 twine = "*"
-
+semver = "*"
 
 [dev-packages]

Pipfile.lock

@@ -1,6 +1,6 @@
 import logging
 import json
-import re
+import semver
 
 import validators as v
 
@@ -386,9 +386,11 @@ def is_email(field):
             return True
 
         def is_version(field):
-            pattern1 = re.compile(r'v(\d+\.)(\d+\.)(\d)')
-            pattern2 = re.compile(r'(\d+\.)(\d+\.)(\d)')
-            return pattern1.match(field) or pattern2.match(field)
+            try:
+                semver.parse(field)
+            except ValueError:
+                return False
+            return True
 
         def is_capability_level(field):
             levels = [
@@ -477,8 +479,8 @@ def is_mediatype(mediatype):
 
         # version check
         if not is_version(spec["version"]):
-            self._log_error("spec.version %s is not a valid version "
-                            "(example of a valid version is: v1.0.12)",
+            self._log_error("spec.version %s is not a valid semver "
+                            "(example of a valid version is: 1.0.12)",
                             spec["version"])
             valid = False
 

operatorcourier/validate.py

@@ -24,7 +24,8 @@
   install_requires=[
     'pyyaml',
     'requests',
-    'validators'
+    'validators',
+    'semver'
   ],
   python_requires='>=3.6, <4',
   setup_requires=['pytest-runner'],

setup.py

@@ -46,7 +46,7 @@ def test_ui_valid_bundle_io(bundle, expected_validation_results_dict):
             {'errors': [
                 "csv.spec.links must be a list of name & url pairs.",
                 "spec.version invalid is not a valid version "
-                "(example of a valid version is: v1.0.12)",
+                "(example of a valid version is: 1.0.12)",
                 "spec.icon[0].mediatype image/invalid is not "
                 "a valid mediatype. It must be one of \"image/gif\", "
                 "\"image/jpeg\", \"image/png\", \"image/svg+xml\"",