Skip to content

Commit 3f662a3

Browse files
zakiskchmouel
zakisk
authored and
chmouel
committed
cleanup: wave good bye to bbv1 lib
cleaned up the bbv1 lib thoroughly Signed-off-by: Zaki Shaikh <[email protected]>
1 parent c7486aa commit 3f662a3

File tree

19 files changed

+10
-16548
lines changed

19 files changed

+10
-16548
lines changed

‎go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
github.com/bradleyfalzon/ghinstallation/v2 v2.15.0
1212
github.com/cloudevents/sdk-go/v2 v2.16.0
1313
github.com/fvbommel/sortorder v1.1.0
14-
github.com/gfleury/go-bitbucket-v1 v0.0.0-20240917142304-df385efaac68
1514
github.com/gobwas/glob v0.2.3
1615
github.com/google/cel-go v0.25.0
1716
github.com/google/go-cmp v0.7.0

‎go.sum

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQ
130130
github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
131131
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
132132
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
133-
github.com/gfleury/go-bitbucket-v1 v0.0.0-20240917142304-df385efaac68 h1:iJXWkoIPk3e8RVHhQE/gXfP2TP3OLQ9vVPNSJ+oL6mM=
134-
github.com/gfleury/go-bitbucket-v1 v0.0.0-20240917142304-df385efaac68/go.mod h1:bB7XwdZF40tLVnu9n5A9TjI2ddNZtLYImtwYwmcmnRo=
135-
github.com/gfleury/go-bitbucket-v1/test/bb-mock-server v0.0.0-20230825095122-9bc1711434ab h1:BeG9dDWckFi/p5Gvqq3wTEDXsUV4G6bdvjEHMOT2B8E=
136-
github.com/gfleury/go-bitbucket-v1/test/bb-mock-server v0.0.0-20230825095122-9bc1711434ab/go.mod h1:VssB0kb1cETNaFFC/0mHVCj+7i5TS2xraYq+tl9JLwE=
137133
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
138134
github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e h1:oRq/fiirun5HqlEWMLIcDmLpIELlG4iGbd0s8iqgPi8=
139135
github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM=
@@ -259,9 +255,6 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
259255
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
260256
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
261257
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
262-
github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
263-
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
264-
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
265258
github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw=
266259
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
267260
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
@@ -353,7 +346,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
353346
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
354347
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
355348
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
356-
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
357349
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
358350
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
359351
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -524,7 +516,6 @@ golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5
524516
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
525517
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
526518
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
527-
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
528519
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
529520
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
530521
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
@@ -609,7 +600,6 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
609600
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
610601
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
611602
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
612-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
613603
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
614604
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
615605
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
@@ -693,7 +683,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
693683
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
694684
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
695685
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
696-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
697686
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
698687
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
699688
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
@@ -705,7 +694,6 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
705694
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
706695
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
707696
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
708-
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
709697
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
710698
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
711699
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=

‎pkg/provider/bitbucketdatacenter/acl_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func TestIsAllowed(t *testing.T) {
208208
for _, tt := range tests {
209209
t.Run(tt.name, func(t *testing.T) {
210210
ctx, _ := rtesting.SetupFakeContext(t)
211-
bbclient, scmClient, mux, tearDown, tURL := bbv1test.SetupBBDataCenterClient(ctx)
211+
scmClient, mux, tearDown, tURL := bbv1test.SetupBBDataCenterClient()
212212
defer tearDown()
213213
bbv1test.MuxProjectMemberShip(t, mux, tt.event, tt.fields.projectMembers)
214214
bbv1test.MuxRepoMemberShip(t, mux, tt.event, tt.fields.repoMembers)
@@ -218,7 +218,6 @@ func TestIsAllowed(t *testing.T) {
218218

219219
v := &Provider{
220220
baseURL: tURL,
221-
bbClient: bbclient,
222221
scmClient: scmClient,
223222
defaultBranchLatestCommit: tt.fields.defaultBranchLatestCommit,
224223
pullRequestNumber: tt.fields.pullRequestNumber,

‎pkg/provider/bitbucketdatacenter/bitbucketdatacenter.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"path/filepath"
99
"strings"
1010

11-
bbv1 "github.com/gfleury/go-bitbucket-v1"
1211
"github.com/google/go-github/v71/github"
1312
"github.com/jenkins-x/go-scm/scm"
1413
"github.com/jenkins-x/go-scm/scm/driver/stash"
@@ -31,7 +30,6 @@ const apiResponseLimit = 100
3130
var _ provider.Interface = (*Provider)(nil)
3231

3332
type Provider struct {
34-
bbClient *bbv1.APIClient // temporarily keeping it after the refactor finishes, will be removed
3533
scmClient *scm.Client
3634
Logger *zap.SugaredLogger
3735
run *params.Run
@@ -46,20 +44,6 @@ type Provider struct {
4644
triggerEvent string
4745
}
4846

49-
func (v *Provider) Client() *bbv1.APIClient {
50-
providerMetrics.RecordAPIUsage(
51-
v.Logger,
52-
"bitbucketcloud",
53-
v.triggerEvent,
54-
v.repo,
55-
)
56-
return v.bbClient
57-
}
58-
59-
func (v *Provider) SetBitBucketClient(client *bbv1.APIClient) {
60-
v.bbClient = client
61-
}
62-
6347
func (v Provider) ScmClient() *scm.Client {
6448
providerMetrics.RecordAPIUsage(
6549
v.Logger,
@@ -312,14 +296,6 @@ func (v *Provider) SetClient(ctx context.Context, run *params.Run, event *info.E
312296
event.Provider.URL = strings.TrimSuffix(event.Provider.URL, "/")
313297
v.apiURL = event.Provider.URL
314298

315-
basicAuth := bbv1.BasicAuth{UserName: event.Provider.User, Password: event.Provider.Token}
316-
317-
ctx = context.WithValue(ctx, bbv1.ContextBasicAuth, basicAuth)
318-
cfg := bbv1.NewConfiguration(event.Provider.URL)
319-
if v.bbClient == nil {
320-
v.bbClient = bbv1.NewAPIClient(ctx, cfg)
321-
}
322-
323299
if v.scmClient == nil {
324300
client, err := stash.New(removeLastSegment(event.Provider.URL)) // remove `/rest` from url
325301
if err != nil {

‎pkg/provider/bitbucketdatacenter/bitbucketdatacenter_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestGetTektonDir(t *testing.T) {
8383
observer, _ := zapobserver.New(zap.InfoLevel)
8484
logger := zap.New(observer).Sugar()
8585
ctx, _ := rtesting.SetupFakeContext(t)
86-
_, client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
86+
client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
8787
defer tearDown()
8888
v := &Provider{Logger: logger, baseURL: tURL, scmClient: client, projectKey: tt.event.Organization}
8989
bbtest.MuxDirContent(t, mux, tt.event, tt.testDirPath, tt.path, tt.wantDirAPIErr, tt.wantFilesAPIErr)
@@ -193,7 +193,7 @@ func TestCreateStatus(t *testing.T) {
193193
for _, tt := range tests {
194194
t.Run(tt.name, func(t *testing.T) {
195195
ctx, _ := rtesting.SetupFakeContext(t)
196-
_, client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
196+
client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
197197
defer tearDown()
198198
if tt.nilClient {
199199
client = nil
@@ -266,7 +266,7 @@ func TestGetFileInsideRepo(t *testing.T) {
266266
for _, tt := range tests {
267267
t.Run(tt.name, func(t *testing.T) {
268268
ctx, _ := rtesting.SetupFakeContext(t)
269-
_, client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
269+
client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
270270
defer tearDown()
271271
v := &Provider{scmClient: client, baseURL: tURL, defaultBranchLatestCommit: "1234", projectKey: tt.event.Organization}
272272
bbtest.MuxFiles(t, mux, tt.event, tt.targetbranch, filepath.Dir(tt.path), tt.filescontents, tt.wantErr != "")
@@ -363,7 +363,7 @@ func TestSetClient(t *testing.T) {
363363
for _, tt := range tests {
364364
t.Run(tt.name, func(t *testing.T) {
365365
ctx, _ := rtesting.SetupFakeContext(t)
366-
_, client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
366+
client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
367367
defer tearDown()
368368
if tt.muxUser != nil {
369369
mux.HandleFunc("/users/foo", tt.muxUser)
@@ -406,7 +406,7 @@ func TestGetCommitInfo(t *testing.T) {
406406
for _, tt := range tests {
407407
t.Run(tt.name, func(t *testing.T) {
408408
ctx, _ := rtesting.SetupFakeContext(t)
409-
_, scmClient, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
409+
scmClient, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
410410
bbtest.MuxCommitInfo(t, mux, tt.event, tt.commit)
411411
bbtest.MuxDefaultBranch(t, mux, tt.event, tt.defaultBranch, tt.latestCommit)
412412
defer tearDown()
@@ -683,7 +683,7 @@ func TestGetFiles(t *testing.T) {
683683
for _, tt := range tests {
684684
t.Run(tt.name, func(t *testing.T) {
685685
ctx, _ := rtesting.SetupFakeContext(t)
686-
_, client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient(ctx)
686+
client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
687687
defer tearDown()
688688

689689
stats := &bbtest.DiffStats{

‎pkg/provider/bitbucketdatacenter/pagination.go

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎pkg/provider/bitbucketdatacenter/test/test.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package test
22

33
import (
4-
"context"
54
"encoding/json"
65
"fmt"
76
"io"
@@ -13,7 +12,6 @@ import (
1312
"strings"
1413
"testing"
1514

16-
bbv1 "github.com/gfleury/go-bitbucket-v1"
1715
"github.com/jenkins-x/go-scm/scm"
1816
"github.com/jenkins-x/go-scm/scm/driver/stash"
1917
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/info"
@@ -27,7 +25,7 @@ var (
2725
buildAPIURL = "/rest/build-status/1.0"
2826
)
2927

30-
func SetupBBDataCenterClient(ctx context.Context) (*bbv1.APIClient, *scm.Client, *http.ServeMux, func(), string) {
28+
func SetupBBDataCenterClient() (*scm.Client, *http.ServeMux, func(), string) {
3129
mux := http.NewServeMux()
3230
apiHandler := http.NewServeMux()
3331
apiHandler.Handle(defaultAPIURL+"/", http.StripPrefix(defaultAPIURL, mux))
@@ -48,13 +46,9 @@ func SetupBBDataCenterClient(ctx context.Context) (*bbv1.APIClient, *scm.Client,
4846
server.Close()
4947
}
5048

51-
cfg := bbv1.NewConfiguration(server.URL + "/rest")
52-
cfg.HTTPClient = server.Client()
53-
client := bbv1.NewAPIClient(ctx, cfg)
54-
5549
scmClient, _ := stash.New(server.URL)
5650
scmClient.Client = server.Client()
57-
return client, scmClient, mux, tearDown, server.URL
51+
return scmClient, mux, tearDown, server.URL
5852
}
5953

6054
func MuxCreateComment(t *testing.T, mux *http.ServeMux, event *info.Event, expectedCommentSubstr string, prID int) {

‎pkg/provider/bitbucketdatacenter/types/types.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package types
22

3-
import (
4-
bbv1 "github.com/gfleury/go-bitbucket-v1"
5-
)
6-
73
type UserWithMetadata struct {
84
User UserWithLinks `json:"user,omitempty"`
95
Role string `json:"role,omitempty"`
@@ -198,5 +194,5 @@ type PushRequestEvent struct {
198194

199195
type ToCommit struct {
200196
Commit
201-
Parents []bbv1.Commit `json:"parents"` // bbv1.Commit also has Parents field, but its Parents has only two fields while actual payload has more.
197+
Parents []Commit `json:"parents"` // Commit also has Parents field, but its Parents has only two fields while actual payload has more.
202198
}

‎vendor/github.com/gfleury/go-bitbucket-v1/.gitignore

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎vendor/github.com/gfleury/go-bitbucket-v1/CONTRIBUTORS

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)