Skip to content

Fix: Expand regular expression for version #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinrizza merged 1 commit into from
Mar 29, 2019
+42 −18
Merged

Fix: Expand regular expression for version #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ verify_ssl = true
name = "pypi"

[packages]

validators = "*"
requests = "*"
pytest = "*"
pyyaml = "*"
twine = "*"

semver = "*"

[dev-packages]
36 changes: 29 additions & 7 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions operatorcourier/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging
import json
import re
import semver

import validators as v

Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -494,8 +496,8 @@ def is_category(category):

# 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 semver is: 1.0.12)",
spec["version"])
valid = False

Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
install_requires=[
'pyyaml',
'requests',
'validators'
'validators',
'semver'
],
python_requires='>=3.6, <4',
setup_requires=['pytest-runner'],
Expand Down
4 changes: 2 additions & 2 deletions tests/test_validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def test_ui_valid_bundle_io(bundle, expected_validation_results_dict):
("tests/test_files/bundles/verification/ui.invalid.bundle.yaml",
{'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)",
"spec.version invalid is not a valid semver "
"(example of a valid semver is: 1.0.12)",
"metadata.annotations.capabilities invalid "
"is not a valid capabilities level",
"spec.icon[0].mediatype image/invalid is not "
Expand Down