diff --git a/go.mod b/go.mod index 4fb641f3df..47e279c9b1 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/fatih/color v1.16.0 github.com/google/go-github/v41 v41.0.0 github.com/korovkin/limiter v0.0.0-20220422174850-01f593e64cf7 - github.com/ktrysmt/go-bitbucket v0.9.74 + github.com/ktrysmt/go-bitbucket v0.9.76 github.com/mitchellh/go-homedir v1.1.0 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 diff --git a/go.sum b/go.sum index f26852a1d4..11a4107616 100644 --- a/go.sum +++ b/go.sum @@ -866,8 +866,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/ktrysmt/go-bitbucket v0.9.74 h1:FlxPMSIB2WjdRvDONxY/XYBLFxa10fFZ2CZ0jmwx4vY= -github.com/ktrysmt/go-bitbucket v0.9.74/go.mod h1:+wfH5IgKupLt9U0Voy1nH3YX+kNVtddeyeW8bqYXCto= +github.com/ktrysmt/go-bitbucket v0.9.76 h1:/oXA8TXtpAtNDPqOpwixg6J7xXpoUvnoduhOCJ7/fWo= +github.com/ktrysmt/go-bitbucket v0.9.76/go.mod h1:+wfH5IgKupLt9U0Voy1nH3YX+kNVtddeyeW8bqYXCto= github.com/kyokomi/emoji/v2 v2.2.8 h1:jcofPxjHWEkJtkIbcLHvZhxKgCPl6C7MyjTrD4KDqUE= github.com/kyokomi/emoji/v2 v2.2.8/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac= diff --git a/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go b/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go index 89d12e89b0..d3c3366d6e 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go @@ -198,14 +198,15 @@ type File struct { // 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"` - Files []File `json:"files"` - 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"` } // RepositoryRefOptions represents the options for describing a repository's refs (i.e. diff --git a/vendor/github.com/ktrysmt/go-bitbucket/client.go b/vendor/github.com/ktrysmt/go-bitbucket/client.go index 2d8f6ddfc3..3ae62620ad 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/client.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/client.go @@ -279,7 +279,7 @@ func (c *Client) executePaginated(method string, urlStr string, text string, pag return result, nil } -func (c *Client) executeFileUpload(method string, urlStr string, files []File, params map[string]string) (interface{}, error) { +func (c *Client) executeFileUpload(method string, urlStr string, files []File, filesToDelete []string, params map[string]string) (interface{}, error) { // Prepare a form that you will submit to that URL. var b bytes.Buffer w := multipart.NewWriter(&b) @@ -308,6 +308,13 @@ func (c *Client) executeFileUpload(method string, urlStr string, files []File, p } } + for _, filename := range filesToDelete { + err := w.WriteField("files", filename) + if err != nil { + return nil, err + } + } + // Don't forget to close the multipart writer. // If you don't close it, your request will be missing the terminating boundary. w.Close() diff --git a/vendor/github.com/ktrysmt/go-bitbucket/downloads.go b/vendor/github.com/ktrysmt/go-bitbucket/downloads.go index 468fc7ce35..c16b08fb31 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/downloads.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/downloads.go @@ -18,7 +18,7 @@ func (dl *Downloads) Create(do *DownloadsOptions) (interface{}, error) { Name: do.FileName, }} } - return dl.c.executeFileUpload("POST", urlStr, do.Files, make(map[string]string)) + return dl.c.executeFileUpload("POST", urlStr, do.Files, []string{}, make(map[string]string)) } func (dl *Downloads) List(do *DownloadsOptions) (interface{}, error) { diff --git a/vendor/github.com/ktrysmt/go-bitbucket/pullrequests.go b/vendor/github.com/ktrysmt/go-bitbucket/pullrequests.go index ca0e263e27..299d1298cb 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/pullrequests.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/pullrequests.go @@ -156,6 +156,11 @@ func (p *PullRequests) UpdateComment(co *PullRequestCommentOptions) (interface{} return p.c.execute("PUT", urlStr, data) } +func (p *PullRequests) DeleteComment(co *PullRequestCommentOptions) (interface{}, error) { + urlStr := p.c.requestUrl("/repositories/%s/%s/pullrequests/%s/comments/%s", co.Owner, co.RepoSlug, co.PullRequestID, co.CommentId) + return p.c.execute("DELETE", urlStr, "") +} + 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, "", nil) diff --git a/vendor/github.com/ktrysmt/go-bitbucket/repository.go b/vendor/github.com/ktrysmt/go-bitbucket/repository.go index 757e5b0c22..0725d8efb6 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/repository.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/repository.go @@ -399,7 +399,7 @@ func (r *Repository) WriteFileBlob(ro *RepositoryBlobWriteOptions) error { urlStr := r.c.requestUrl("/repositories/%s/%s/src", ro.Owner, ro.RepoSlug) - _, err := r.c.executeFileUpload("POST", urlStr, ro.Files, m) + _, err := r.c.executeFileUpload("POST", urlStr, ro.Files, ro.FilesToDelete, m) return err } diff --git a/vendor/modules.txt b/vendor/modules.txt index c69b8d29db..96de6f008e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -121,7 +121,7 @@ github.com/inconshreveable/mousetrap # github.com/korovkin/limiter v0.0.0-20220422174850-01f593e64cf7 ## explicit; go 1.17 github.com/korovkin/limiter -# github.com/ktrysmt/go-bitbucket v0.9.74 +# github.com/ktrysmt/go-bitbucket v0.9.76 ## explicit; go 1.14 github.com/ktrysmt/go-bitbucket # github.com/kyokomi/emoji/v2 v2.2.8