Update README.md

Adds GitHub meta event/payload

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.10.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.13.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,43 +28,46 @@ 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"
+	IntegrationInstallationRepositoriesEvent Event = "integration_installation_repositories"
-	IssuesEvent                   Event = "issues"
+	IssueCommentEvent                        Event = "issue_comment"
-	LabelEvent                    Event = "label"
+	IssuesEvent                              Event = "issues"
-	MemberEvent                   Event = "member"
+	LabelEvent                               Event = "label"
-	MembershipEvent               Event = "membership"
+	MemberEvent                              Event = "member"
-	MilestoneEvent                Event = "milestone"
+	MembershipEvent                          Event = "membership"
-	OrganizationEvent             Event = "organization"
+	MilestoneEvent                           Event = "milestone"
-	OrgBlockEvent                 Event = "org_block"
+  MetaEvent                                Event = "meta"
-	PageBuildEvent                Event = "page_build"
+	OrganizationEvent                        Event = "organization"
-	PingEvent                     Event = "ping"
+	OrgBlockEvent                            Event = "org_block"
-	ProjectCardEvent              Event = "project_card"
+	PageBuildEvent                           Event = "page_build"
-	ProjectColumnEvent            Event = "project_column"
+	PingEvent                                Event = "ping"
-	ProjectEvent                  Event = "project"
+	ProjectCardEvent                         Event = "project_card"
-	PublicEvent                   Event = "public"
+	ProjectColumnEvent                       Event = "project_column"
-	PullRequestEvent              Event = "pull_request"
+	ProjectEvent                             Event = "project"
-	PullRequestReviewEvent        Event = "pull_request_review"
+	PublicEvent                              Event = "public"
-	PullRequestReviewCommentEvent Event = "pull_request_review_comment"
+	PullRequestEvent                         Event = "pull_request"
-	PushEvent                     Event = "push"
+	PullRequestReviewEvent                   Event = "pull_request_review"
-	ReleaseEvent                  Event = "release"
+	PullRequestReviewCommentEvent            Event = "pull_request_review_comment"
-	RepositoryEvent               Event = "repository"
+	PushEvent                                Event = "push"
-	SecurityAdvisoryEvent         Event = "security_advisory"
+	ReleaseEvent                             Event = "release"
-	StatusEvent                   Event = "status"
+	RepositoryEvent                          Event = "repository"
-	TeamEvent                     Event = "team"
+	RepositoryVulnerabilityAlertEvent        Event = "repository_vulnerability_alert"
-	TeamAddEvent                  Event = "team_add"
+	SecurityAdvisoryEvent                    Event = "security_advisory"
-	WatchEvent                    Event = "watch"
+	StatusEvent                              Event = "status"
+	TeamEvent                                Event = "team"
+	TeamAddEvent                             Event = "team_add"
+	WatchEvent                               Event = "watch"
 )
 
 // EventSubtype defines a GitHub Hook Event subtype
@@ -205,7 +208,7 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error)
 		var pl InstallationPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
-	case InstallationRepositoriesEvent:
+	case InstallationRepositoriesEvent, IntegrationInstallationRepositoriesEvent:
 		var pl InstallationRepositoriesPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
@@ -229,6 +232,10 @@ func (hook Webhook) Parse(r *http.Request, events ...Event) (interface{}, error)
 		var pl MembershipPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
+	case MetaEvent:
+		var pl MetaPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
 	case MilestoneEvent:
 		var pl MilestonePayload
 		err = json.Unmarshal([]byte(payload), &pl)
@@ -289,6 +296,10 @@ 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)

github/github_test.go

@@ -253,6 +253,16 @@ func TestWebhooks(t *testing.T) {
 				"X-Hub-Signature": []string{"sha1=bb2769f05f1a11af3a1edf8f9fac11bae7402a1e"},
 			},
 		},
+		{
+			name:     "IntegrationInstallationRepositoriesEvent",
+			event:    IntegrationInstallationRepositoriesEvent,
+			typ:      InstallationRepositoriesPayload{},
+			filename: "../testdata/github/integration-installation-repositories.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"integration_installation_repositories"},
+				"X-Hub-Signature": []string{"sha1=2f00a982574188342c2894eb9d1b1e93434687fb"},
+			},
+		},
 		{
 			name:     "IssueCommentEvent",
 			event:    IssueCommentEvent,
@@ -453,13 +463,23 @@ 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-Github-Event":  []string{"security_advisory"},
 				"X-Hub-Signature": []string{"sha1=6a71f24fa69f55469843a91dc3a5c3e29714a565"},
 			},
 		},

github/payload.go

@@ -2271,6 +2271,137 @@ type MembershipPayload struct {
 	} `json:"organization"`
 }
 
+// MetaPayload contains the information for GitHub's meta hook event
+type MetaPayload struct {
+	HookID int `json:"hook_id"`
+	Hook   struct {
+		Type   string   `json:"type"`
+		ID     int64    `json:"id"`
+		NodeID string   `json:"node_id"`
+		Name   string   `json:"name"`
+		Active bool     `json:"active"`
+		Events []string `json:"events"`
+		AppID  int      `json:"app_id"`
+		Config struct {
+			ContentType string `json:"content_type"`
+			InsecureSSL string `json:"insecure_ssl"`
+			Secret      string `json:"secret"`
+			URL         string `json:"url"`
+		} `json:"config"`
+		CreatedAt time.Time `json:"created_at"`
+		UpdatedAt time.Time `json:"updated_at"`
+	} `json:"hook"`
+	Repository struct {
+		ID       int64  `json:"id"`
+		NodeID   string `json:"node_id"`
+		Name     string `json:"name"`
+		FullName string `json:"full_name"`
+		Owner    struct {
+			Login             string `json:"login"`
+			ID                int64  `json:"id"`
+			NodeID            string `json:"node_id"`
+			AvatarURL         string `json:"avatar_url"`
+			GravatarID        string `json:"gravatar_id"`
+			URL               string `json:"url"`
+			HTMLURL           string `json:"html_url"`
+			FollowersURL      string `json:"followers_url"`
+			FollowingURL      string `json:"following_url"`
+			GistsURL          string `json:"gists_url"`
+			StarredURL        string `json:"starred_url"`
+			SubscriptionsURL  string `json:"subscriptions_url"`
+			OrganizationsURL  string `json:"organizations_url"`
+			ReposURL          string `json:"repos_url"`
+			EventsURL         string `json:"events_url"`
+			ReceivedEventsURL string `json:"received_events_url"`
+			Type              string `json:"type"`
+			SiteAdmin         bool   `json:"site_admin"`
+		} `json:"owner"`
+		Private          bool      `json:"private"`
+		HTMLURL          string    `json:"html_url"`
+		Description      string    `json:"description"`
+		Fork             bool      `json:"fork"`
+		URL              string    `json:"url"`
+		ForksURL         string    `json:"forks_url"`
+		KeysURL          string    `json:"keys_url"`
+		CollaboratorsURL string    `json:"collaborators_url"`
+		TeamsURL         string    `json:"teams_url"`
+		HooksURL         string    `json:"hooks_url"`
+		IssueEventsURL   string    `json:"issue_events_url"`
+		EventsURL        string    `json:"events_url"`
+		AssigneesURL     string    `json:"assignees_url"`
+		BranchesURL      string    `json:"branches_url"`
+		TagsURL          string    `json:"tags_url"`
+		BlobsURL         string    `json:"blobs_url"`
+		GitTagsURL       string    `json:"git_tags_url"`
+		GitRefsURL       string    `json:"git_refs_url"`
+		TreesURL         string    `json:"trees_url"`
+		StatusesURL      string    `json:"statuses_url"`
+		LanguagesURL     string    `json:"languages_url"`
+		StargazersURL    string    `json:"stargazers_url"`
+		ContributorsURL  string    `json:"contributors_url"`
+		SubscribersURL   string    `json:"subscribers_url"`
+		SubscriptionURL  string    `json:"subscription_url"`
+		CommitsURL       string    `json:"commits_url"`
+		GitCommitsURL    string    `json:"git_commits_url"`
+		CommentsURL      string    `json:"comments_url"`
+		IssueCommentURL  string    `json:"issue_comment_url"`
+		ContentsURL      string    `json:"contents_url"`
+		CompareURL       string    `json:"compare_url"`
+		MergesURL        string    `json:"merges_url"`
+		ArchiveURL       string    `json:"archive_url"`
+		DownloadsURL     string    `json:"downloads_url"`
+		IssuesURL        string    `json:"issues_url"`
+		PullsURL         string    `json:"pulls_url"`
+		MilestonesURL    string    `json:"milestones_url"`
+		NotificationsURL string    `json:"notifications_url"`
+		LabelsURL        string    `json:"labels_url"`
+		ReleasesURL      string    `json:"releases_url"`
+		CreatedAt        time.Time `json:"created_at"`
+		UpdatedAt        time.Time `json:"updated_at"`
+		PushedAt         time.Time `json:"pushed_at"`
+		GitURL           string    `json:"git_url"`
+		SSHURL           string    `json:"ssh_url"`
+		CloneURL         string    `json:"clone_url"`
+		SvnURL           string    `json:"svn_url"`
+		Homepage         *string   `json:"homepage"`
+		Size             int64     `json:"size"`
+		StargazersCount  int64     `json:"stargazers_count"`
+		WatchersCount    int64     `json:"watchers_count"`
+		Language         *string   `json:"language"`
+		HasIssues        bool      `json:"has_issues"`
+		HasDownloads     bool      `json:"has_downloads"`
+		HasWiki          bool      `json:"has_wiki"`
+		HasPages         bool      `json:"has_pages"`
+		ForksCount       int64     `json:"forks_count"`
+		MirrorURL        *string   `json:"mirror_url"`
+		OpenIssuesCount  int64     `json:"open_issues_count"`
+		Forks            int64     `json:"forks"`
+		OpenIssues       int64     `json:"open_issues"`
+		Watchers         int64     `json:"watchers"`
+		DefaultBranch    string    `json:"default_branch"`
+	} `json:"repository"`
+	Sender struct {
+		Login             string `json:"login"`
+		ID                int64  `json:"id"`
+		NodeID            string `json:"node_id"`
+		AvatarURL         string `json:"avatar_url"`
+		GravatarID        string `json:"gravatar_id"`
+		URL               string `json:"url"`
+		HTMLURL           string `json:"html_url"`
+		FollowersURL      string `json:"followers_url"`
+		FollowingURL      string `json:"following_url"`
+		GistsURL          string `json:"gists_url"`
+		StarredURL        string `json:"starred_url"`
+		SubscriptionsURL  string `json:"subscriptions_url"`
+		OrganizationsURL  string `json:"organizations_url"`
+		ReposURL          string `json:"repos_url"`
+		EventsURL         string `json:"events_url"`
+		ReceivedEventsURL string `json:"received_events_url"`
+		Type              string `json:"type"`
+		SiteAdmin         bool   `json:"site_admin"`
+	} `json:"sender"`
+}
+
 // MilestonePayload contains the information for GitHub's milestone hook event
 type MilestonePayload struct {
 	Action    string `json:"action"`
@@ -4342,6 +4473,9 @@ type PullRequestReviewPayload struct {
 		Type              string `json:"type"`
 		SiteAdmin         bool   `json:"site_admin"`
 	} `json:"sender"`
+	Installation struct {
+		ID int64 `json:"id"`
+	} `json:"installation"`
 }
 
 // PullRequestReviewCommentPayload contains the information for GitHub's pull_request_review_comments hook event
@@ -4806,6 +4940,9 @@ type PullRequestReviewCommentPayload struct {
 		Type              string `json:"type"`
 		SiteAdmin         bool   `json:"site_admin"`
 	} `json:"sender"`
+	Installation struct {
+		ID int64 `json:"id"`
+	} `json:"installation"`
 }
 
 // PushPayload contains the information for GitHub's push hook event
@@ -5133,6 +5270,9 @@ type ReleasePayload struct {
 		Type              string `json:"type"`
 		SiteAdmin         bool   `json:"site_admin"`
 	} `json:"sender"`
+	Installation struct {
+		ID int `json:"id"`
+	} `json:"installation"`
 }
 
 // RepositoryPayload contains the information for GitHub's repository hook event
@@ -5260,6 +5400,40 @@ type RepositoryPayload struct {
 	} `json:"sender"`
 }
 
+// RepositoryVulnerabilityAlertEvent contains the information for GitHub's repository_vulnerability_alert hook event.
+type RepositoryVulnerabilityAlertPayload struct {
+	Action string `json:"action"`
+	Alert  struct {
+		ID                  int64  `json:"id"`
+		Summary             string `json:"summary"`
+		AffectedRange       string `json:"affected_range"`
+		AffectedPackageName string `json:"affected_package_name"`
+		ExternalReference   string `json:"external_reference"`
+		ExternalIdentifier  string `json:"external_identifier"`
+		FixedIn             string `json:"fixed_in"`
+		Dismisser           struct {
+			Login             string `json:"login"`
+			ID                int64  `json:"id"`
+			NodeID            string `json:"node_id"`
+			AvatarURL         string `json:"avatar_url"`
+			GravatarID        string `json:"gravatar_id"`
+			URL               string `json:"url"`
+			HTMLURL           string `json:"html_url"`
+			FollowersURL      string `json:"followers_url"`
+			FollowingURL      string `json:"following_url"`
+			GistsURL          string `json:"gists_url"`
+			StarredURL        string `json:"starred_url"`
+			SubscriptionsURL  string `json:"subscriptions_url"`
+			OrganizationsURL  string `json:"organizations_url"`
+			ReposURL          string `json:"repos_url"`
+			EventsURL         string `json:"events_url"`
+			ReceivedEventsURL string `json:"received_events_url"`
+			Type              string `json:"type"`
+			SiteAdmin         bool   `json:"site_admin"`
+		} `json:"dismisser"`
+	} `json:"alert"`
+}
+
 // SecurityAdvisoryPayload contains the information for GitHub's security_advisory hook event.
 type SecurityAdvisoryPayload struct {
 	Action           string `json:"action"`
@@ -5295,7 +5469,6 @@ type SecurityAdvisoryPayload struct {
 // StatusPayload contains the information for GitHub's status hook event
 type StatusPayload struct {
 	ID          int64   `json:"id"`
-	NodeID      string  `json:"node_id"`
 	Sha         string  `json:"sha"`
 	Name        string  `json:"name"`
 	TargetURL   *string `json:"target_url"`
@@ -5304,6 +5477,7 @@ type StatusPayload struct {
 	State       string  `json:"state"`
 	Commit      struct {
 		Sha    string `json:"sha"`
+		NodeID string `json:"node_id"`
 		Commit struct {
 			Author struct {
 				Name  string    `json:"name"`

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
@@ -193,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"`
@@ -307,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/integration-installation-repositories.json

@@ -0,0 +1,75 @@
+{
+  "action": "removed",
+  "installation": {
+    "id": 2,
+    "account": {
+      "login": "octocat",
+      "id": 1,
+      "node_id": "MDQ6VXNlcjE=",
+      "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": false
+    },
+    "repository_selection": "selected",
+    "access_tokens_url": "https://api.github.com/installations/2/access_tokens",
+    "repositories_url": "https://api.github.com/installation/repositories",
+    "html_url": "https://github.com/settings/installations/2",
+    "app_id": 5725,
+    "target_id": 3880403,
+    "target_type": "User",
+    "permissions": {
+      "metadata": "read",
+      "contents": "read",
+      "issues": "write"
+    },
+    "events": [
+      "push",
+      "pull_request"
+    ],
+    "created_at": 1525109898,
+    "updated_at": 1525109899,
+    "single_file_name": "config.yml"
+  },
+  "repository_selection": "selected",
+  "repositories_added": [],
+  "repositories_removed": [
+    {
+      "id": 1296269,
+      "name": "Hello-World",
+      "full_name": "octocat/Hello-World",
+      "private": false
+    }
+  ],
+  "sender": {
+    "login": "octocat",
+    "id": 1,
+    "node_id": "MDQ6VXNlcjE=",
+    "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": false
+  }
+}

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/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,
@@ -49,4 +78,4 @@
     "username": "user1",
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   }
-}
+}

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,
@@ -49,4 +78,4 @@
     "username": "user1",
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   }
-}
+}

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
@@ -150,4 +172,4 @@
       }
     }
   ]
-}
+}