merge changes from the forked repo

veziak · veziak · commit 840225b2af01 · 2023-09-06T11:51:28.000+01:00
diff --git a/bitbucket.go b/bitbucket.go
@@ -139,8 +139,10 @@ type pipelines interface {
 }
 
 type RepositoriesOptions struct {
-	Owner string `json:"owner"`
-	Role  string `json:"role"` // role=[owner|admin|contributor|member]
+	Owner   string  `json:"owner"`
+	Role    string  `json:"role"` // role=[owner|admin|contributor|member]
+	Page    *int    `json:"page"`
+	Keyword *string `json:"keyword"`
 }
 
 type RepositoryOptions struct {
@@ -339,6 +341,7 @@ type CommitsOptions struct {
 	Include     string `json:"include"`
 	Exclude     string `json:"exclude"`
 	CommentID   string `json:"comment_id"`
+	Page        *int   `json:"page"`
 }
 
 type CommitStatusOptions struct {
diff --git a/branchrestrictions.go b/branchrestrictions.go
@@ -17,7 +17,7 @@ type BranchRestrictions struct {
 
 func (b *BranchRestrictions) Gets(bo *BranchRestrictionsOptions) (interface{}, error) {
 	urlStr := b.c.requestUrl("/repositories/%s/%s/branch-restrictions", bo.Owner, bo.RepoSlug)
-	return b.c.executePaginated("GET", urlStr, "")
+	return b.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (b *BranchRestrictions) Create(bo *BranchRestrictionsOptions) (*BranchRestrictions, error) {
diff --git a/client.go b/client.go
@@ -249,7 +249,7 @@ func (c *Client) execute(method string, urlStr string, text string) (interface{}
 	return result, nil
 }
 
-func (c *Client) executePaginated(method string, urlStr string, text string) (interface{}, error) {
+func (c *Client) executePaginated(method string, urlStr string, text string, page *int) (interface{}, error) {
 	if c.Pagelen != DEFAULT_PAGE_LENGTH {
 		urlObj, err := url.Parse(urlStr)
 		if err != nil {
@@ -271,7 +271,7 @@ func (c *Client) executePaginated(method string, urlStr string, text string) (in
 	}
 
 	c.authenticateRequest(req)
-	result, err := c.doPaginatedRequest(req, false)
+	result, err := c.doPaginatedRequest(req, page, false)
 	if err != nil {
 		return nil, err
 	}
@@ -358,7 +358,19 @@ func (c *Client) doRequest(req *http.Request, emptyResponse bool) (interface{},
 	return result, nil
 }
 
-func (c *Client) doPaginatedRequest(req *http.Request, emptyResponse bool) (interface{}, error) {
+func (c *Client) doPaginatedRequest(req *http.Request, page *int, emptyResponse bool) (interface{}, error) {
+	disableAutoPaging := c.DisableAutoPaging
+	curPage := 1
+	if page != nil {
+		disableAutoPaging = true
+		curPage = *page
+		q := req.URL.Query()
+		q.Set("page", strconv.Itoa(curPage))
+		req.URL.RawQuery = q.Encode()
+	}
+	// q.Encode() does not encode "~".
+	req.URL.RawQuery = strings.ReplaceAll(req.URL.RawQuery, "~", "%7E")
+
 	resBody, err := c.doRawRequest(req, emptyResponse)
 	if err != nil {
 		return nil, err
@@ -375,18 +387,15 @@ func (c *Client) doPaginatedRequest(req *http.Request, emptyResponse bool) (inte
 	}
 
 	responsePaginated := &Response{}
-	var curPage int
-
 	err = json.Unmarshal(responseBytes, responsePaginated)
 	if err == nil && len(responsePaginated.Values) > 0 {
-		var values []interface{}
+		values := responsePaginated.Values
 		for {
-			curPage++
-			values = append(values, responsePaginated.Values...)
-			if c.DisableAutoPaging || len(responsePaginated.Next) == 0 ||
+			if disableAutoPaging || responsePaginated.Next == "" ||
 				(curPage >= c.LimitPages && c.LimitPages != 0) {
 				break
 			}
+			curPage++
 			newReq, err := http.NewRequest(req.Method, responsePaginated.Next, nil)
 			if err != nil {
 				return resBody, err
@@ -399,6 +408,7 @@ func (c *Client) doPaginatedRequest(req *http.Request, emptyResponse bool) (inte
 
 			responsePaginated = &Response{}
 			json.NewDecoder(resp).Decode(responsePaginated)
+			values = append(values, responsePaginated.Values...)
 		}
 		responsePaginated.Values = values
 		responseBytes, err = json.Marshal(responsePaginated)
diff --git a/commits.go b/commits.go
@@ -12,7 +12,7 @@ type Commits struct {
 func (cm *Commits) GetCommits(cmo *CommitsOptions) (interface{}, error) {
 	urlStr := cm.c.requestUrl("/repositories/%s/%s/commits/%s", cmo.Owner, cmo.RepoSlug, cmo.Branchortag)
 	urlStr += cm.buildCommitsQuery(cmo.Include, cmo.Exclude)
-	return cm.c.executePaginated("GET", urlStr, "")
+	return cm.c.executePaginated("GET", urlStr, "", cmo.Page)
 }
 
 func (cm *Commits) GetCommit(cmo *CommitsOptions) (interface{}, error) {
@@ -22,7 +22,7 @@ func (cm *Commits) GetCommit(cmo *CommitsOptions) (interface{}, error) {
 
 func (cm *Commits) GetCommitComments(cmo *CommitsOptions) (interface{}, error) {
 	urlStr := cm.c.requestUrl("/repositories/%s/%s/commit/%s/comments", cmo.Owner, cmo.RepoSlug, cmo.Revision)
-	return cm.c.executePaginated("GET", urlStr, "")
+	return cm.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (cm *Commits) GetCommitComment(cmo *CommitsOptions) (interface{}, error) {
@@ -32,7 +32,7 @@ func (cm *Commits) GetCommitComment(cmo *CommitsOptions) (interface{}, error) {
 
 func (cm *Commits) GetCommitStatuses(cmo *CommitsOptions) (interface{}, error) {
 	urlStr := cm.c.requestUrl("/repositories/%s/%s/commit/%s/statuses", cmo.Owner, cmo.RepoSlug, cmo.Revision)
-	return cm.c.executePaginated("GET", urlStr, "")
+	return cm.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (cm *Commits) GetCommitStatus(cmo *CommitsOptions, commitStatusKey string) (interface{}, error) {
diff --git a/downloads.go b/downloads.go
@@ -11,5 +11,5 @@ func (dl *Downloads) Create(do *DownloadsOptions) (interface{}, error) {
 
 func (dl *Downloads) List(do *DownloadsOptions) (interface{}, error) {
 	urlStr := dl.c.requestUrl("/repositories/%s/%s/downloads", do.Owner, do.RepoSlug)
-	return dl.c.executePaginated("GET", urlStr, "")
+	return dl.c.executePaginated("GET", urlStr, "", nil)
 }
diff --git a/go.mod b/go.mod
@@ -1,11 +1,10 @@
-module github.com/diggerhq/go-bitbucket
+module github.com/ktrysmt/go-bitbucket
 
 go 1.14
 
 require (
-	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
+	github.com/diggerhq/go-bitbucket v0.0.6
 	github.com/k0kubun/pp v3.0.1+incompatible
-	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/stretchr/testify v1.8.1
 	golang.org/x/net v0.7.0
diff --git a/go.sum b/go.sum
@@ -2,6 +2,8 @@ cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1h
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/diggerhq/go-bitbucket v0.0.6 h1:bW4e3SCQVYYHlaa9BFpKc+3oDD1Pj9EwCygAkKpE92o=
+github.com/diggerhq/go-bitbucket v0.0.6/go.mod h1:IwCbd2t5rx6X3QlBAuE1H1b2KesJxncY3qFqquEqx3Y=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
diff --git a/issues.go b/issues.go
@@ -37,7 +37,7 @@ func (p *Issues) Gets(io *IssuesOptions) (interface{}, error) {
 		url.RawQuery = query.Encode()
 	}
 
-	return p.c.executePaginated("GET", url.String(), "")
+	return p.c.executePaginated("GET", url.String(), "", nil)
 }
 
 func (p *Issues) Get(io *IssuesOptions) (interface{}, error) {
diff --git a/pipelines.go b/pipelines.go
@@ -47,7 +47,7 @@ func (p *Pipelines) List(po *PipelinesOptions) (interface{}, error) {
 		urlStr = parsed.String()
 	}
 
-	return p.c.executePaginated("GET", urlStr, "")
+	return p.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (p *Pipelines) Get(po *PipelinesOptions) (interface{}, error) {
@@ -91,7 +91,7 @@ func (p *Pipelines) ListSteps(po *PipelinesOptions) (interface{}, error) {
 		urlStr = parsed.String()
 	}
 
-	return p.c.executePaginated("GET", urlStr, "")
+	return p.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (p *Pipelines) GetStep(po *PipelinesOptions) (interface{}, error) {
diff --git a/pullrequests.go b/pullrequests.go
@@ -65,7 +65,7 @@ func (p *PullRequests) Gets(po *PullRequestsOptions) (interface{}, error) {
 		urlStr = parsed.String()
 	}
 
-	return p.c.executePaginated("GET", urlStr, "")
+	return p.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (p *PullRequests) Get(po *PullRequestsOptions) (interface{}, error) {
@@ -75,7 +75,7 @@ func (p *PullRequests) Get(po *PullRequestsOptions) (interface{}, error) {
 
 func (p *PullRequests) Activities(po *PullRequestsOptions) (interface{}, error) {
 	urlStr := p.c.GetApiBaseURL() + "/repositories/" + po.Owner + "/" + po.RepoSlug + "/pullrequests/activity"
-	return p.c.executePaginated("GET", urlStr, "")
+	return p.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (p *PullRequests) Activity(po *PullRequestsOptions) (interface{}, error) {
@@ -85,7 +85,7 @@ func (p *PullRequests) Activity(po *PullRequestsOptions) (interface{}, error) {
 
 func (p *PullRequests) Commits(po *PullRequestsOptions) (interface{}, error) {
 	urlStr := p.c.GetApiBaseURL() + "/repositories/" + po.Owner + "/" + po.RepoSlug + "/pullrequests/" + po.ID + "/commits"
-	return p.c.executePaginated("GET", urlStr, "")
+	return p.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (p *PullRequests) Patch(po *PullRequestsOptions) (interface{}, error) {
@@ -158,7 +158,7 @@ func (p *PullRequests) UpdateComment(co *PullRequestCommentOptions) (interface{}
 
 func (p *PullRequests) GetComments(po *PullRequestsOptions) (interface{}, error) {
 	urlStr := p.c.GetApiBaseURL() + "/repositories/" + po.Owner + "/" + po.RepoSlug + "/pullrequests/" + po.ID + "/comments/"
-	return p.c.executePaginated("GET", urlStr, "")
+	return p.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (p *PullRequests) GetComment(po *PullRequestsOptions) (interface{}, error) {
@@ -189,7 +189,7 @@ func (p *PullRequests) Statuses(po *PullRequestsOptions) (interface{}, error) {
 		parsed.RawQuery = query.Encode()
 		urlStr = parsed.String()
 	}
-	return p.c.executePaginated("GET", urlStr, "")
+	return p.c.executePaginated("GET", urlStr, "", nil)
 }
 
 func (p *PullRequests) buildPullRequestBody(po *PullRequestsOptions) (string, error) {
diff --git a/repositories.go b/repositories.go
@@ -3,8 +3,6 @@ package bitbucket
 import (
 	"errors"
 	"fmt"
-
-	"github.com/mitchellh/mapstructure"
 )
 
 //"github.com/k0kubun/pp"
@@ -32,15 +30,22 @@ type RepositoriesRes struct {
 }
 
 func (r *Repositories) ListForAccount(ro *RepositoriesOptions) (*RepositoriesRes, error) {
-	url := "/repositories"
+	urlPath := "/repositories"
 	if ro.Owner != "" {
-		url += fmt.Sprintf("/%s", ro.Owner)
+		urlPath += fmt.Sprintf("/%s", ro.Owner)
 	}
-	urlStr := r.c.requestUrl(url)
+	urlStr := r.c.requestUrl(urlPath)
 	if ro.Role != "" {
 		urlStr += "?role=" + ro.Role
 	}
-	repos, err := r.c.executePaginated("GET", urlStr, "")
+	if ro.Keyword != nil && *ro.Keyword != "" {
+		if ro.Role == "" {
+			urlStr += "?"
+		}
+		// https://developer.atlassian.com/cloud/bitbucket/rest/intro/#operators
+		urlStr += fmt.Sprintf("q=full_name ~ \"%s\"", *ro.Keyword)
+	}
+	repos, err := r.c.executePaginated("GET", urlStr, "", ro.Page)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +59,7 @@ func (r *Repositories) ListForTeam(ro *RepositoriesOptions) (*RepositoriesRes, e
 
 func (r *Repositories) ListPublic() (*RepositoriesRes, error) {
 	urlStr := r.c.requestUrl("/repositories/")
-	repos, err := r.c.executePaginated("GET", urlStr, "")
+	repos, err := r.c.executePaginated("GET", urlStr, "", nil)
 	if err != nil {
 		return nil, err
 	}
@@ -70,10 +75,9 @@ func decodeRepositories(reposResponse interface{}) (*RepositoriesRes, error) {
 	repoArray := reposResponseMap["values"].([]interface{})
 	var repos []Repository
 	for _, repoEntry := range repoArray {
-		var repo Repository
-		err := mapstructure.Decode(repoEntry, &repo)
+		repo, err := decodeRepository(repoEntry)
 		if err == nil {
-			repos = append(repos, repo)
+			repos = append(repos, *repo)
 		}
 	}
 
diff --git a/repository.go b/repository.go
diff --git a/webhooks.go b/webhooks.go
diff --git a/workspaces.go b/workspaces.go

Original file line number	Diff line number	Diff line change
`@@ -139,8 +139,10 @@ type pipelines interface {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`type RepositoriesOptions struct {`
`142`		- Owner string `json:"owner"`
`143`		- Role string `json:"role"` // role=[owner\|admin\|contributor\|member]
	`142`	+ Owner string `json:"owner"`
	`143`	+ Role string `json:"role"` // role=[owner\|admin\|contributor\|member]
	`144`	+ Page *int `json:"page"`
	`145`	+ Keyword *string `json:"keyword"`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`type RepositoryOptions struct {`
`@@ -339,6 +341,7 @@ type CommitsOptions struct {`
`339`	`341`	Include string `json:"include"`
`340`	`342`	Exclude string `json:"exclude"`
`341`	`343`	CommentID string `json:"comment_id"`
	`344`	+ Page *int `json:"page"`
`342`	`345`	`}`
`343`	`346`
`344`	`347`	`type CommitStatusOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type BranchRestrictions struct {`
`17`	`17`
`18`	`18`	`func (b BranchRestrictions) Gets(bo BranchRestrictionsOptions) (interface{}, error) {`
`19`	`19`	`urlStr := b.c.requestUrl("/repositories/%s/%s/branch-restrictions", bo.Owner, bo.RepoSlug)`
`20`		`- return b.c.executePaginated("GET", urlStr, "")`
	`20`	`+ return b.c.executePaginated("GET", urlStr, "", nil)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func (b BranchRestrictions) Create(bo BranchRestrictionsOptions) (*BranchRestrictions, error) {`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ func (dl Downloads) Create(do DownloadsOptions) (interface{}, error) {`
`11`	`11`
`12`	`12`	`func (dl Downloads) List(do DownloadsOptions) (interface{}, error) {`
`13`	`13`	`urlStr := dl.c.requestUrl("/repositories/%s/%s/downloads", do.Owner, do.RepoSlug)`
`14`		`- return dl.c.executePaginated("GET", urlStr, "")`
	`14`	`+ return dl.c.executePaginated("GET", urlStr, "", nil)`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func (p Issues) Gets(io IssuesOptions) (interface{}, error) {`
`37`	`37`	`url.RawQuery = query.Encode()`
`38`	`38`	`}`
`39`	`39`
`40`		`- return p.c.executePaginated("GET", url.String(), "")`
	`40`	`+ return p.c.executePaginated("GET", url.String(), "", nil)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func (p Issues) Get(io IssuesOptions) (interface{}, error) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (p Pipelines) List(po PipelinesOptions) (interface{}, error) {`
`47`	`47`	`urlStr = parsed.String()`
`48`	`48`	`}`
`49`	`49`
`50`		`- return p.c.executePaginated("GET", urlStr, "")`
	`50`	`+ return p.c.executePaginated("GET", urlStr, "", nil)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func (p Pipelines) Get(po PipelinesOptions) (interface{}, error) {`
`@@ -91,7 +91,7 @@ func (p Pipelines) ListSteps(po PipelinesOptions) (interface{}, error) {`
`91`	`91`	`urlStr = parsed.String()`
`92`	`92`	`}`
`93`	`93`
`94`		`- return p.c.executePaginated("GET", urlStr, "")`
	`94`	`+ return p.c.executePaginated("GET", urlStr, "", nil)`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`func (p Pipelines) GetStep(po PipelinesOptions) (interface{}, error) {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (p PullRequests) Gets(po PullRequestsOptions) (interface{}, error) {`
`65`	`65`	`urlStr = parsed.String()`
`66`	`66`	`}`
`67`	`67`
`68`		`- return p.c.executePaginated("GET", urlStr, "")`
	`68`	`+ return p.c.executePaginated("GET", urlStr, "", nil)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func (p PullRequests) Get(po PullRequestsOptions) (interface{}, error) {`
`@@ -75,7 +75,7 @@ func (p PullRequests) Get(po PullRequestsOptions) (interface{}, error) {`
`75`	`75`
`76`	`76`	`func (p PullRequests) Activities(po PullRequestsOptions) (interface{}, error) {`
`77`	`77`	`urlStr := p.c.GetApiBaseURL() + "/repositories/" + po.Owner + "/" + po.RepoSlug + "/pullrequests/activity"`
`78`		`- return p.c.executePaginated("GET", urlStr, "")`
	`78`	`+ return p.c.executePaginated("GET", urlStr, "", nil)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`func (p PullRequests) Activity(po PullRequestsOptions) (interface{}, error) {`
`@@ -85,7 +85,7 @@ func (p PullRequests) Activity(po PullRequestsOptions) (interface{}, error) {`
`85`	`85`
`86`	`86`	`func (p PullRequests) Commits(po PullRequestsOptions) (interface{}, error) {`
`87`	`87`	`urlStr := p.c.GetApiBaseURL() + "/repositories/" + po.Owner + "/" + po.RepoSlug + "/pullrequests/" + po.ID + "/commits"`
`88`		`- return p.c.executePaginated("GET", urlStr, "")`
	`88`	`+ return p.c.executePaginated("GET", urlStr, "", nil)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`func (p PullRequests) Patch(po PullRequestsOptions) (interface{}, error) {`
`@@ -158,7 +158,7 @@ func (p PullRequests) UpdateComment(co PullRequestCommentOptions) (interface{}`
`158`	`158`
`159`	`159`	`func (p PullRequests) GetComments(po PullRequestsOptions) (interface{}, error) {`
`160`	`160`	`urlStr := p.c.GetApiBaseURL() + "/repositories/" + po.Owner + "/" + po.RepoSlug + "/pullrequests/" + po.ID + "/comments/"`
`161`		`- return p.c.executePaginated("GET", urlStr, "")`
	`161`	`+ return p.c.executePaginated("GET", urlStr, "", nil)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`func (p PullRequests) GetComment(po PullRequestsOptions) (interface{}, error) {`
`@@ -189,7 +189,7 @@ func (p PullRequests) Statuses(po PullRequestsOptions) (interface{}, error) {`
`189`	`189`	`parsed.RawQuery = query.Encode()`
`190`	`190`	`urlStr = parsed.String()`
`191`	`191`	`}`
`192`		`- return p.c.executePaginated("GET", urlStr, "")`
	`192`	`+ return p.c.executePaginated("GET", urlStr, "", nil)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`func (p PullRequests) buildPullRequestBody(po PullRequestsOptions) (string, error) {`