diff --git a/go.mod b/go.mod index 1f9fb1bd9..92d312a9a 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.77 + github.com/ktrysmt/go-bitbucket v0.9.79 github.com/mitchellh/go-homedir v1.1.0 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 @@ -59,7 +59,7 @@ require ( golang.org/x/crypto v0.22.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/image v0.10.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect diff --git a/go.sum b/go.sum index c0d040348..6df5fbe76 100644 --- a/go.sum +++ b/go.sum @@ -865,8 +865,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.77 h1:D/xyUFLDaxI9USElXzjQr+s4hYR22vcsIl8+dQx/gEM= -github.com/ktrysmt/go-bitbucket v0.9.77/go.mod h1:7dN/AHXCCG9TW2KzXdJJy2J2uvcvZCLJR4uXYr1Gx/A= +github.com/ktrysmt/go-bitbucket v0.9.79 h1:hCaqgoTUuvxle5JzwakfNeRurL1Md5EfTQtU63QvKd4= +github.com/ktrysmt/go-bitbucket v0.9.79/go.mod h1:NfPQIai0Wzann6IJacKH8yNZC2CqdZo3swZDJ8qDKxg= 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= @@ -1008,7 +1008,6 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1136,9 +1135,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1169,7 +1167,6 @@ golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= -golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg= golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1272,7 +1269,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1286,8 +1282,8 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1663,7 +1659,6 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go b/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go index d3c3366d6..636ad1697 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/bitbucket.go @@ -85,6 +85,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 +141,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"` @@ -247,7 +249,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 { @@ -380,17 +382,19 @@ type DiffOptions struct { } 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"` + 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 { diff --git a/vendor/github.com/ktrysmt/go-bitbucket/diff.go b/vendor/github.com/ktrysmt/go-bitbucket/diff.go index b793db37b..41177141c 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/diff.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/diff.go @@ -44,11 +44,15 @@ func (d *Diff) GetPatch(do *DiffOptions) (interface{}, error) { func (d *Diff) GetDiffStat(dso *DiffStatOptions) (*DiffStatRes, error) { params := url.Values{} - if dso.Whitespace == true { + if dso.FromPullRequestID > 0 { + params.Add("from_pullrequest_id", strconv.Itoa(dso.FromPullRequestID)) + } + + if dso.Whitespace { params.Add("ignore_whitespace", strconv.FormatBool(dso.Whitespace)) } - if dso.Merge == false { + if !dso.Merge { params.Add("merge", strconv.FormatBool(dso.Merge)) } @@ -56,10 +60,14 @@ func (d *Diff) GetDiffStat(dso *DiffStatOptions) (*DiffStatRes, error) { params.Add("path", dso.Path) } - if dso.Renames == false { + if !dso.Renames { params.Add("renames", strconv.FormatBool(dso.Renames)) } + if dso.Topic { + params.Add("topic", strconv.FormatBool(dso.Topic)) + } + if dso.PageNum > 0 { params.Add("page", strconv.Itoa(dso.PageNum)) } diff --git a/vendor/github.com/ktrysmt/go-bitbucket/repositories.go b/vendor/github.com/ktrysmt/go-bitbucket/repositories.go index 4bd657749..751e3d66c 100644 --- a/vendor/github.com/ktrysmt/go-bitbucket/repositories.go +++ b/vendor/github.com/ktrysmt/go-bitbucket/repositories.go @@ -57,6 +57,17 @@ func (r *Repositories) ListForTeam(ro *RepositoriesOptions) (*RepositoriesRes, e return r.ListForAccount(ro) } +// Return all repositories that belong to a project +func (r *Repositories) ListProject(ro *RepositoriesOptions) (*RepositoriesRes, error) { + urlPath := r.c.requestUrl("/repositories") + urlPath += fmt.Sprintf("/%s/?q=project.key=\"%s\"", ro.Owner, ro.Project) + repos, err := r.c.executePaginated("GET", urlPath, "", nil) + if err != nil { + return nil, err + } + return decodeRepositories(repos) +} + func (r *Repositories) ListPublic() (*RepositoriesRes, error) { urlStr := r.c.requestUrl("/repositories/") repos, err := r.c.executePaginated("GET", urlStr, "", nil) diff --git a/vendor/modules.txt b/vendor/modules.txt index 53fe99d00..e65951627 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -118,7 +118,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.77 +# github.com/ktrysmt/go-bitbucket v0.9.79 ## explicit; go 1.14 github.com/ktrysmt/go-bitbucket # github.com/kyokomi/emoji/v2 v2.2.8 @@ -245,7 +245,7 @@ golang.org/x/image/tiff/lzw golang.org/x/image/vp8 golang.org/x/image/vp8l golang.org/x/image/webp -# golang.org/x/net v0.23.0 +# golang.org/x/net v0.24.0 ## explicit; go 1.18 golang.org/x/net/context golang.org/x/net/html