fix(2952): Allow colon to be used in root directory (#544)

screwdriver-cd · Nov 30, 2023 · a6e452d · a6e452d
1 parent 2c89a71
commit a6e452d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/regex.js b/config/regex.js
@@ -94,7 +94,7 @@ module.exports = {
         /^(?:(?:https:\/\/(?:[^@/:\s]+@)?)|git@|org-\d+@)+([^/:\s]+)(?:\/|:)([^/:\s]+)\/([^\s]+?)(?:\.git)(#[^:　\s]*　[^:　\s]*|#[^:　\s]+)?(:[^:　\s]*　[^:　\s]*|:[^:　\s]+)?$/,
     // scmUri. For example: github.com:abc-123:master or bitbucket.org:{123}:master
     // Optionally, can have rootDir. For example: github.com:abc-123:master:src/app/component
-    SCM_URI: /^([^:]+):([^:]+):([^:]+)(?::([^:]+))?$/,
+    SCM_URI: /^([^:]+):([^:]+):([^:]+)(?::(.*))?$/,
     // SCM context. For example: github:github.com, gitlab:gitlab.mycompany.com
     // First group: SCM plugin name (e.g. github)
     // Second group: SCM host name (e.g. github.com)

diff --git a/test/config/regex.test.js b/test/config/regex.test.js
@@ -452,12 +452,12 @@ describe('config regex', () => {
         it('checks good scmUri', () => {
             assert.isTrue(config.regex.SCM_URI.test('github.com:abc-123:master'));
             assert.isTrue(config.regex.SCM_URI.test('github.com:abc-123:master:src/app/component'));
+            assert.isTrue(config.regex.SCM_URI.test('github.com:abc-123:master:a:b:c'));
             assert.isTrue(config.regex.SCM_URI.test('bitbucket.org:d2lam/{123}:master'));
         });
 
         it('fails on bad scmUri', () => {
             assert.isFalse(config.regex.SCM_URI.test('github.com:master'));
-            assert.isFalse(config.regex.SCM_URI.test('github.com:master:a:b:c'));
             assert.isFalse(config.regex.SCM_URI.test('bitbucket.org:{123}'));
         });
     });