Skip to content

fix: bitbucket server search not working #7418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d4x1 merged 1 commit into from
Apr 30, 2024
Merged

fix: bitbucket server search not working #7418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions backend/plugins/bitbucket_server/api/remote_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package api
import (
"fmt"
"net/url"
"strings"

"github.com/apache/incubator-devlake/core/errors"
"github.com/apache/incubator-devlake/core/plugin"
Expand Down Expand Up @@ -197,17 +196,10 @@ func searchBitbucketServerRepos(apiClient plugin.ApiClient, params *dsmodels.DsR
Start: 0,
Limit: 1,
})
s := params.Search
gid, searchName := getSearch(s)

queryString := fmt.Sprintf("name=%s", searchName)
if len(gid) > 0 {
queryString = fmt.Sprintf("&projectkey=%s", gid)
}
query.Set("q", queryString)
query.Set("name", params.Search)

// list repos part
res, err := apiClient.Get("rest/api/1.0/repos", query, nil)
res, err := apiClient.Get("rest/api/latest/repos", query, nil)
if err != nil {
return nil, err
}
Expand All @@ -233,23 +225,6 @@ func searchBitbucketServerRepos(apiClient plugin.ApiClient, params *dsmodels.DsR
return children, nil
}

func getSearch(s string) (string, string) {
gid := ""
if strings.Contains(s, "/") {
parts := strings.Split(s, "/")
if len(parts) == 2 {
// KEY/repo
gid = parts[0]
s = strings.Join(parts[1:], "/")
} else if len(parts) >= 3 {
// KEY/repos/repo
gid = parts[0]
s = strings.Join(parts[2:], "/")
}
}
return gid, s
}

func initialQuery(page BitBucketServerRemotePagination) url.Values {
query := url.Values{}
query.Set("start", fmt.Sprintf("%v", page.Start))
Expand Down