Skip to content

Commit 6aa79a5

Browse files
zakiskchmouel
zakisk
authored and
chmouel
committed
chore: change scmclient to client in bibtucket dc
changed scmclient to client in bitbucket data center Signed-off-by: Zaki Shaikh <[email protected]>
1 parent a0bcb6f commit 6aa79a5

File tree

4 files changed

+27
-31
lines changed

4 files changed

+27
-31
lines changed

‎pkg/provider/bitbucketdatacenter/acl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (v *Provider) checkOkToTestCommentFromApprovedMember(ctx context.Context, e
4646
OrgAndRepo := fmt.Sprintf("%s/%s", event.Organization, event.Repository)
4747
opts := &scm.ListOptions{Page: 1, Size: apiResponseLimit}
4848
for {
49-
comments, _, err := v.ScmClient().PullRequests.ListComments(ctx, OrgAndRepo, v.pullRequestNumber, opts)
49+
comments, _, err := v.Client().PullRequests.ListComments(ctx, OrgAndRepo, v.pullRequestNumber, opts)
5050
if err != nil {
5151
return false, err
5252
}
@@ -86,7 +86,7 @@ func (v *Provider) checkOkToTestCommentFromApprovedMember(ctx context.Context, e
8686

8787
func (v *Provider) checkMemberShip(ctx context.Context, event *info.Event) (bool, error) {
8888
// Get permissions from project
89-
allowed, _, err := v.ScmClient().Organizations.IsMember(ctx, event.Organization, event.Sender)
89+
allowed, _, err := v.Client().Organizations.IsMember(ctx, event.Organization, event.Sender)
9090
if err != nil {
9191
return false, err
9292
}
@@ -96,7 +96,7 @@ func (v *Provider) checkMemberShip(ctx context.Context, event *info.Event) (bool
9696

9797
orgAndRepo := fmt.Sprintf("%s/%s", event.Organization, event.Repository)
9898
// Get permissions from repo
99-
allowed, _, err = v.ScmClient().Repositories.IsCollaborator(ctx, orgAndRepo, event.Sender)
99+
allowed, _, err = v.Client().Repositories.IsCollaborator(ctx, orgAndRepo, event.Sender)
100100
if err != nil {
101101
return false, err
102102
}

‎pkg/provider/bitbucketdatacenter/acl_test.go

Lines changed: 2 additions & 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-
scmClient, mux, tearDown, tURL := bbv1test.SetupBBDataCenterClient()
211+
client, 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,7 @@ func TestIsAllowed(t *testing.T) {
218218

219219
v := &Provider{
220220
baseURL: tURL,
221-
scmClient: scmClient,
221+
client: client,
222222
defaultBranchLatestCommit: tt.fields.defaultBranchLatestCommit,
223223
pullRequestNumber: tt.fields.pullRequestNumber,
224224
projectKey: tt.event.Organization,

‎pkg/provider/bitbucketdatacenter/bitbucketdatacenter.go

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const apiResponseLimit = 100
3030
var _ provider.Interface = (*Provider)(nil)
3131

3232
type Provider struct {
33-
scmClient *scm.Client
33+
client *scm.Client
3434
Logger *zap.SugaredLogger
3535
run *params.Run
3636
pacInfo *info.PacOpts
@@ -44,18 +44,14 @@ type Provider struct {
4444
triggerEvent string
4545
}
4646

47-
func (v Provider) ScmClient() *scm.Client {
47+
func (v Provider) Client() *scm.Client {
4848
providerMetrics.RecordAPIUsage(
4949
v.Logger,
5050
v.GetConfig().Name,
5151
v.triggerEvent,
5252
v.repo,
5353
)
54-
return v.scmClient
55-
}
56-
57-
func (v *Provider) SetScmClient(client *scm.Client) {
58-
v.scmClient = client
54+
return v.client
5955
}
6056

6157
func (v *Provider) CreateComment(_ context.Context, _ *info.Event, _, _ string) error {
@@ -117,7 +113,7 @@ func (v *Provider) CreateStatus(ctx context.Context, event *info.Event, statusOp
117113
if statusOpts.DetailsURL != "" {
118114
detailsURL = statusOpts.DetailsURL
119115
}
120-
if v.scmClient == nil {
116+
if v.client == nil {
121117
return fmt.Errorf("no token has been set, cannot set status")
122118
}
123119

@@ -137,7 +133,7 @@ func (v *Provider) CreateStatus(ctx context.Context, event *info.Event, statusOp
137133
Desc: statusOpts.Title,
138134
Link: detailsURL,
139135
}
140-
_, _, err := v.ScmClient().Repositories.CreateStatus(ctx, OrgAndRepo, event.SHA, opts)
136+
_, _, err := v.Client().Repositories.CreateStatus(ctx, OrgAndRepo, event.SHA, opts)
141137
if err != nil {
142138
return err
143139
}
@@ -153,7 +149,7 @@ func (v *Provider) CreateStatus(ctx context.Context, event *info.Event, statusOp
153149
input := &scm.CommentInput{
154150
Body: bbComment,
155151
}
156-
_, _, err := v.ScmClient().PullRequests.CreateComment(ctx, OrgAndRepo, event.PullRequestNumber, input)
152+
_, _, err := v.Client().PullRequests.CreateComment(ctx, OrgAndRepo, event.PullRequestNumber, input)
157153
if err != nil {
158154
return err
159155
}
@@ -203,7 +199,7 @@ func (v *Provider) concatAllYamlFiles(ctx context.Context, objects []string, sha
203199

204200
func (v *Provider) getRaw(ctx context.Context, runevent *info.Event, revision, path string) (string, error) {
205201
repo := fmt.Sprintf("%s/%s", runevent.Organization, runevent.Repository)
206-
content, _, err := v.ScmClient().Contents.Find(ctx, repo, path, revision)
202+
content, _, err := v.Client().Contents.Find(ctx, repo, path, revision)
207203
if err != nil {
208204
return "", fmt.Errorf("cannot find %s inside the %s repository: %w", path, runevent.Repository, err)
209205
}
@@ -225,7 +221,7 @@ func (v *Provider) GetTektonDir(ctx context.Context, event *info.Event, path, pr
225221
var fileEntries []*scm.FileEntry
226222
opts := &scm.ListOptions{Page: 1, Size: apiResponseLimit}
227223
for {
228-
entries, _, err := v.ScmClient().Contents.List(ctx, orgAndRepo, path, at, opts)
224+
entries, _, err := v.Client().Contents.List(ctx, orgAndRepo, path, at, opts)
229225
if err != nil {
230226
return "", fmt.Errorf("cannot list content of %s directory: %w", path, err)
231227
}
@@ -296,7 +292,7 @@ func (v *Provider) SetClient(ctx context.Context, run *params.Run, event *info.E
296292
event.Provider.URL = strings.TrimSuffix(event.Provider.URL, "/")
297293
v.apiURL = event.Provider.URL
298294

299-
if v.scmClient == nil {
295+
if v.client == nil {
300296
client, err := stash.New(removeLastSegment(event.Provider.URL)) // remove `/rest` from url
301297
if err != nil {
302298
return err
@@ -310,12 +306,12 @@ func (v *Provider) SetClient(ctx context.Context, run *params.Run, event *info.E
310306
),
311307
},
312308
}
313-
v.scmClient = client
309+
v.client = client
314310
}
315311
v.run = run
316312
v.repo = repo
317313
v.triggerEvent = event.EventType
318-
_, resp, err := v.ScmClient().Users.FindLogin(ctx, event.Provider.User)
314+
_, resp, err := v.Client().Users.FindLogin(ctx, event.Provider.User)
319315
if resp != nil && resp.Status == http.StatusUnauthorized {
320316
return fmt.Errorf("cannot get user %s with token: %w", event.Provider.User, err)
321317
}
@@ -328,14 +324,14 @@ func (v *Provider) SetClient(ctx context.Context, run *params.Run, event *info.E
328324

329325
func (v *Provider) GetCommitInfo(_ context.Context, event *info.Event) error {
330326
OrgAndRepo := fmt.Sprintf("%s/%s", event.Organization, event.Repository)
331-
commit, _, err := v.ScmClient().Git.FindCommit(context.Background(), OrgAndRepo, event.SHA)
327+
commit, _, err := v.Client().Git.FindCommit(context.Background(), OrgAndRepo, event.SHA)
332328
if err != nil {
333329
return err
334330
}
335331
event.SHATitle = sanitizeTitle(commit.Message)
336332
event.SHAURL = fmt.Sprintf("%s/projects/%s/repos/%s/commits/%s", v.baseURL, v.projectKey, event.Repository, event.SHA)
337333

338-
ref, _, err := v.ScmClient().Git.GetDefaultBranch(context.Background(), OrgAndRepo)
334+
ref, _, err := v.Client().Git.GetDefaultBranch(context.Background(), OrgAndRepo)
339335
if err != nil {
340336
return err
341337
}
@@ -358,7 +354,7 @@ func (v *Provider) GetFiles(ctx context.Context, runevent *info.Event) (changedf
358354
opts := &scm.ListOptions{Page: 1, Size: apiResponseLimit}
359355
changedFiles := changedfiles.ChangedFiles{}
360356
for {
361-
changes, _, err := v.ScmClient().PullRequests.ListChanges(ctx, OrgAndRepo, runevent.PullRequestNumber, opts)
357+
changes, _, err := v.Client().PullRequests.ListChanges(ctx, OrgAndRepo, runevent.PullRequestNumber, opts)
362358
if err != nil {
363359
return changedfiles.ChangedFiles{}, fmt.Errorf("failed to list changes for pull request: %w", err)
364360
}
@@ -396,7 +392,7 @@ func (v *Provider) GetFiles(ctx context.Context, runevent *info.Event) (changedf
396392
opts := &scm.ListOptions{Page: 1, Size: apiResponseLimit}
397393
changedFiles := changedfiles.ChangedFiles{}
398394
for {
399-
changes, _, err := v.ScmClient().Git.ListChanges(ctx, OrgAndRepo, runevent.SHA, opts)
395+
changes, _, err := v.Client().Git.ListChanges(ctx, OrgAndRepo, runevent.SHA, opts)
400396
if err != nil {
401397
return changedfiles.ChangedFiles{}, fmt.Errorf("failed to list changes for commit %s: %w", runevent.SHA, err)
402398
}

‎pkg/provider/bitbucketdatacenter/bitbucketdatacenter_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestGetTektonDir(t *testing.T) {
8585
ctx, _ := rtesting.SetupFakeContext(t)
8686
client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
8787
defer tearDown()
88-
v := &Provider{Logger: logger, baseURL: tURL, scmClient: client, projectKey: tt.event.Organization}
88+
v := &Provider{Logger: logger, baseURL: tURL, client: client, projectKey: tt.event.Organization}
8989
bbtest.MuxDirContent(t, mux, tt.event, tt.testDirPath, tt.path, tt.wantDirAPIErr, tt.wantFilesAPIErr)
9090
content, err := v.GetTektonDir(ctx, tt.event, tt.path, "")
9191
if tt.wantErr != "" {
@@ -203,7 +203,7 @@ func TestCreateStatus(t *testing.T) {
203203
event.Provider.Token = "token"
204204
v := &Provider{
205205
baseURL: tURL,
206-
scmClient: client,
206+
client: client,
207207
pullRequestNumber: pullRequestNumber,
208208
projectKey: event.Organization,
209209
run: &params.Run{},
@@ -268,7 +268,7 @@ func TestGetFileInsideRepo(t *testing.T) {
268268
ctx, _ := rtesting.SetupFakeContext(t)
269269
client, mux, tearDown, tURL := bbtest.SetupBBDataCenterClient()
270270
defer tearDown()
271-
v := &Provider{scmClient: client, baseURL: tURL, defaultBranchLatestCommit: "1234", projectKey: tt.event.Organization}
271+
v := &Provider{client: 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 != "")
273273
fc, err := v.GetFileInsideRepo(ctx, tt.event, tt.path, tt.targetbranch)
274274
if tt.wantErr != "" {
@@ -368,7 +368,7 @@ func TestSetClient(t *testing.T) {
368368
if tt.muxUser != nil {
369369
mux.HandleFunc("/users/foo", tt.muxUser)
370370
}
371-
v := &Provider{scmClient: client, baseURL: tURL}
371+
v := &Provider{client: client, baseURL: tURL}
372372
err := v.SetClient(ctx, nil, tt.opts, nil, nil)
373373
if tt.wantErrSubstr != "" {
374374
assert.ErrorContains(t, err, tt.wantErrSubstr)
@@ -406,11 +406,11 @@ 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()
409+
client, 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()
413-
v := &Provider{scmClient: scmClient, baseURL: tURL, projectKey: tt.event.Organization}
413+
v := &Provider{client: client, baseURL: tURL, projectKey: tt.event.Organization}
414414
err := v.GetCommitInfo(ctx, tt.event)
415415
assert.NilError(t, err)
416416
assert.Equal(t, tt.defaultBranch, tt.event.DefaultBranch)
@@ -710,7 +710,7 @@ func TestGetFiles(t *testing.T) {
710710
}
711711
})
712712
}
713-
v := &Provider{scmClient: client, baseURL: tURL}
713+
v := &Provider{client: client, baseURL: tURL}
714714
changedFiles, err := v.GetFiles(ctx, tt.event)
715715
if tt.wantError {
716716
assert.Equal(t, err.Error(), tt.errMsg)

0 commit comments

Comments
 (0)