Merge pull request #261 from adivishy1/master

[feat]: [CDS-73572]: Support List Repo Live Search for all git providers

Author: rajatharanganath

scm/client.go

@@ -75,6 +75,19 @@ type (
 		PageListOptions ListOptions
 	}
 
+	// RepoListOptions specifies optional repo search term and pagination
+	// parameters.
+	RepoListOptions struct {
+		ListOptions
+		RepoSearchTerm
+	}
+
+	// RepoSearchTerm specifies searchable parameters.
+	RepoSearchTerm struct {
+		RepoName string
+		User     string
+	}
+
 	// ListOptions specifies optional pagination
 	// parameters.
 	ListOptions struct {

scm/driver/azure/git_test.go

@@ -130,7 +130,7 @@ func TestGitListBranchesV2(t *testing.T) {
 		Get("/ORG/PROJ/_apis/git/repositories/REPOID/").
 		Reply(200).
 		Type("application/json").
-		File("testdata/branchesFilter.json")
+		File("testdata/branches_filter.json")
 
 	client := NewDefault("ORG", "PROJ")
 	got, _, err := client.Git.ListBranchesV2(context.Background(), "REPOID", scm.BranchListOptions{SearchTerm: "main"})
@@ -140,7 +140,7 @@ func TestGitListBranchesV2(t *testing.T) {
 	}
 
 	want := []*scm.Reference{}
-	raw, _ := ioutil.ReadFile("testdata/branchesFilter.json.golden")
+	raw, _ := ioutil.ReadFile("testdata/branches_filter.json.golden")
 	_ = json.Unmarshal(raw, &want)
 
 	if diff := cmp.Diff(got, want); diff != "" {

scm/driver/azure/repo.go

@@ -56,6 +56,12 @@ func (s *RepositoryService) List(ctx context.Context, opts scm.ListOptions) ([]*
 	return convertRepositoryList(out), res, err
 }
 
+// ListV2 returns the user repository list.
+func (s *RepositoryService) ListV2(ctx context.Context, opts scm.RepoListOptions) ([]*scm.Repository, *scm.Response, error) {
+	// Azure does not support search filters, hence calling List api without search filtering
+	return s.List(ctx, opts.ListOptions)
+}
+
 // ListHooks returns a list or repository hooks.
 func (s *RepositoryService) ListHooks(ctx context.Context, repo string, opts scm.ListOptions) ([]*scm.Hook, *scm.Response, error) {
 	// https://docs.microsoft.com/en-us/rest/api/azure/devops/hooks/subscriptions/list?view=azure-devops-rest-6.0

scm/driver/azure/testdata/branchesFilter.json renamed to scm/driver/azure/testdata/branches_filter.json

@@ -216,20 +216,19 @@ func TestGitListBranchesV2(t *testing.T) {
 		MatchParam("pagelen", "30").
 		Reply(200).
 		Type("application/json").
-		File("testdata/branchesFilter.json")
+		File("testdata/branches_filter.json")
 
 	client, _ := New("https://api.bitbucket.org")
-	got, res, err := client.Git.ListBranchesV2(context.Background(), "atlassian/stash-example-plugin", scm.BranchListOptions{SearchTerm: "mast", PageListOptions: struct {
-		URL  string
-		Page int
-		Size int
-	}{Page: 1, Size: 30}})
+	got, res, err := client.Git.ListBranchesV2(context.Background(), "atlassian/stash-example-plugin", scm.BranchListOptions{
+		SearchTerm:      "mast",
+		PageListOptions: scm.ListOptions{Page: 1, Size: 30},
+	})
 	if err != nil {
 		t.Error(err)
 	}
 
 	want := []*scm.Reference{}
-	raw, _ := ioutil.ReadFile("testdata/branchesFilter.json.golden")
+	raw, _ := ioutil.ReadFile("testdata/branches_filter.json.golden")
 	json.Unmarshal(raw, &want)
 
 	if diff := cmp.Diff(got, want); diff != "" {

scm/driver/azure/testdata/branchesFilter.json.golden renamed to scm/driver/azure/testdata/branches_filter.json.golden

@@ -105,6 +105,18 @@ func (s *repositoryService) List(ctx context.Context, opts scm.ListOptions) ([]*
 	return convertRepositoryList(out), res, err
 }
 
+// ListV2 returns the user repository list based on the searchTerm passed.
+func (s *repositoryService) ListV2(ctx context.Context, opts scm.RepoListOptions) ([]*scm.Repository, *scm.Response, error) {
+	path := fmt.Sprintf("2.0/repositories?%s", encodeRepoListOptions(opts))
+	if opts.ListOptions.URL != "" {
+		path = opts.ListOptions.URL
+	}
+	out := new(repositories)
+	res, err := s.client.do(ctx, "GET", path, nil, &out)
+	copyPagination(out.pagination, res)
+	return convertRepositoryList(out), res, err
+}
+
 // ListHooks returns a list or repository hooks.
 func (s *repositoryService) ListHooks(ctx context.Context, repo string, opts scm.ListOptions) ([]*scm.Hook, *scm.Response, error) {
 	path := fmt.Sprintf("2.0/repositories/%s/hooks?%s", repo, encodeListOptions(opts))

scm/driver/bitbucket/git_test.go

@@ -136,6 +136,37 @@ func TestRepositoryList(t *testing.T) {
 	}
 }
 
+func TestRepositoryListV2(t *testing.T) {
+	defer gock.Off()
+
+	gock.New("https://api.bitbucket.org").
+		Get("/2.0/repositories").
+		MatchParam("q", "name~\\\"plugin1\\\"").
+		MatchParam("role", "member").
+		Reply(200).
+		Type("application/json").
+		File("testdata/repos_filter.json")
+
+	got := []*scm.Repository{}
+	opts := scm.RepoListOptions{RepoSearchTerm: scm.RepoSearchTerm{RepoName: "plugin1"}}
+	client, _ := New("https://api.bitbucket.org")
+
+	repos, _, err := client.Repositories.ListV2(context.Background(), opts)
+	if err != nil {
+		t.Error(err)
+	}
+	got = append(got, repos...)
+
+	want := []*scm.Repository{}
+	raw, _ := ioutil.ReadFile("testdata/repos_filter.json.golden")
+	json.Unmarshal(raw, &want)
+
+	if diff := cmp.Diff(got, want); diff != "" {
+		t.Errorf("Unexpected Results")
+		t.Log(diff)
+	}
+}
+
 func TestStatusList(t *testing.T) {
 	defer gock.Off()