Skip to content

Commit 1db9d66

Browse files
yesnaultyesnault
authored
fix(hooks): use DisplayName as bitbucket cloud (#5064)
1 parent 0eedf85 commit 1db9d66

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎engine/api/workflow/process_node_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,18 +1012,6 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
10121012
}
10131013
case "/vcs/stash/repos/ovh/cds/branches/?branch=feat%2Fbranch":
10141014
return writeError(w, sdk.ErrNotFound)
1015-
case "/vcs/github/repos/sguiheux/demo/branches":
1016-
bs := []sdk.VCSBranch{
1017-
{
1018-
LatestCommit: "defaultCommit",
1019-
DisplayID: "defaultBranch",
1020-
Default: true,
1021-
ID: "1",
1022-
},
1023-
}
1024-
if err := enc.Encode(bs); err != nil {
1025-
return writeError(w, err)
1026-
}
10271015
case "/vcs/stash/repos/ovh/cds/commits/defaultCommit":
10281016
c := sdk.VCSCommit{
10291017
Author: sdk.VCSAuthor{
@@ -1051,6 +1039,18 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
10511039
if err := enc.Encode(repo); err != nil {
10521040
return writeError(w, err)
10531041
}
1042+
case "/vcs/github/repos/sguiheux/demo/branches":
1043+
bs := []sdk.VCSBranch{
1044+
{
1045+
LatestCommit: "defaultCommit",
1046+
DisplayID: "defaultBranch",
1047+
Default: true,
1048+
ID: "1",
1049+
},
1050+
}
1051+
if err := enc.Encode(bs); err != nil {
1052+
return writeError(w, err)
1053+
}
10541054
// NEED GET BRANCH TO GET LATEST COMMIT
10551055
case "/vcs/github/repos/sguiheux/demo/branches/?branch=feat%2Fbranch":
10561056
b := sdk.VCSBranch{
@@ -1084,8 +1084,8 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
10841084
)
10851085

10861086
pip := createEmptyPipeline(t, db, cache, proj, u)
1087-
app1 := createApplication1(t, db, cache, proj, u)
1088-
app2 := createApplication2(t, db, cache, proj, u)
1087+
app1 := createApplication1(t, db, cache, proj, u) // github - sguiheux/demo
1088+
app2 := createApplication2(t, db, cache, proj, u) // stash - ovh/cds
10891089

10901090
// RELOAD PROJECT WITH DEPENDENCIES
10911091
proj.Applications = append(proj.Applications, *app1, *app2)
@@ -1102,7 +1102,7 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
11021102
Type: sdk.NodeTypePipeline,
11031103
Context: &sdk.NodeContext{
11041104
PipelineID: proj.Pipelines[0].ID,
1105-
ApplicationID: proj.Applications[0].ID,
1105+
ApplicationID: app1.ID, // github - sguiheux/demo
11061106
},
11071107
Triggers: []sdk.NodeTrigger{
11081108
{
@@ -1111,7 +1111,7 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
11111111
Type: sdk.NodeTypePipeline,
11121112
Context: &sdk.NodeContext{
11131113
PipelineID: proj.Pipelines[0].ID,
1114-
ApplicationID: proj.Applications[1].ID,
1114+
ApplicationID: app2.ID, // stash - ovh/cds
11151115
},
11161116
Triggers: []sdk.NodeTrigger{
11171117
{
@@ -1120,7 +1120,7 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
11201120
Type: sdk.NodeTypePipeline,
11211121
Context: &sdk.NodeContext{
11221122
PipelineID: proj.Pipelines[0].ID,
1123-
ApplicationID: proj.Applications[0].ID,
1123+
ApplicationID: app1.ID, // github - sguiheux/demo
11241124
},
11251125
},
11261126
},
@@ -1131,8 +1131,8 @@ func TestManualRunBuildParameterMultiApplication(t *testing.T) {
11311131
},
11321132
},
11331133
Applications: map[int64]sdk.Application{
1134-
proj.Applications[0].ID: proj.Applications[0],
1135-
proj.Applications[1].ID: proj.Applications[1],
1134+
app1.ID: proj.Applications[0],
1135+
app2.ID: proj.Applications[1],
11361136
},
11371137
Pipelines: map[int64]sdk.Pipeline{
11381138
proj.Pipelines[0].ID: proj.Pipelines[0],

‎engine/hooks/bitbucket_server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func getVariableFromBitbucketServerAuthor(payload map[string]interface{}, actor
105105
if actor == nil {
106106
return
107107
}
108-
payload[GIT_AUTHOR] = actor.Name
108+
payload[GIT_AUTHOR] = actor.DisplayName
109109
payload[GIT_AUTHOR_EMAIL] = actor.EmailAddress
110110
payload[CDS_TRIGGERED_BY_USERNAME] = actor.Name
111111
payload[CDS_TRIGGERED_BY_FULLNAME] = actor.DisplayName

‎engine/hooks/tasks_bitbucket_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func Test_doWebHookExecutionBitbucket(t *testing.T) {
3131
assert.Equal(t, 1, len(hs))
3232
assert.Equal(t, "repo:refs_changed", hs[0].Payload["git.hook"])
3333
assert.Equal(t, "name-of-branch", hs[0].Payload["git.branch"])
34-
assert.Equal(t, "steven.guiheux", hs[0].Payload["git.author"])
34+
assert.Equal(t, "Steven Guiheux", hs[0].Payload["git.author"])
3535
assert.Equal(t, "9f4fac7ec5642099982a86f584f2c4a362adb670", hs[0].Payload["git.hash"])
3636
}
3737

@@ -61,7 +61,7 @@ func Test_doWebHookExecutionBitbucketPRReviewerUpdated(t *testing.T) {
6161
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
6262
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
6363
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
64-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
64+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
6565
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
6666

6767
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -104,7 +104,7 @@ func Test_doWebHookExecutionBitbucketPRReviewerApproved(t *testing.T) {
104104
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
105105
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
106106
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
107-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
107+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
108108
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
109109

110110
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -153,7 +153,7 @@ func Test_doWebHookExecutionBitbucketPRReviewerUnapproved(t *testing.T) {
153153
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
154154
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
155155
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
156-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
156+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
157157
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
158158

159159
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -202,7 +202,7 @@ func Test_doWebHookExecutionBitbucketPRReviewerNeedsWork(t *testing.T) {
202202
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
203203
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
204204
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
205-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
205+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
206206
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
207207

208208
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -251,7 +251,7 @@ func Test_doWebHookExecutionBitbucketPRCommentAdded(t *testing.T) {
251251
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
252252
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
253253
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
254-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
254+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
255255
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
256256

257257
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -299,7 +299,7 @@ func Test_doWebHookExecutionBitbucketPRCommentDeleted(t *testing.T) {
299299
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
300300
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
301301
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
302-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
302+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
303303
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
304304

305305
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -347,7 +347,7 @@ func Test_doWebHookExecutionBitbucketPRCommentModified(t *testing.T) {
347347
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
348348
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
349349
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
350-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
350+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
351351
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
352352

353353
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -397,7 +397,7 @@ func Test_doWebHookExecutionBitbucketPROpened(t *testing.T) {
397397
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
398398
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
399399
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
400-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
400+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
401401
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
402402

403403
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -441,7 +441,7 @@ func Test_doWebHookExecutionBitbucketPRModified(t *testing.T) {
441441
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
442442
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
443443
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
444-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
444+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
445445
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
446446

447447
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -488,7 +488,7 @@ func Test_doWebHookExecutionBitbucketPRMerged(t *testing.T) {
488488
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
489489
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
490490
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
491-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
491+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
492492
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
493493

494494
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -532,7 +532,7 @@ func Test_doWebHookExecutionBitbucketPRDeleted(t *testing.T) {
532532
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
533533
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
534534
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
535-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
535+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
536536
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
537537

538538
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -575,7 +575,7 @@ func Test_doWebHookExecutionBitbucketPRDeclined(t *testing.T) {
575575
test.Equal(t, "john.doe", hs[0].Payload[CDS_TRIGGERED_BY_USERNAME])
576576
test.Equal(t, "john doe", hs[0].Payload[CDS_TRIGGERED_BY_FULLNAME])
577577
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[CDS_TRIGGERED_BY_EMAIL])
578-
test.Equal(t, "john.doe", hs[0].Payload[GIT_AUTHOR])
578+
test.Equal(t, "john doe", hs[0].Payload[GIT_AUTHOR])
579579
test.Equal(t, "john.doe@targate.fr", hs[0].Payload[GIT_AUTHOR_EMAIL])
580580

581581
test.Equal(t, "dest_branch", hs[0].Payload[GIT_BRANCH])
@@ -612,10 +612,10 @@ func Test_doWebHookExecutionBitbucketMultiple(t *testing.T) {
612612

613613
assert.Equal(t, 2, len(hs))
614614
assert.Equal(t, "name-of-branch", hs[0].Payload["git.branch"])
615-
assert.Equal(t, "steven.guiheux", hs[0].Payload["git.author"])
615+
assert.Equal(t, "Steven Guiheux", hs[0].Payload["git.author"])
616616
assert.Equal(t, "9f4fac7ec5642099982a86f584f2c4a362adb670", hs[0].Payload["git.hash"])
617617
assert.Equal(t, "name-of-branch-bis", hs[1].Payload["git.branch"])
618-
assert.Equal(t, "steven.guiheux", hs[1].Payload["git.author"])
618+
assert.Equal(t, "Steven Guiheux", hs[1].Payload["git.author"])
619619
assert.Equal(t, "9f4fac7ec5642099982a86f584f2c4a362adb670", hs[0].Payload["git.hash"])
620620
}
621621

0 commit comments

Comments
 (0)