Update README.md

Move node_id field from status to status.commit in StatusEvent

README.md

@@ -1,6 +1,6 @@
 Library webhooks
 ================
-<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v5/logo.png">![Project status](https://img.shields.io/badge/version-5.8.0-green.svg)
+<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v5/logo.png">![Project status](https://img.shields.io/badge/version-5.12.0-green.svg)
 [![Build Status](https://travis-ci.org/go-playground/webhooks.svg?branch=v5)](https://travis-ci.org/go-playground/webhooks)
 [![Coverage Status](https://coveralls.io/repos/go-playground/webhooks/badge.svg?branch=v5&service=github)](https://coveralls.io/github/go-playground/webhooks?branch=v5)
 [![Go Report Card](https://goreportcard.com/badge/go-playground/webhooks)](https://goreportcard.com/report/go-playground/webhooks)

bitbucket/payload.go

@@ -348,8 +348,9 @@ type PullRequestCommentDeletedPayload struct {
 // Owner is the common Bitbucket Owner Sub Entity
 type Owner struct {
 	Type        string `json:"type"`
-	Username    string `json:"username"`
+	NickName    string `json:"nickname"`
 	DisplayName string `json:"display_name"`
+	AccountId   string `json:"account_id"`
 	UUID        string `json:"uuid"`
 	Links       struct {
 		Self struct {

github/github.go

@@ -28,42 +28,44 @@ type Event string
 
 // GitHub hook types
 const (
-	CheckRunEvent                 Event = "check_run"
+	CheckRunEvent                     Event = "check_run"
-	CheckSuiteEvent               Event = "check_suite"
+	CheckSuiteEvent                   Event = "check_suite"
-	CommitCommentEvent            Event = "commit_comment"
+	CommitCommentEvent                Event = "commit_comment"
-	CreateEvent                   Event = "create"
+	CreateEvent                       Event = "create"
-	DeleteEvent                   Event = "delete"
+	DeleteEvent                       Event = "delete"
-	DeploymentEvent               Event = "deployment"
+	DeploymentEvent                   Event = "deployment"
-	DeploymentStatusEvent         Event = "deployment_status"
+	DeploymentStatusEvent             Event = "deployment_status"
-	ForkEvent                     Event = "fork"
+	ForkEvent                         Event = "fork"
-	GollumEvent                   Event = "gollum"
+	GollumEvent                       Event = "gollum"
-	InstallationEvent             Event = "installation"
+	InstallationEvent                 Event = "installation"
-	InstallationRepositoriesEvent Event = "installation_repositories"
+	InstallationRepositoriesEvent     Event = "installation_repositories"
-	IntegrationInstallationEvent  Event = "integration_installation"
+	IntegrationInstallationEvent      Event = "integration_installation"
-	IssueCommentEvent             Event = "issue_comment"
+	IssueCommentEvent                 Event = "issue_comment"
-	IssuesEvent                   Event = "issues"
+	IssuesEvent                       Event = "issues"
-	LabelEvent                    Event = "label"
+	LabelEvent                        Event = "label"
-	MemberEvent                   Event = "member"
+	MemberEvent                       Event = "member"
-	MembershipEvent               Event = "membership"
+	MembershipEvent                   Event = "membership"
-	MilestoneEvent                Event = "milestone"
+	MilestoneEvent                    Event = "milestone"
-	OrganizationEvent             Event = "organization"
+	OrganizationEvent                 Event = "organization"
-	OrgBlockEvent                 Event = "org_block"
+	OrgBlockEvent                     Event = "org_block"
-	PageBuildEvent                Event = "page_build"
+	PageBuildEvent                    Event = "page_build"
-	PingEvent                     Event = "ping"
+	PingEvent                         Event = "ping"
-	ProjectCardEvent              Event = "project_card"
+	ProjectCardEvent                  Event = "project_card"
-	ProjectColumnEvent            Event = "project_column"
+	ProjectColumnEvent                Event = "project_column"
-	ProjectEvent                  Event = "project"
+	ProjectEvent                      Event = "project"
-	PublicEvent                   Event = "public"
+	PublicEvent                       Event = "public"
-	PullRequestEvent              Event = "pull_request"
+	PullRequestEvent                  Event = "pull_request"
-	PullRequestReviewEvent        Event = "pull_request_review"
+	PullRequestReviewEvent            Event = "pull_request_review"
-	PullRequestReviewCommentEvent Event = "pull_request_review_comment"
+	PullRequestReviewCommentEvent     Event = "pull_request_review_comment"
-	PushEvent                     Event = "push"
+	PushEvent                         Event = "push"
-	ReleaseEvent                  Event = "release"
+	ReleaseEvent                      Event = "release"
-	RepositoryEvent               Event = "repository"
+	RepositoryEvent                   Event = "repository"
-	StatusEvent                   Event = "status"
+	RepositoryVulnerabilityAlertEvent Event = "repository_vulnerability_alert"
-	TeamEvent                     Event = "team"
+	SecurityAdvisoryEvent             Event = "security_advisory"
-	TeamAddEvent                  Event = "team_add"
+	StatusEvent                       Event = "status"
-	WatchEvent                    Event = "watch"
+	TeamEvent                         Event = "team"
+	TeamAddEvent                      Event = "team_add"
+	WatchEvent                        Event = "watch"
 )
 
 // EventSubtype defines a GitHub Hook Event subtype
@@ -288,6 +290,14 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error)
 		var pl RepositoryPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
+	case RepositoryVulnerabilityAlertEvent:
+		var pl RepositoryVulnerabilityAlertPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
+	case SecurityAdvisoryEvent:
+		var pl SecurityAdvisoryPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
 	case StatusEvent:
 		var pl StatusPayload
 		err = json.Unmarshal([]byte(payload), &pl)

github/github_test.go

@@ -453,6 +453,26 @@ func TestWebhooks(t *testing.T) {
 				"X-Hub-Signature": []string{"sha1=df442a8af41edd2d42ccdd997938d1d111b0f94e"},
 			},
 		},
+		{
+			name:     "RepositoryVulnerabilityAlertEvent",
+			event:    RepositoryVulnerabilityAlertEvent,
+			typ:      RepositoryVulnerabilityAlertPayload{},
+			filename: "../testdata/github/repository-vulnerability-alert.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"repository_vulnerability_alert"},
+				"X-Hub-Signature": []string{"sha1=c42c0649e7e06413bcd756763edbab48dff400db"},
+			},
+		},
+		{
+			name:     "SecurityAdvisoryEvent",
+			event:    SecurityAdvisoryEvent,
+			typ:      SecurityAdvisoryPayload{},
+			filename: "../testdata/github/security-advisory.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"security_advisory"},
+				"X-Hub-Signature": []string{"sha1=6a71f24fa69f55469843a91dc3a5c3e29714a565"},
+			},
+		},
 		{
 			name:     "StatusEvent",
 			event:    StatusEvent,

gitlab/gitlab.go

@@ -32,6 +32,7 @@ const (
 	WikiPageEvents           Event = "Wiki Page Hook"
 	PipelineEvents           Event = "Pipeline Hook"
 	BuildEvents              Event = "Build Hook"
+	JobEvents                Event = "Job Hook"
 	SystemHookEvents         Event = "System Hook"
 
 	objectPush         string = "push"
@@ -171,6 +172,10 @@ func eventParsing(gitLabEvent Event, events []Event, payload []byte) (interface{
 		var pl BuildEventPayload
 		err := json.Unmarshal([]byte(payload), &pl)
 		return pl, err
+	case JobEvents:
+		var p1 JobEventPayload
+		err := json.Unmarshal([]byte(payload), &p1)
+		return p1, err
 
 	case SystemHookEvents:
 		var pl SystemHookPayload

gitlab/gitlab_test.go

@@ -231,6 +231,15 @@ func TestWebhooks(t *testing.T) {
 				"X-Gitlab-Event": []string{"Build Hook"},
 			},
 		},
+		{
+			name:     "JobEvent",
+			event:    JobEvents,
+			typ:      JobEventPayload{},
+			filename: "../testdata/gitlab/job-event.json",
+			headers: http.Header{
+				"X-Gitlab-Event": []string{"Job Hook"},
+			},
+		},
 	}
 
 	for _, tt := range tests {

gitlab/payload.go

@@ -109,7 +109,7 @@ type PipelineEventPayload struct {
 	Project          Project          `json:"project"`
 	Commit           Commit           `json:"commit"`
 	ObjectAttributes ObjectAttributes `json:"object_attributes"`
-	Builds           []Build          `json:"builds"`
+	Jobs             []Job            `json:"jobs"`
 }
 
 // CommentEventPayload contains the information for GitLab's comment event
@@ -148,6 +148,29 @@ type BuildEventPayload struct {
 	Repository        Repository  `json:"repository"`
 }
 
+// JobEventPayload contains the information for GitLab's Job status change
+type JobEventPayload struct {
+	ObjectKind       string      `json:"object_kind"`
+	Ref              string      `json:"ref"`
+	Tag              bool        `json:"tag"`
+	BeforeSHA        string      `json:"before_sha"`
+	SHA              string      `json:"sha"`
+	JobID            int64       `json:"Job_id"`
+	JobName          string      `json:"Job_name"`
+	JobStage         string      `json:"Job_stage"`
+	JobStatus        string      `json:"Job_status"`
+	JobStartedAt     customTime  `json:"Job_started_at"`
+	JobFinishedAt    customTime  `json:"Job_finished_at"`
+	JobDuration      int64       `json:"Job_duration"`
+	Job              bool        `json:"Job"`
+	JobFailureReason string      `json:"job_failure_reason"`
+	ProjectID        int64       `json:"project_id"`
+	ProjectName      string      `json:"project_name"`
+	User             User        `json:"user"`
+	Commit           BuildCommit `json:"commit"`
+	Repository       Repository  `json:"repository"`
+}
+
 // SystemHookPayload contains the ObjectKind to match with real hook events
 type SystemHookPayload struct {
 	ObjectKind string `json:"object_kind"`
@@ -170,8 +193,8 @@ type Issue struct {
 	IID         int64      `json:"iid"`
 }
 
-// Build contains all of the GitLab build information
+// Job contains all of the GitLab job information
-type Build struct {
+type Job struct {
 	ID            int64         `json:"id"`
 	Stage         string        `json:"stage"`
 	Name          string        `json:"name"`
@@ -284,51 +307,74 @@ type Repository struct {
 
 // ObjectAttributes contains all of the GitLab object attributes information
 type ObjectAttributes struct {
-	ID              int64      `json:"id"`
+	ID               int64      `json:"id"`
-	Title           string     `json:"title"`
+	Title            string     `json:"title"`
-	AssigneeID      int64      `json:"assignee_id"`
+	AssigneeID       int64      `json:"assignee_id"`
-	AuthorID        int64      `json:"author_id"`
+	AuthorID         int64      `json:"author_id"`
-	ProjectID       int64      `json:"project_id"`
+	ProjectID        int64      `json:"project_id"`
-	CreatedAt       customTime `json:"created_at"`
+	CreatedAt        customTime `json:"created_at"`
-	UpdatedAt       customTime `json:"updated_at"`
+	UpdatedAt        customTime `json:"updated_at"`
-	Position        int64      `json:"position"`
+	ChangePosition   Position   `json:"change_position"`
-	BranchName      string     `json:"branch_name"`
+	OriginalPosition Position   `json:"original_position"`
-	Description     string     `json:"description"`
+	Position         Position   `json:"position"`
-	MilestoneID     int64      `json:"milestone_id"`
+	BranchName       string     `json:"branch_name"`
-	State           string     `json:"state"`
+	Description      string     `json:"description"`
-	IID             int64      `json:"iid"`
+	MilestoneID      int64      `json:"milestone_id"`
-	URL             string     `json:"url"`
+	State            string     `json:"state"`
-	Action          string     `json:"action"`
+	IID              int64      `json:"iid"`
-	TargetBranch    string     `json:"target_branch"`
+	URL              string     `json:"url"`
-	SourceBranch    string     `json:"source_branch"`
+	Action           string     `json:"action"`
-	SourceProjectID int64      `json:"source_project_id"`
+	TargetBranch     string     `json:"target_branch"`
-	TargetProjectID int64      `json:"target_project_id"`
+	SourceBranch     string     `json:"source_branch"`
-	StCommits       string     `json:"st_commits"`
+	SourceProjectID  int64      `json:"source_project_id"`
-	MergeStatus     string     `json:"merge_status"`
+	TargetProjectID  int64      `json:"target_project_id"`
-	Content         string     `json:"content"`
+	StCommits        string     `json:"st_commits"`
-	Format          string     `json:"format"`
+	MergeStatus      string     `json:"merge_status"`
-	Message         string     `json:"message"`
+	Content          string     `json:"content"`
-	Slug            string     `json:"slug"`
+	Format           string     `json:"format"`
-	Ref             string     `json:"ref"`
+	Message          string     `json:"message"`
-	Tag             bool       `json:"tag"`
+	Slug             string     `json:"slug"`
-	SHA             string     `json:"sha"`
+	Ref              string     `json:"ref"`
-	BeforeSHA       string     `json:"before_sha"`
+	Tag              bool       `json:"tag"`
-	Status          string     `json:"status"`
+	SHA              string     `json:"sha"`
-	Stages          []string   `json:"stages"`
+	BeforeSHA        string     `json:"before_sha"`
-	Duration        int64      `json:"duration"`
+	Status           string     `json:"status"`
-	Note            string     `json:"note"`
+	Stages           []string   `json:"stages"`
-	NotebookType    string     `json:"noteable_type"`
+	Duration         int64      `json:"duration"`
-	At              customTime `json:"attachment"`
+	Note             string     `json:"note"`
-	LineCode        string     `json:"line_code"`
+	NotebookType     string     `json:"noteable_type"`
-	CommitID        string     `json:"commit_id"`
+	At               customTime `json:"attachment"`
-	NoteableID      int64      `json:"noteable_id"`
+	LineCode         string     `json:"line_code"`
-	System          bool       `json:"system"`
+	CommitID         string     `json:"commit_id"`
-	WorkInProgress  bool       `json:"work_in_progress"`
+	NoteableID       int64      `json:"noteable_id"`
-	StDiffs         []StDiff   `json:"st_diffs"`
+	System           bool       `json:"system"`
-	Source          Source     `json:"source"`
+	WorkInProgress   bool       `json:"work_in_progress"`
-	Target          Target     `json:"target"`
+	StDiffs          []StDiff   `json:"st_diffs"`
-	LastCommit      LastCommit `json:"last_commit"`
+	Source           Source     `json:"source"`
-	Assignee        Assignee   `json:"assignee"`
+	Target           Target     `json:"target"`
+	LastCommit       LastCommit `json:"last_commit"`
+	Assignee         Assignee   `json:"assignee"`
+}
+
+// Position defines a specific location, identified by paths line numbers and
+// image coordinates, within a specific diff, identified by start, head and
+// base commit ids.
+//
+// Text position will have: new_line and old_line
+// Image position will have: width, height, x, y
+type Position struct {
+	BaseSHA      string `json:"base_sha"`
+	StartSHA     string `json:"start_sha"`
+	HeadSHA      string `json:"head_sha"`
+	OldPath      string `json:"old_path"`
+	NewPath      string `json:"new_path"`
+	PositionType string `json:"position_type"`
+	OldLine      int64  `json:"old_line"`
+	NewLine      int64  `json:"new_line"`
+	Width        int64  `json:"width"`
+	Height       int64  `json:"height"`
+	X            int64  `json:"x"`
+	Y            int64  `json:"y"`
 }
 
 // MergeRequest contains all of the GitLab merge request information

testdata/bitbucket/commit-comment-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "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

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/issue-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/issue-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "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

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
   "approval":{
     "date":"2015-04-06T16:34:59.195330+00:00",
     "user":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "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

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
   "approval":{
     "date":"2015-04-06T16:34:59.195330+00:00",
     "user":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-comment-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-comment-deleted.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-comment-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-declined.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-merged.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -98,10 +100,10 @@
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-commit-status-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-commit-status-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-fork.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-push.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -43,15 +44,16 @@
             "type":"commit",
             "hash":"709d658dc5b6d6afcd46049c2f332ee3f515a67d",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -102,15 +104,16 @@
             "type":"commit",
             "hash":"1e65c05c1d5171631d92438a13901ca7dae9618c",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -174,15 +177,16 @@
             "type":"commit",
             "message":"commit message\n",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-updated.json

@@ -1,15 +1,16 @@
 {
   "actor": {
     "type": "user",
-    "username": "emmap1",
+    "nickname": "emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name": "Emma",
     "uuid": "{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links": {
       "self": {
-        "href": "https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href": "https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html": {
-        "href": "https://api.bitbucket.org/emmap1"
+        "href": "https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar": {
         "href": "https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -49,15 +50,16 @@
     "website": "https://mywebsite.com/",
     "owner": {
       "type": "user",
-      "username": "emmap1",
+      "nickname": "emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name": "Emma",
       "uuid": "{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links": {
         "self": {
-          "href": "https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href": "https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html": {
-          "href": "https://api.bitbucket.org/emmap1"
+          "href": "https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar": {
           "href": "https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/github/repository-vulnerability-alert.json

@@ -0,0 +1,33 @@
+{
+  "action": "dismiss",
+  "alert": {
+    "id": 7649605,
+    "affected_range": "0.2.0",
+    "affected_package_name": "many_versioned_gem",
+    "external_reference": "https://nvd.nist.gov/vuln/detail/CVE-2018-3728",
+    "external_identifier": "CVE-2018-3728",
+    "fixed_in": "0.2.5",
+    "dismisser": {
+      "login":"octocat",
+      "id":1,
+      "node_id": "MDQ6VXNlcjIxMDMxMDY3",
+      "avatar_url":"https://github.com/images/error/octocat_happy.gif",
+      "gravatar_id":"",
+      "url":"https://api.github.com/users/octocat",
+      "html_url":"https://github.com/octocat",
+      "followers_url":"https://api.github.com/users/octocat/followers",
+      "following_url":"https://api.github.com/users/octocat/following{/other_user}",
+      "gists_url":"https://api.github.com/users/octocat/gists{/gist_id}",
+      "starred_url":"https://api.github.com/users/octocat/starred{/owner}{/repo}",
+      "subscriptions_url":"https://api.github.com/users/octocat/subscriptions",
+      "organizations_url":"https://api.github.com/users/octocat/orgs",
+      "repos_url":"https://api.github.com/users/octocat/repos",
+      "events_url":"https://api.github.com/users/octocat/events{/privacy}",
+      "received_events_url":"https://api.github.com/users/octocat/received_events",
+      "type":"User",
+      "site_admin":true
+    },
+    "dismiss_reason": "No bandwidth to fix this",
+    "dismissed_at": "2017-10-25T00:00:00+00:00"
+  }
+}

testdata/github/security-advisory.json

@@ -0,0 +1,51 @@
+{
+  "action": "published",
+  "security_advisory": {
+    "ghsa_id": "GHSA-rf4j-j272-fj86",
+    "summary": "Moderate severity vulnerability that affects django",
+    "description": "django.contrib.auth.forms.AuthenticationForm in Django 2.0 before 2.0.2, and 1.11.8 and 1.11.9, allows remote attackers to obtain potentially sensitive information by leveraging data exposure from the confirm_login_allowed() method, as demonstrated by discovering whether a user account is inactive.",
+    "severity": "moderate",
+    "identifiers": [
+      {
+        "value": "GHSA-rf4j-j272-fj86",
+        "type": "GHSA"
+      },
+      {
+        "value": "CVE-2018-6188",
+        "type": "CVE"
+      }
+    ],
+    "references": [
+      {
+        "url": "https://nvd.nist.gov/vuln/detail/CVE-2018-6188"
+      }
+    ],
+    "published_at": "2018-10-03T21:13:54Z",
+    "updated_at": "2018-10-03T21:13:54Z",
+    "withdrawn_at": null,
+    "vulnerabilities": [
+      {
+        "package": {
+          "ecosystem": "pip",
+          "name": "django"
+        },
+        "severity": "moderate",
+        "vulnerable_version_range": ">= 2.0.0, < 2.0.2",
+        "first_patched_version": {
+          "identifier": "2.0.2"
+        }
+      },
+      {
+        "package": {
+          "ecosystem": "pip",
+          "name": "django"
+        },
+        "severity": "moderate",
+        "vulnerable_version_range": ">= 1.11.8, < 1.11.10",
+        "first_patched_version": {
+          "identifier": "1.11.10"
+        }
+      }
+    ]
+  }
+}

testdata/gitlab/confidential-issue-event.json

@@ -35,7 +35,36 @@
     "project_id": 14,
     "created_at": "2013-12-03T17:15:43Z",
     "updated_at": "2013-12-03T17:15:43Z",
-    "position": 0,
+    "change_position": {
+      "base_sha": null,
+      "start_sha": null,
+      "head_sha": null,
+      "old_path": null,
+      "new_path": null,
+      "position_type": "text",
+      "old_line": null,
+      "new_line": null
+    },
+    "original_position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
+    "position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
     "branch_name": null,
     "description": "Create new API for manipulations with repository",
     "milestone_id": null,

testdata/gitlab/issue-event.json

@@ -35,7 +35,36 @@
     "project_id": 14,
     "created_at": "2013-12-03T17:15:43Z",
     "updated_at": "2013-12-03T17:15:43Z",
-    "position": 0,
+    "change_position": {
+      "base_sha": null,
+      "start_sha": null,
+      "head_sha": null,
+      "old_path": null,
+      "new_path": null,
+      "position_type": "text",
+      "old_line": null,
+      "new_line": null
+    },
+    "original_position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
+    "position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
     "branch_name": null,
     "description": "Create new API for manipulations with repository",
     "milestone_id": null,

testdata/gitlab/job-event.json

@@ -0,0 +1,42 @@
+{
+    "object_kind": "job",
+    "ref": "gitlab-script-trigger",
+    "tag": false,
+    "before_sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+    "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+    "job_id": 1977,
+    "job_name": "test",
+    "job_stage": "test",
+    "job_status": "created",
+    "job_started_at": null,
+    "job_finished_at": null,
+    "job_duration": null,
+    "job_allow_failure": false,
+    "job_failure_reason": "script_failure",
+    "project_id": 380,
+    "project_name": "gitlab-org/gitlab-test",
+    "user": {
+      "id": 3,
+      "name": "User",
+      "email": "user@gitlab.com"
+    },
+    "commit": {
+      "id": 2366,
+      "sha": "2293ada6b400935a1378653304eaf6221e0fdb8f",
+      "message": "test\n",
+      "author_name": "User",
+      "author_email": "user@gitlab.com",
+      "status": "created",
+      "duration": null,
+      "started_at": null,
+      "finished_at": null
+    },
+    "repository": {
+      "name": "gitlab_test",
+      "description": "Atque in sunt eos similique dolores voluptatem.",
+      "homepage": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
+      "git_ssh_url": "git@192.168.64.1:gitlab-org/gitlab-test.git",
+      "git_http_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test.git",
+      "visibility_level": 20
+    }
+  }

testdata/gitlab/pipeline-event.json

@@ -14,7 +14,13 @@
     ],
     "created_at": "2016-08-12 15:23:28 UTC",
     "finished_at": "2016-08-12 15:26:29 UTC",
-    "duration": 63
+    "duration": 63,
+    "variables": [
+      {
+        "key": "NESTOR_PROD_ENVIRONMENT",
+        "value": "us-west-1"
+      }
+    ]
   },
   "user":{
     "name": "Administrator",
@@ -22,6 +28,7 @@
     "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
   },
   "project":{
+    "id": 1,
     "name": "Gitlab Test",
     "description": "Atque in sunt eos similique dolores voluptatem.",
     "web_url": "http://192.168.64.1:3005/gitlab-org/gitlab-test",
@@ -43,7 +50,7 @@
       "email": "user@gitlab.com"
     }
   },
-  "builds":[
+  "jobs":[
     {
       "id": 380,
       "stage": "deploy",
@@ -80,7 +87,12 @@
         "username": "root",
         "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
       },
-      "runner": null,
+      "runner": {
+        "id":380987,
+        "description":"shared-runners-manager-6.gitlab.com",
+        "active":true,
+        "is_shared":true
+      },
       "artifacts_file":{
         "filename": null,
         "size": null
@@ -101,7 +113,12 @@
         "username": "root",
         "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
       },
-      "runner": null,
+      "runner": {
+        "id":380987,
+        "description":"shared-runners-manager-6.gitlab.com",
+        "active":true,
+        "is_shared":true
+      },
       "artifacts_file":{
         "filename": null,
         "size": null
@@ -122,7 +139,12 @@
         "username": "root",
         "avatar_url": "http://www.gravatar.com/avatar/e32bd13e2add097461cb96824b7a829c?s=80\u0026d=identicon"
       },
-      "runner": null,
+      "runner": {
+        "id":380987,
+        "description":"shared-runners-manager-6.gitlab.com",
+        "active":true,
+        "is_shared":true
+      },
       "artifacts_file":{
         "filename": null,
         "size": null