Skip to content

Update VIP-specific descriptor checks #47

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

Open
ngeorges-cnrs wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update VIP-specific descriptor checks #47

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
9 changes: 7 additions & 2 deletions vipapps/vipapps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,18 @@ def load_descriptor(filepath, silent=False) -> dict:
rawtext = f.read()
f.seek(0)
desc = json.load(f)
# VIP-specific checks, in addition to "bosh validate".
# These rules should be kept similar to those in VIP-portal/BoutiquesParser.java.
appname = desc["name"]
appversion = desc["tool-version"]
# check name and version strings
if not re.match(r"^[a-zA-Z0-9_\. +-]+$", appname):
# check mandatory fields, and name+version content
if not re.match(r"^[a-zA-Z0-9_\.@ +-]+$", appname):
raise ValueError("invalid name '%s'" % appname)
if not re.match(r"^[a-zA-Z0-9_\.@ +-]+$", appversion):
raise ValueError("invalid version '%s'" % appversion)
# author field mandatory
if "author" not in desc:
raise ValueError("%s: missing author" % filepath)
# check container-image (just warnings)
if not silent:
if not "container-image" in desc:
Expand Down