Skip to content

Commit c86c1f1

Browse files
author
Dean Karn
authored
Merge pull request #84 from ilteristabak/updated-bb-actor
Update BitBucket Owner payload
2 parents 2c92b65 + a740f8c commit c86c1f1

19 files changed

+240
-180
lines changed

‎bitbucket/payload.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,9 @@ type PullRequestCommentDeletedPayload struct {
348348
// Owner is the common Bitbucket Owner Sub Entity
349349
type Owner struct {
350350
Type string `json:"type"`
351-
Username string `json:"username"`
351+
NickName string `json:"nickname"`
352352
DisplayName string `json:"display_name"`
353+
AccountId string `json:"account_id"`
353354
UUID string `json:"uuid"`
354355
Links struct {
355356
Self struct {

‎testdata/bitbucket/commit-comment-created.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"actor":{
3-
"username":"emmap1",
3+
"nickname":"emmap1",
4+
"account_id":"udfy9suggmzpswxc7n200y3c",
45
"display_name":"Emma",
56
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
67
"links":{
78
"self":{
8-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
9+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
910
},
1011
"html":{
11-
"href":"https://api.bitbucket.org/emmap1"
12+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
1213
},
1314
"avatar":{
1415
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

‎testdata/bitbucket/issue-comment-created.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"actor":{
3-
"username":"emmap1",
3+
"nickname":"emmap1",
4+
"account_id":"udfy9suggmzpswxc7n200y3c",
45
"display_name":"Emma",
56
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
67
"links":{
78
"self":{
8-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
9+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
910
},
1011
"html":{
11-
"href":"https://api.bitbucket.org/emmap1"
12+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
1213
},
1314
"avatar":{
1415
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

‎testdata/bitbucket/issue-created.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"actor":{
3-
"username":"emmap1",
3+
"nickname":"emmap1",
4+
"account_id":"udfy9suggmzpswxc7n200y3c",
45
"display_name":"Emma",
56
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
67
"links":{
78
"self":{
8-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
9+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
910
},
1011
"html":{
11-
"href":"https://api.bitbucket.org/emmap1"
12+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
1213
},
1314
"avatar":{
1415
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

‎testdata/bitbucket/issue-updated.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"actor":{
3-
"username":"emmap1",
3+
"nickname":"emmap1",
4+
"account_id":"udfy9suggmzpswxc7n200y3c",
45
"display_name":"Emma",
56
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
67
"links":{
78
"self":{
8-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
9+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
910
},
1011
"html":{
11-
"href":"https://api.bitbucket.org/emmap1"
12+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
1213
},
1314
"avatar":{
1415
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

‎testdata/bitbucket/pull-request-approval-removed.json‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"actor":{
3-
"username":"emmap1",
3+
"nickname":"emmap1",
4+
"account_id":"udfy9suggmzpswxc7n200y3c",
45
"display_name":"Emma",
56
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
67
"links":{
78
"self":{
8-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
9+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
910
},
1011
"html":{
11-
"href":"https://api.bitbucket.org/emmap1"
12+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
1213
},
1314
"avatar":{
1415
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
2122
"description":"Description of pull request",
2223
"state":"OPEN|MERGED|DECLINED",
2324
"author":{
24-
"username":"emmap1",
25+
"nickname":"emmap1",
26+
"account_id":"udfy9suggmzpswxc7n200y3c",
2527
"display_name":"Emma",
2628
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
2729
"links":{
2830
"self":{
29-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
31+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
3032
},
3133
"html":{
32-
"href":"https://api.bitbucket.org/emmap1"
34+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
3335
},
3436
"avatar":{
3537
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
9395
},
9496
"participants":[
9597
{
96-
"username":"emmap1",
98+
"nickname":"emmap1",
99+
"account_id":"udfy9suggmzpswxc7n200y3c",
97100
"display_name":"Emma",
98101
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
99102
"links":{
100103
"self":{
101-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
104+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
102105
},
103106
"html":{
104-
"href":"https://api.bitbucket.org/emmap1"
107+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
105108
},
106109
"avatar":{
107110
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
111114
],
112115
"reviewers":[
113116
{
114-
"username":"emmap1",
117+
"nickname":"emmap1",
118+
"account_id":"udfy9suggmzpswxc7n200y3c",
115119
"display_name":"Emma",
116120
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
117121
"links":{
118122
"self":{
119-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
123+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
120124
},
121125
"html":{
122-
"href":"https://api.bitbucket.org/emmap1"
126+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
123127
},
124128
"avatar":{
125129
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
129133
],
130134
"close_source_branch":true,
131135
"closed_by":{
132-
"username":"emmap1",
136+
"nickname":"emmap1",
137+
"account_id":"udfy9suggmzpswxc7n200y3c",
133138
"display_name":"Emma",
134139
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
135140
"links":{
136141
"self":{
137-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
142+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
138143
},
139144
"html":{
140-
"href":"https://api.bitbucket.org/emmap1"
145+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
141146
},
142147
"avatar":{
143148
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
177182
"approval":{
178183
"date":"2015-04-06T16:34:59.195330+00:00",
179184
"user":{
180-
"username":"emmap1",
185+
"nickname":"emmap1",
186+
"account_id":"udfy9suggmzpswxc7n200y3c",
181187
"display_name":"Emma",
182188
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
183189
"links":{
184190
"self":{
185-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
191+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
186192
},
187193
"html":{
188-
"href":"https://api.bitbucket.org/emmap1"
194+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
189195
},
190196
"avatar":{
191197
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

‎testdata/bitbucket/pull-request-approved.json‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"actor":{
3-
"username":"emmap1",
3+
"nickname":"emmap1",
4+
"account_id":"udfy9suggmzpswxc7n200y3c",
45
"display_name":"Emma",
56
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
67
"links":{
78
"self":{
8-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
9+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
910
},
1011
"html":{
11-
"href":"https://api.bitbucket.org/emmap1"
12+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
1213
},
1314
"avatar":{
1415
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
2122
"description":"Description of pull request",
2223
"state":"OPEN|MERGED|DECLINED",
2324
"author":{
24-
"username":"emmap1",
25+
"nickname":"emmap1",
26+
"account_id":"udfy9suggmzpswxc7n200y3c",
2527
"display_name":"Emma",
2628
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
2729
"links":{
2830
"self":{
29-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
31+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
3032
},
3133
"html":{
32-
"href":"https://api.bitbucket.org/emmap1"
34+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
3335
},
3436
"avatar":{
3537
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
9395
},
9496
"participants":[
9597
{
96-
"username":"emmap1",
98+
"nickname":"emmap1",
99+
"account_id":"udfy9suggmzpswxc7n200y3c",
97100
"display_name":"Emma",
98101
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
99102
"links":{
100103
"self":{
101-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
104+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
102105
},
103106
"html":{
104-
"href":"https://api.bitbucket.org/emmap1"
107+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
105108
},
106109
"avatar":{
107110
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
111114
],
112115
"reviewers":[
113116
{
114-
"username":"emmap1",
117+
"nickname":"emmap1",
118+
"account_id":"udfy9suggmzpswxc7n200y3c",
115119
"display_name":"Emma",
116120
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
117121
"links":{
118122
"self":{
119-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
123+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
120124
},
121125
"html":{
122-
"href":"https://api.bitbucket.org/emmap1"
126+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
123127
},
124128
"avatar":{
125129
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
129133
],
130134
"close_source_branch":true,
131135
"closed_by":{
132-
"username":"emmap1",
136+
"nickname":"emmap1",
137+
"account_id":"udfy9suggmzpswxc7n200y3c",
133138
"display_name":"Emma",
134139
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
135140
"links":{
136141
"self":{
137-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
142+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
138143
},
139144
"html":{
140-
"href":"https://api.bitbucket.org/emmap1"
145+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
141146
},
142147
"avatar":{
143148
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
177182
"approval":{
178183
"date":"2015-04-06T16:34:59.195330+00:00",
179184
"user":{
180-
"username":"emmap1",
185+
"nickname":"emmap1",
186+
"account_id":"udfy9suggmzpswxc7n200y3c",
181187
"display_name":"Emma",
182188
"uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
183189
"links":{
184190
"self":{
185-
"href":"https://api.bitbucket.org/api/2.0/users/emmap1"
191+
"href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
186192
},
187193
"html":{
188-
"href":"https://api.bitbucket.org/emmap1"
194+
"href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
189195
},
190196
"avatar":{
191197
"href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

0 commit comments

Comments
 (0)