Merge pull request #316 from drone/IAC-2201

fix: [IAC-2201]: fixed looping endless pagination
drone · Jul 17, 2024 · efdcec6 · efdcec6
2 parents ecdc44a + be67dd5
commit efdcec6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scm/driver/bitbucket/git.go b/scm/driver/bitbucket/git.go
@@ -88,11 +88,12 @@ func (s *gitService) ListTags(ctx context.Context, repo string, opts scm.ListOpt
 	out := new(branches)
 	res, err := s.client.do(ctx, "GET", path, nil, &out)
 
+	copyPagination(out.pagination, res)
+
 	if res != nil {
 		res.Page.Next = 0
 	}
 
-	copyPagination(out.pagination, res)
 	return convertTagList(out), res, err
 }
 

diff --git a/scm/driver/bitbucket/git_test.go b/scm/driver/bitbucket/git_test.go
@@ -250,7 +250,7 @@ func TestGitListTags(t *testing.T) {
 		File("testdata/tags.json")
 
 	client, _ := New("https://api.bitbucket.org")
-	got, res, err := client.Git.ListTags(context.Background(), "atlassian/atlaskit", scm.ListOptions{Page: 1, Size: 30})
+	got, _, err := client.Git.ListTags(context.Background(), "atlassian/atlaskit", scm.ListOptions{Page: 1, Size: 30})
 	if err != nil {
 		t.Error(err)
 	}
@@ -264,7 +264,6 @@ func TestGitListTags(t *testing.T) {
 		t.Log(diff)
 	}
 
-	t.Run("Page", testPage(res))
 }
 
 func TestGitListChanges(t *testing.T) {