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

screwdriver-cd · Nov 30, 2023 · ec83f2e · ec83f2e
1 parent 23cc7ab
commit ec83f2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/launch.go b/launch.go
@@ -205,7 +205,7 @@ func parseScmURI(scmURI, scmName string) (scmPath, error) {
 	uri := strings.Split(scmURI, ":")
 	orgRepo := strings.Split(scmName, "/")
 
-	if (len(uri) != 3 && len(uri) != 4) || len(orgRepo) != 2 {
+	if len(uri) < 3 || len(orgRepo) != 2 {
 		return scmPath{}, fmt.Errorf("Unable to parse scmUri %v and scmName %v", scmURI, scmName)
 	}
 
@@ -218,7 +218,7 @@ func parseScmURI(scmURI, scmName string) (scmPath, error) {
 	}
 
 	if len(uri) > 3 {
-		parsed.RootDir = uri[3]
+		parsed.RootDir = strings.Join(uri[3:], ":")
 	}
 
 	return parsed, nil

diff --git a/launch_test.go b/launch_test.go
@@ -419,9 +419,9 @@ func TestParseScmURI(t *testing.T) {
 	wantOrg := "screwdriver-cd"
 	wantRepo := "launcher"
 	wantBranch := "master"
-	wantRootDir := "childDirectory"
+	wantRootDir := "child:Directory"
 
-	scmURI := "github.com:123456:master:childDirectory"
+	scmURI := "github.com:123456:master:child:Directory"
 	scmName := "screwdriver-cd/launcher"
 	parsedURL, err := parseScmURI(scmURI, scmName)
 	host, org, repo, branch, rootDir := parsedURL.Host, parsedURL.Org, parsedURL.Repo, parsedURL.Branch, parsedURL.RootDir