allow loose pre-release identifiers

HackerHappyHour · Nov 28, 2020 · 601b0fc · 601b0fc
1 parent 9f4d522
commit 601b0fc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/__tests__/__data__/taggingStrategy.js b/__tests__/__data__/taggingStrategy.js
@@ -31,4 +31,16 @@ exports.scenarios = [
     '1-rc1,1.0-rc1,1.0.0-rc1',
     {inputTags:'%X%,%X.Y%,%X.Y.Z%', tagName:'1.0.0rc1'}
   ],
+  [
+    '1-rc1-foobar,1.0-rc1-foobar,1.0.0-rc1-foobar',
+    {inputTags:'%X%-foobar,%X.Y%-foobar,%X.Y.Z%-foobar', tagName:'1.0.0rc1'}
+  ],
+  [
+    'hello/world:1-rc1-foobar,hello/world:1.0-rc1-foobar,hello/world:1.0.0-rc1-foobar',
+    {inputTags:'%X%-foobar,%X.Y%-foobar,%X.Y.Z%-foobar', tagName:'1.0.0rc1', imageName: 'hello/world'}
+  ],
+  [
+    'hello/world:1-rc1-foobar,hello/world:1.0-rc1-foobar,hello/world:1.0.0-rc1-foobar,hello/world:latest',
+    {latest: true, inputTags:'%X%-foobar,%X.Y%-foobar,%X.Y.Z%-foobar', tagName:'1.0.0rc1', imageName: 'hello/world'}
+  ],
 ]
diff --git a/dist/index.js b/dist/index.js
@@ -7982,7 +7982,7 @@ exports.parseTag = (pattern, tag) => {
 
     // if 'tag' is valid, attempt to parse it
   // otherwise error: value is not valid or cannot be coerced
-  var parsedTag = s.parse(tag, {includePrerelease: true})
+  var parsedTag = s.parse(s.clean(tag, {loose: true}), {includePrerelease: true})
   if (!parsedTag){
     parsedTag = s.parse(s.valid(s.coerce(tag)))
     if (!parsedTag) return {error: invalidTag}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tagging-strategy",
-  "version": "2.0.0-rc2",
+  "version": "2.1.0",
   "description": "A github action for specifying tagging strategies for docker images using semver or other common docker tags",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/parser.js b/src/parser.js
@@ -12,7 +12,7 @@ exports.parseTag = (pattern, tag) => {
 
     // if 'tag' is valid, attempt to parse it
   // otherwise error: value is not valid or cannot be coerced
-  var parsedTag = s.parse(tag, {includePrerelease: true})
+  var parsedTag = s.parse(s.clean(tag, {loose: true}), {includePrerelease: true})
   if (!parsedTag){
     parsedTag = s.parse(s.valid(s.coerce(tag)))
     if (!parsedTag) return {error: invalidTag}