Use semver.org regex for publishedVersion validation (#426)

* Use semver.org regex * Add line breaks to regex declaration
GoogleCloudPlatform · Nov 6, 2019 · b2c3337 · b2c3337
1 parent 938918b
commit b2c3337
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/marketplace/deployer_util/config_helper.py b/marketplace/deployer_util/config_helper.py
@@ -23,7 +23,11 @@
 import yaml
 
 NAME_RE = re.compile(r'[a-zA-z0-9_\.\-]+$')
-SEMVER_RE = re.compile(r'^[0-9]+\.[0-9]+\.([^.]+)$')
+# Suggested from https://semver.org
+SEMVER_RE = re.compile(r'^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)'
+                       '(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)'
+                       '(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?'
+                       '(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
 
 XGOOGLE = 'x-google-marketplace'
 XTYPE_NAME = 'NAME'

diff --git a/marketplace/deployer_util/config_helper_test.py b/marketplace/deployer_util/config_helper_test.py
@@ -689,7 +689,7 @@ def test_v2_fields(self):
 
           applicationApiVersion: v1beta1
 
-          publishedVersion: 6.5.130
+          publishedVersion: 6.5.130-metadata
           publishedVersionMetadata:
             releaseNote: Bug fixes
             releaseTypes:
@@ -718,7 +718,8 @@ def test_v2_fields(self):
     self.assertTrue(schema.x_google_marketplace.is_v2())
     self.assertEqual(schema.x_google_marketplace.app_api_version, 'v1beta1')
 
-    self.assertEqual(schema.x_google_marketplace.published_version, '6.5.130')
+    self.assertEqual(schema.x_google_marketplace.published_version,
+                     '6.5.130-metadata')
     version_meta = schema.x_google_marketplace.published_version_meta
     self.assertEqual(version_meta.release_note, 'Bug fixes')
     self.assertListEqual(version_meta.release_types, ['BUG_FIX'])