Fix issue with get repo info #130 (#132)

* Fixed issue related to #130 * Adding test coverage * Fixed test for clients Changed BaseURL in test from gitlab to github. * Update internal/scm-clients/clients/clients_test.go Co-authored-by: Mor Weinberger <[email protected]> * Update internal/scm-clients/clients/clients_test.go Co-authored-by: Mor Weinberger <[email protected]> * Update internal/scm-clients/clients/clients_test.go Co-authored-by: Mor Weinberger <[email protected]> --------- Co-authored-by: Mor Weinberger <[email protected]>
aquasecurity · Oct 31, 2023 · bf93ebd · bf93ebd
1 parent 31e45b5
commit bf93ebd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/internal/scm-clients/clients/clients.go b/internal/scm-clients/clients/clients.go
@@ -103,8 +103,8 @@ func getRepoInfo(repoFullUrl string) (string, string, string, error) {
 		return "", "", "", fmt.Errorf("missing org/repo in the repository url: %s", repoFullUrl)
 	}
 	repo := path[len(path)-1]
-	namespace := strings.Split(u.Path, repo)[0]
-	trimedNamespace := namespace[1:(len(namespace) - 1)]
+	namespace := strings.Join(path[:len(path)-1], "/")
+	trimedNamespace := strings.TrimLeft(namespace, "/")
 
 	return u.Host, trimedNamespace, repo, nil
 }

diff --git a/internal/scm-clients/clients/clients_test.go b/internal/scm-clients/clients/clients_test.go
@@ -45,6 +45,16 @@ func TestGetRepoInfo(t *testing.T) {
 		RepoUrl:     "https://gitlab.com/rootgroup/subgroup/secondsubgroup/test",
 		ExpectedErr: nil,
 		Expected:    RepoInfo{BaseUrl: "gitlab.com", Namespace: "rootgroup/subgroup/secondsubgroup", Project: "test"},
+	}, {
+		Name:        "gitlab project under sub group with same name as repo",
+		RepoUrl:     "https://gitlab.com/rootgroup/subgroup/secondsubgroup/secondsubgroup",
+		ExpectedErr: nil,
+		Expected:    RepoInfo{BaseUrl: "gitlab.com", Namespace: "rootgroup/subgroup/secondsubgroup", Project: "secondsubgroup"},
+	}, {
+		Name:        "gitlab project under sub org with same name as repo",
+		RepoUrl:     "https://gitlab.com/codekuu/suborg/secondsuborg/secondsuborg",
+		ExpectedErr: nil,
+		Expected:    RepoInfo{BaseUrl: "gitlab.com", Namespace: "codekuu/suborg/secondsuborg", Project: "secondsuborg"},
 	}}
 
 	for _, test := range tests {