get latest changes from ktrysmt:go-bitbucket:master

bitbucket.go

@@ -1,5 +1,7 @@
 package bitbucket
 
+import "context"
+
 type users interface {
 	Get(username string) (*User, error)
 	Followers(username string) (interface{}, error)
@@ -85,6 +87,7 @@ type repository interface {
 type repositories interface {
 	ListForAccount(opt RepositoriesOptions) (interface{}, error)
 	ListForTeam(opt RepositoriesOptions) (interface{}, error)
+	ListProject(opt RepositoriesOptions) (interface{}, error)
 	ListPublic() (interface{}, error)
 }
 
@@ -140,6 +143,7 @@ type pipelines interface {
 
 type RepositoriesOptions struct {
 	Owner   string  `json:"owner"`
+	Project string  `json:"project"`
 	Role    string  `json:"role"` // role=[owner|admin|contributor|member]
 	Page    *int    `json:"page"`
 	Keyword *string `json:"keyword"`
@@ -158,6 +162,12 @@ type RepositoryOptions struct {
 	HasIssues   string `json:"has_issues"`
 	HasWiki     string `json:"has_wiki"`
 	Project     string `json:"project"`
+	ctx         context.Context
+}
+
+func (ro *RepositoryOptions) WithContext(ctx context.Context) *RepositoryOptions {
+	ro.ctx = ctx
+	return ro
 }
 
 type RepositoryForkOptions struct {
@@ -174,6 +184,12 @@ type RepositoryForkOptions struct {
 	HasIssues   string `json:"has_issues"`
 	HasWiki     string `json:"has_wiki"`
 	Project     string `json:"project"`
+	ctx         context.Context
+}
+
+func (fo *RepositoryForkOptions) WithContext(ctx context.Context) *RepositoryForkOptions {
+	fo.ctx = ctx
+	return fo
 }
 
 type RepositoryFilesOptions struct {
@@ -191,15 +207,28 @@ type RepositoryBlobOptions struct {
 	Path     string `json:"path"`
 }
 
+type File struct {
+	Path string
+	Name string
+}
+
 // Based on https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Bworkspace%7D/%7Brepo_slug%7D/src#post
 type RepositoryBlobWriteOptions struct {
-	Owner    string `json:"owner"`
-	RepoSlug string `json:"repo_slug"`
-	FilePath string `json:"filepath"`
-	FileName string `json:"filename"`
-	Author   string `json:"author"`
-	Message  string `json:"message"`
-	Branch   string `json:"branch"`
+	Owner         string   `json:"owner"`
+	RepoSlug      string   `json:"repo_slug"`
+	FilePath      string   `json:"filepath"`
+	FileName      string   `json:"filename"`
+	Files         []File   `json:"files"`
+	FilesToDelete []string `json:"files_to_delete"`
+	Author        string   `json:"author"`
+	Message       string   `json:"message"`
+	Branch        string   `json:"branch"`
+	ctx           context.Context
+}
+
+func (ro *RepositoryBlobWriteOptions) WithContext(ctx context.Context) *RepositoryBlobWriteOptions {
+	ro.ctx = ctx
+	return ro
 }
 
 // RepositoryRefOptions represents the options for describing a repository's refs (i.e.
@@ -240,7 +269,7 @@ type RepositoryBranchDeleteOptions struct {
 	RepoSlug string `json:"repo_slug"`
 	RepoUUID string `json:"uuid"`
 	RefName  string `json:"name"`
-	RefUUID  string `json:uuid`
+	RefUUID  string `json:"uuid"`
 }
 
 type RepositoryBranchTarget struct {
@@ -285,6 +314,13 @@ type PullRequestsOptions struct {
 	States            []string `json:"states"`
 	Query             string   `json:"query"`
 	Sort              string   `json:"sort"`
+	Draft             bool     `json:"draft"`
+	ctx               context.Context
+}
+
+func (po *PullRequestsOptions) WithContext(ctx context.Context) *PullRequestsOptions {
+	po.ctx = ctx
+	return po
 }
 
 type PullRequestCommentOptions struct {
@@ -293,6 +329,13 @@ type PullRequestCommentOptions struct {
 	PullRequestID string `json:"id"`
 	Content       string `json:"content"`
 	CommentId     string `json:"-"`
+	Parent        *int   `json:"parent"`
+	ctx           context.Context
+}
+
+func (pco *PullRequestCommentOptions) WithContext(ctx context.Context) *PullRequestCommentOptions {
+	pco.ctx = ctx
+	return pco
 }
 
 type IssuesOptions struct {
@@ -311,6 +354,12 @@ type IssuesOptions struct {
 	Priority  string   `json:"priority"`
 	Version   string   `json:"version"`
 	Assignee  string   `json:"assignee"`
+	ctx       context.Context
+}
+
+func (io *IssuesOptions) WithContext(ctx context.Context) *IssuesOptions {
+	io.ctx = ctx
+	return io
 }
 
 type IssueCommentsOptions struct {
@@ -342,6 +391,12 @@ type CommitsOptions struct {
 	Exclude     string `json:"exclude"`
 	CommentID   string `json:"comment_id"`
 	Page        *int   `json:"page"`
+	ctx         context.Context
+}
+
+func (cm *CommitsOptions) WithContext(ctx context.Context) *CommitsOptions {
+	cm.ctx = ctx
+	return cm
 }
 
 type CommitStatusOptions struct {
@@ -363,36 +418,59 @@ type BranchRestrictionsOptions struct {
 	FullSlug string            `json:"full_slug"`
 	Name     string            `json:"name"`
 	Value    interface{}       `json:"value"`
+	ctx      context.Context
+}
+
+func (b *BranchRestrictionsOptions) WithContext(ctx context.Context) *BranchRestrictionsOptions {
+	b.ctx = ctx
+	return b
 }
 
 type DiffOptions struct {
-	Owner    string `json:"owner"`
-	RepoSlug string `json:"repo_slug"`
-	Spec     string `json:"spec"`
+	Owner             string `json:"owner"`
+	RepoSlug          string `json:"repo_slug"`
+	Spec              string `json:"spec"`
+	Context           int    `json:"context"`
+	Path              string `json:"path"`
+	FromPullRequestID int    `json:"from_pullrequest_id"`
+	Whitespace        bool   `json:"ignore_whitespace"`
+	Binary            bool   `json:"binary"`
+	Renames           bool   `json:"renames"`
+	Topic             bool   `json:"topic"`
 }
 
 type DiffStatOptions struct {
-	Owner      string `json:"owner"`
-	RepoSlug   string `json:"repo_slug"`
-	Spec       string `json:"spec"`
-	Whitespace bool   `json:"ignore_whitespace"`
-	Merge      bool   `json:"merge"`
-	Path       string `json:"path"`
-	Renames    bool   `json:"renames"`
-	PageNum    int    `json:"page"`
-	Pagelen    int    `json:"pagelen"`
-	MaxDepth   int    `json:"max_depth"`
-	Fields     []string
+	Owner             string `json:"owner"`
+	RepoSlug          string `json:"repo_slug"`
+	Spec              string `json:"spec"`
+	FromPullRequestID int    `json:"from_pullrequest_id"`
+	Whitespace        bool   `json:"ignore_whitespace"`
+	// Deprecated: Merge is deprecated use Topic
+	Merge    bool   `json:"merge"`
+	Path     string `json:"path"`
+	Renames  bool   `json:"renames"`
+	Topic    bool   `json:"topic"`
+	PageNum  int    `json:"page"`
+	Pagelen  int    `json:"pagelen"`
+	MaxDepth int    `json:"max_depth"`
+	Fields   []string
 }
 
 type WebhooksOptions struct {
 	Owner       string   `json:"owner"`
 	RepoSlug    string   `json:"repo_slug"`
 	Uuid        string   `json:"uuid"`
+	Secret      string   `json:"secret"`
 	Description string   `json:"description"`
 	Url         string   `json:"url"`
 	Active      bool     `json:"active"`
 	Events      []string `json:"events"` // EX: {'repo:push','issue:created',..} REF: https://bit.ly/3FjRHHu
+	ctx         context.Context
+}
+
+func (wo *WebhooksOptions) WithContext(ctx context.Context) *WebhooksOptions {
+	wo.ctx = ctx
+	return wo
 }
 
 type RepositoryPipelineOptions struct {
@@ -424,6 +502,12 @@ type RepositoryPipelineVariableOptions struct {
 	Key      string `json:"key"`
 	Value    string `json:"value"`
 	Secured  bool   `json:"secured"`
+	ctx      context.Context
+}
+
+func (rpvo *RepositoryPipelineVariableOptions) WithContext(ctx context.Context) *RepositoryPipelineVariableOptions {
+	rpvo.ctx = ctx
+	return rpvo
 }
 
 type RepositoryPipelineVariableDeleteOptions struct {
@@ -455,6 +539,13 @@ type DownloadsOptions struct {
 	RepoSlug string `json:"repo_slug"`
 	FilePath string `json:"filepath"`
 	FileName string `json:"filename"`
+	Files    []File `json:"files"`
+	ctx      context.Context
+}
+
+func (do *DownloadsOptions) WithContext(ctx context.Context) *DownloadsOptions {
+	do.ctx = ctx
+	return do
 }
 
 type PageRes struct {
@@ -512,6 +603,12 @@ type RepositoryEnvironmentOptions struct {
 	Name            string                          `json:"name"`
 	EnvironmentType RepositoryEnvironmentTypeOption `json:"environment_type"`
 	Rank            int                             `json:"rank"`
+	ctx             context.Context
+}
+
+func (reo *RepositoryEnvironmentOptions) WithContext(ctx context.Context) *RepositoryEnvironmentOptions {
+	reo.ctx = ctx
+	return reo
 }
 
 type RepositoryEnvironmentDeleteOptions struct {
@@ -539,6 +636,12 @@ type RepositoryDeploymentVariableOptions struct {
 	Key         string       `json:"key"`
 	Value       string       `json:"value"`
 	Secured     bool         `json:"secured"`
+	ctx         context.Context
+}
+
+func (rdvo *RepositoryDeploymentVariableOptions) WithContext(ctx context.Context) *RepositoryDeploymentVariableOptions {
+	rdvo.ctx = ctx
+	return rdvo
 }
 
 type RepositoryDeploymentVariableDeleteOptions struct {
@@ -554,4 +657,17 @@ type DeployKeyOptions struct {
 	Id       int    `json:"id"`
 	Label    string `json:"label"`
 	Key      string `json:"key"`
+	ctx      context.Context
+}
+
+func (dk *DeployKeyOptions) WithContext(ctx context.Context) *DeployKeyOptions {
+	dk.ctx = ctx
+	return dk
+}
+
+type SSHKeyOptions struct {
+	Owner string `json:"owner"`
+	Uuid  string `json:"uuid"`
+	Label string `json:"label"`
+	Key   string `json:"key"`
 }

branchrestrictions.go

@@ -26,7 +26,7 @@ func (b *BranchRestrictions) Create(bo *BranchRestrictionsOptions) (*BranchRestr
 		return nil, err
 	}
 	urlStr := b.c.requestUrl("/repositories/%s/%s/branch-restrictions", bo.Owner, bo.RepoSlug)
-	response, err := b.c.execute("POST", urlStr, data)
+	response, err := b.c.executeWithContext("POST", urlStr, data, bo.ctx)
 	if err != nil {
 		return nil, err
 	}