From d3dd72e400d170c6e498abe94c54f00ee940cdf7 Mon Sep 17 00:00:00 2001
From: Mohit Garg <mohit.garg@harness.io>
Date: Tue, 22 Feb 2022 22:11:29 +0530
Subject: [PATCH] Bitbucket list files fix (#154)

* if input page args has url, then it should be used to fetch list of files
---
 scm/driver/bitbucket/content.go      |  4 ++++
 scm/driver/bitbucket/content_test.go | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/scm/driver/bitbucket/content.go b/scm/driver/bitbucket/content.go
index eda337ad7..3501de53f 100644
--- a/scm/driver/bitbucket/content.go
+++ b/scm/driver/bitbucket/content.go
@@ -83,6 +83,10 @@ func (s *contentService) Delete(ctx context.Context, repo, path string, params *
 
 func (s *contentService) List(ctx context.Context, repo, path, ref string, opts scm.ListOptions) ([]*scm.ContentInfo, *scm.Response, error) {
 	endpoint := fmt.Sprintf("/2.0/repositories/%s/src/%s/%s?%s", repo, ref, path, encodeListOptions(opts))
+	if opts.URL != "" {
+		endpoint = opts.URL
+	}
+
 	out := new(contents)
 	res, err := s.client.do(ctx, "GET", endpoint, nil, out)
 	copyPagination(out.pagination, res)
diff --git a/scm/driver/bitbucket/content_test.go b/scm/driver/bitbucket/content_test.go
index 3ec8083cd..7c16f4e7e 100644
--- a/scm/driver/bitbucket/content_test.go
+++ b/scm/driver/bitbucket/content_test.go
@@ -240,3 +240,29 @@ func TestContentList(t *testing.T) {
 		t.Log(diff)
 	}
 }
+
+func TestContentListWithUrlInput(t *testing.T) {
+	defer gock.Off()
+
+	mockNextPageUri := "https://api.bitbucket.org/2.0/repositories/atlassian/atlaskit/src/master/packages/activity?pageLen=3&page=RPfL"
+
+	gock.New(mockNextPageUri).
+		Reply(200).
+		Type("application/json").
+		File("testdata/content_list.json")
+
+	client, _ := New("https://api.bitbucket.org")
+	got, _, err := client.Contents.List(context.Background(), "atlassian/atlaskit", "packages/activity", "master", scm.ListOptions{URL: mockNextPageUri})
+	if err != nil {
+		t.Error(err)
+	}
+
+	want := []*scm.ContentInfo{}
+	raw, _ := ioutil.ReadFile("testdata/content_list.json.golden")
+	json.Unmarshal(raw, &want)
+
+	if diff := cmp.Diff(got, want); diff != "" {
+		t.Errorf("Unexpected Results")
+		t.Log(diff)
+	}
+}