Merge pull request #111 from aritas1/v5

handle gitlab system hook inconsistencies

bitbucket-server/bitbucketserver.go

@@ -33,6 +33,7 @@ const (
 	RepositoryCommentDeletedEvent   Event = "repo:comment:deleted"
 
 	PullRequestOpenedEvent               Event = "pr:opened"
+	PullRequestFromReferenceUpdatedEvent Event = "pr:from_ref_updated"
 	PullRequestModifiedEvent             Event = "pr:modified"
 	PullRequestMergedEvent               Event = "pr:merged"
 	PullRequestDeclinedEvent             Event = "pr:declined"
@@ -168,6 +169,10 @@ func (hook *Webhook) Parse(r *http.Request, events ...Event) (interface{}, error
 		var pl PullRequestOpenedPayload
 		err = json.Unmarshal([]byte(payload), &pl)
 		return pl, err
+	case PullRequestFromReferenceUpdatedEvent:
+		var pl PullRequestFromReferenceUpdatedPayload
+		err = json.Unmarshal([]byte(payload), &pl)
+		return pl, err
 	case PullRequestModifiedEvent:
 		var pl PullRequestModifiedPayload
 		err = json.Unmarshal([]byte(payload), &pl)

bitbucket-server/payload.go

@@ -66,6 +66,14 @@ type PullRequestOpenedPayload struct {
 	PullRequest PullRequest `json:"pullRequest"`
 }
 
+type PullRequestFromReferenceUpdatedPayload struct {
+	Date             Date        `json:"date"`
+	EventKey         Event       `json:"eventKey"`
+	Actor            User        `json:"actor"`
+	PullRequest      PullRequest `json:"pullRequest"`
+	PreviousFromHash string      `json:"previousFromHash"`
+}
+
 type PullRequestModifiedPayload struct {
 	Date                Date                   `json:"date"`
 	EventKey            Event                  `json:"eventKey"`

github/github_test.go

@@ -273,6 +273,16 @@ func TestWebhooks(t *testing.T) {
 				"X-Hub-Signature": []string{"sha1=e724c9f811fcf5f511aac32e4251b08ab1a0fd87"},
 			},
 		},
+		{
+			name:     "PullRequestIssueCommentEvent",
+			event:    IssueCommentEvent,
+			typ:      IssueCommentPayload{},
+			filename: "../testdata/github/pull-request-issue-comment.json",
+			headers: http.Header{
+				"X-Github-Event":  []string{"issue_comment"},
+				"X-Hub-Signature": []string{"sha1=6c969b99ef881b5c98b2dbfc66a34465fcf0e7d4"},
+			},
+		},
 		{
 			name:     "IssuesEvent",
 			event:    IssuesEvent,

github/payload.go

@@ -1623,6 +1623,12 @@ type IssueCommentPayload struct {
 		CreatedAt   time.Time   `json:"created_at"`
 		UpdatedAt   time.Time   `json:"updated_at"`
 		ClosedAt    *time.Time  `json:"closed_at"`
+		PullRequest *struct {
+			URL      string `json:"url"`
+			HTMLURL  string `json:"html_url"`
+			DiffURL  string `json:"diff_url"`
+			PatchURL string `json:"patch_url"`
+		} `json:"pull_request"`
 		Body string `json:"body"`
 	} `json:"issue"`
 	Comment struct {
@@ -4000,6 +4006,14 @@ type PullRequestPayload struct {
 		Type              string `json:"type"`
 		SiteAdmin         bool   `json:"site_admin"`
 	} `json:"sender"`
+	Changes *struct {
+		Title *struct {
+			From string `json:"from"`
+		} `json:"title"`
+		Body *struct {
+			From string `json:"from"`
+		} `json:"body"`
+	} `json:"changes"`
 	Assignee          *Assignee `json:"assignee"`
 	RequestedReviewer *Assignee `json:"requested_reviewer"`
 	RequestedTeam     struct {

gitlab/gitlab.go

@@ -184,6 +184,14 @@ func eventParsing(gitLabEvent Event, events []Event, payload []byte) (interface{
 			return nil, err
 		}
 		switch pl.ObjectKind {
+		case objectPush:
+			return eventParsing(PushEvents, events, payload)
+		case objectTag:
+			return eventParsing(TagEvents, events, payload)
+		case objectMergeRequest:
+			return eventParsing(MergeRequestEvents, events, payload)
+		default:
+			switch pl.EventName {
 			case objectPush:
 				return eventParsing(PushEvents, events, payload)
 			case objectTag:
@@ -193,6 +201,7 @@ func eventParsing(gitLabEvent Event, events []Event, payload []byte) (interface{
 			default:
 				return nil, fmt.Errorf("unknown system hook event %s", gitLabEvent)
 			}
+		}
 	default:
 		return nil, fmt.Errorf("unknown event %s", gitLabEvent)
 	}

gitlab/gitlab_test.go

@@ -286,19 +286,19 @@ func TestSystemHooks(t *testing.T) {
 			name:     "PushEvent",
 			event:    PushEvents,
 			typ:      PushEventPayload{},
-			filename: "../testdata/gitlab/push-event.json",
+			filename: "../testdata/gitlab/system-push-event.json",
 		},
 		{
 			name:     "TagEvent",
 			event:    TagEvents,
 			typ:      TagEventPayload{},
-			filename: "../testdata/gitlab/tag-event.json",
+			filename: "../testdata/gitlab/system-tag-event.json",
 		},
 		{
 			name:     "MergeRequestEvent",
 			event:    MergeRequestEvents,
 			typ:      MergeRequestEventPayload{},
-			filename: "../testdata/gitlab/merge-request-event.json",
+			filename: "../testdata/gitlab/system-merge-request-event.json",
 		},
 	}
 	for _, tt := range tests {

gitlab/payload.go

@@ -67,6 +67,7 @@ type PushEventPayload struct {
 	CheckoutSHA       string     `json:"checkout_sha"`
 	UserID            int64      `json:"user_id"`
 	UserName          string     `json:"user_name"`
+	UserUsername      string     `json:"user_username"`
 	UserEmail         string     `json:"user_email"`
 	UserAvatar        string     `json:"user_avatar"`
 	ProjectID         int64      `json:"project_id"`
@@ -85,6 +86,7 @@ type TagEventPayload struct {
 	CheckoutSHA       string     `json:"checkout_sha"`
 	UserID            int64      `json:"user_id"`
 	UserName          string     `json:"user_name"`
+	UserUsername      string     `json:"user_username"`
 	UserAvatar        string     `json:"user_avatar"`
 	ProjectID         int64      `json:"project_id"`
 	Project           Project    `json:"Project"`
@@ -108,7 +110,7 @@ type PipelineEventPayload struct {
 	User             User                     `json:"user"`
 	Project          Project                  `json:"project"`
 	Commit           Commit                   `json:"commit"`
-	ObjectAttributes ObjectAttributes `json:"object_attributes"`
+	ObjectAttributes PipelineObjectAttributes `json:"object_attributes"`
 	Jobs             []Job                    `json:"jobs"`
 }
 
@@ -174,6 +176,7 @@ type JobEventPayload struct {
 // SystemHookPayload contains the ObjectKind to match with real hook events
 type SystemHookPayload struct {
 	ObjectKind string `json:"object_kind"`
+	EventName  string `json:"event_name"`
 }
 
 // Issue contains all of the GitLab issue information
@@ -281,6 +284,7 @@ type User struct {
 
 // Project contains all of the GitLab project information
 type Project struct {
+	ID                int64  `json:"id"`
 	Name              string `json:"name"`
 	Description       string `json:"description"`
 	WebURL            string `json:"web_url"`
@@ -356,6 +360,21 @@ type ObjectAttributes struct {
 	Assignee         Assignee   `json:"assignee"`
 }
 
+// PipelineObjectAttributes contains pipeline specific GitLab object attributes information
+type PipelineObjectAttributes struct {
+	ID         int64      `json:"id"`
+	Ref        string     `json:"ref"`
+	Tag        bool       `json:"tag"`
+	SHA        string     `json:"sha"`
+	BeforeSHA  string     `json:"before_sha"`
+	Source     string     `json:"source"`
+	Status     string     `json:"status"`
+	Stages     []string   `json:"stages"`
+	CreatedAt  customTime `json:"created_at"`
+	FinishedAt customTime `json:"finished_at"`
+	Duration   int64      `json:"duration"`
+}
+
 // 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.

testdata/github/pull-request-issue-comment.json

@@ -0,0 +1,208 @@
+{
+  "action": "created",
+  "issue": {
+    "url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/3",
+    "repository_url": "https://api.github.com/repos/chhsia0/knative-route-demo",
+    "labels_url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/3/labels{/name}",
+    "comments_url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/3/comments",
+    "events_url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/3/events",
+    "html_url": "https://github.com/chhsia0/knative-route-demo/pull/3",
+    "id": 494965988,
+    "node_id": "MDExOlB1bGxSZXF1ZXN0MzE4NjEwOTI3",
+    "number": 3,
+    "title": "Updated to v2.",
+    "user": {
+      "login": "chhsia0",
+      "id": 4643017,
+      "node_id": "MDQ6VXNlcjQ2NDMwMTc=",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/4643017?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/chhsia0",
+      "html_url": "https://github.com/chhsia0",
+      "followers_url": "https://api.github.com/users/chhsia0/followers",
+      "following_url": "https://api.github.com/users/chhsia0/following{/other_user}",
+      "gists_url": "https://api.github.com/users/chhsia0/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/chhsia0/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/chhsia0/subscriptions",
+      "organizations_url": "https://api.github.com/users/chhsia0/orgs",
+      "repos_url": "https://api.github.com/users/chhsia0/repos",
+      "events_url": "https://api.github.com/users/chhsia0/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/chhsia0/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "labels": [
+
+    ],
+    "state": "open",
+    "locked": false,
+    "assignee": null,
+    "assignees": [
+
+    ],
+    "milestone": null,
+    "comments": 17,
+    "created_at": "2019-09-18T03:28:04Z",
+    "updated_at": "2019-10-26T16:09:23Z",
+    "closed_at": null,
+    "author_association": "OWNER",
+    "pull_request": {
+      "url": "https://api.github.com/repos/chhsia0/knative-route-demo/pulls/3",
+      "html_url": "https://github.com/chhsia0/knative-route-demo/pull/3",
+      "diff_url": "https://github.com/chhsia0/knative-route-demo/pull/3.diff",
+      "patch_url": "https://github.com/chhsia0/knative-route-demo/pull/3.patch"
+    },
+    "body": ""
+  },
+  "comment": {
+    "url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/comments/546616131",
+    "html_url": "https://github.com/chhsia0/knative-route-demo/pull/3#issuecomment-546616131",
+    "issue_url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/3",
+    "id": 546616131,
+    "node_id": "MDEyOklzc3VlQ29tbWVudDU0NjYxNjEzMQ==",
+    "user": {
+      "login": "chhsia0",
+      "id": 4643017,
+      "node_id": "MDQ6VXNlcjQ2NDMwMTc=",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/4643017?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/chhsia0",
+      "html_url": "https://github.com/chhsia0",
+      "followers_url": "https://api.github.com/users/chhsia0/followers",
+      "following_url": "https://api.github.com/users/chhsia0/following{/other_user}",
+      "gists_url": "https://api.github.com/users/chhsia0/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/chhsia0/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/chhsia0/subscriptions",
+      "organizations_url": "https://api.github.com/users/chhsia0/orgs",
+      "repos_url": "https://api.github.com/users/chhsia0/repos",
+      "events_url": "https://api.github.com/users/chhsia0/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/chhsia0/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "created_at": "2019-10-26T16:09:23Z",
+    "updated_at": "2019-10-26T16:09:23Z",
+    "author_association": "OWNER",
+    "body": "/build"
+  },
+  "repository": {
+    "id": 199540710,
+    "node_id": "MDEwOlJlcG9zaXRvcnkxOTk1NDA3MTA=",
+    "name": "knative-route-demo",
+    "full_name": "chhsia0/knative-route-demo",
+    "private": false,
+    "owner": {
+      "login": "chhsia0",
+      "id": 4643017,
+      "node_id": "MDQ6VXNlcjQ2NDMwMTc=",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/4643017?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/chhsia0",
+      "html_url": "https://github.com/chhsia0",
+      "followers_url": "https://api.github.com/users/chhsia0/followers",
+      "following_url": "https://api.github.com/users/chhsia0/following{/other_user}",
+      "gists_url": "https://api.github.com/users/chhsia0/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/chhsia0/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/chhsia0/subscriptions",
+      "organizations_url": "https://api.github.com/users/chhsia0/orgs",
+      "repos_url": "https://api.github.com/users/chhsia0/repos",
+      "events_url": "https://api.github.com/users/chhsia0/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/chhsia0/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "html_url": "https://github.com/chhsia0/knative-route-demo",
+    "description": "Simple knative route demo",
+    "fork": true,
+    "url": "https://api.github.com/repos/chhsia0/knative-route-demo",
+    "forks_url": "https://api.github.com/repos/chhsia0/knative-route-demo/forks",
+    "keys_url": "https://api.github.com/repos/chhsia0/knative-route-demo/keys{/key_id}",
+    "collaborators_url": "https://api.github.com/repos/chhsia0/knative-route-demo/collaborators{/collaborator}",
+    "teams_url": "https://api.github.com/repos/chhsia0/knative-route-demo/teams",
+    "hooks_url": "https://api.github.com/repos/chhsia0/knative-route-demo/hooks",
+    "issue_events_url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/events{/number}",
+    "events_url": "https://api.github.com/repos/chhsia0/knative-route-demo/events",
+    "assignees_url": "https://api.github.com/repos/chhsia0/knative-route-demo/assignees{/user}",
+    "branches_url": "https://api.github.com/repos/chhsia0/knative-route-demo/branches{/branch}",
+    "tags_url": "https://api.github.com/repos/chhsia0/knative-route-demo/tags",
+    "blobs_url": "https://api.github.com/repos/chhsia0/knative-route-demo/git/blobs{/sha}",
+    "git_tags_url": "https://api.github.com/repos/chhsia0/knative-route-demo/git/tags{/sha}",
+    "git_refs_url": "https://api.github.com/repos/chhsia0/knative-route-demo/git/refs{/sha}",
+    "trees_url": "https://api.github.com/repos/chhsia0/knative-route-demo/git/trees{/sha}",
+    "statuses_url": "https://api.github.com/repos/chhsia0/knative-route-demo/statuses/{sha}",
+    "languages_url": "https://api.github.com/repos/chhsia0/knative-route-demo/languages",
+    "stargazers_url": "https://api.github.com/repos/chhsia0/knative-route-demo/stargazers",
+    "contributors_url": "https://api.github.com/repos/chhsia0/knative-route-demo/contributors",
+    "subscribers_url": "https://api.github.com/repos/chhsia0/knative-route-demo/subscribers",
+    "subscription_url": "https://api.github.com/repos/chhsia0/knative-route-demo/subscription",
+    "commits_url": "https://api.github.com/repos/chhsia0/knative-route-demo/commits{/sha}",
+    "git_commits_url": "https://api.github.com/repos/chhsia0/knative-route-demo/git/commits{/sha}",
+    "comments_url": "https://api.github.com/repos/chhsia0/knative-route-demo/comments{/number}",
+    "issue_comment_url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues/comments{/number}",
+    "contents_url": "https://api.github.com/repos/chhsia0/knative-route-demo/contents/{+path}",
+    "compare_url": "https://api.github.com/repos/chhsia0/knative-route-demo/compare/{base}...{head}",
+    "merges_url": "https://api.github.com/repos/chhsia0/knative-route-demo/merges",
+    "archive_url": "https://api.github.com/repos/chhsia0/knative-route-demo/{archive_format}{/ref}",
+    "downloads_url": "https://api.github.com/repos/chhsia0/knative-route-demo/downloads",
+    "issues_url": "https://api.github.com/repos/chhsia0/knative-route-demo/issues{/number}",
+    "pulls_url": "https://api.github.com/repos/chhsia0/knative-route-demo/pulls{/number}",
+    "milestones_url": "https://api.github.com/repos/chhsia0/knative-route-demo/milestones{/number}",
+    "notifications_url": "https://api.github.com/repos/chhsia0/knative-route-demo/notifications{?since,all,participating}",
+    "labels_url": "https://api.github.com/repos/chhsia0/knative-route-demo/labels{/name}",
+    "releases_url": "https://api.github.com/repos/chhsia0/knative-route-demo/releases{/id}",
+    "deployments_url": "https://api.github.com/repos/chhsia0/knative-route-demo/deployments",
+    "created_at": "2019-07-29T23:38:07Z",
+    "updated_at": "2019-10-01T18:07:59Z",
+    "pushed_at": "2019-10-23T23:49:38Z",
+    "git_url": "git://github.com/chhsia0/knative-route-demo.git",
+    "ssh_url": "git@github.com:chhsia0/knative-route-demo.git",
+    "clone_url": "https://github.com/chhsia0/knative-route-demo.git",
+    "svn_url": "https://github.com/chhsia0/knative-route-demo",
+    "homepage": "",
+    "size": 59,
+    "stargazers_count": 0,
+    "watchers_count": 0,
+    "language": "Go",
+    "has_issues": true,
+    "has_projects": true,
+    "has_downloads": true,
+    "has_wiki": false,
+    "has_pages": true,
+    "forks_count": 0,
+    "mirror_url": null,
+    "archived": false,
+    "disabled": false,
+    "open_issues_count": 3,
+    "license": {
+      "key": "apache-2.0",
+      "name": "Apache License 2.0",
+      "spdx_id": "Apache-2.0",
+      "url": "https://api.github.com/licenses/apache-2.0",
+      "node_id": "MDc6TGljZW5zZTI="
+    },
+    "forks": 0,
+    "open_issues": 3,
+    "watchers": 0,
+    "default_branch": "master"
+  },
+  "sender": {
+    "login": "chhsia0",
+    "id": 4643017,
+    "node_id": "MDQ6VXNlcjQ2NDMwMTc=",
+    "avatar_url": "https://avatars0.githubusercontent.com/u/4643017?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/chhsia0",
+    "html_url": "https://github.com/chhsia0",
+    "followers_url": "https://api.github.com/users/chhsia0/followers",
+    "following_url": "https://api.github.com/users/chhsia0/following{/other_user}",
+    "gists_url": "https://api.github.com/users/chhsia0/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/chhsia0/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/chhsia0/subscriptions",
+    "organizations_url": "https://api.github.com/users/chhsia0/orgs",
+    "repos_url": "https://api.github.com/users/chhsia0/repos",
+    "events_url": "https://api.github.com/users/chhsia0/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/chhsia0/received_events",
+    "type": "User",
+    "site_admin": false
+  }
+}

testdata/gitlab/system-merge-request-event.json

@@ -0,0 +1,114 @@
+{
+  "object_kind": "merge_request",
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon"
+  },
+  "project": {
+    "name": "Example",
+    "description": "",
+    "web_url": "http://example.com/jsmith/example",
+    "avatar_url": null,
+    "git_ssh_url": "git@example.com:jsmith/example.git",
+    "git_http_url": "http://example.com/jsmith/example.git",
+    "namespace": "Jsmith",
+    "visibility_level": 0,
+    "path_with_namespace": "jsmith/example",
+    "default_branch": "master",
+    "ci_config_path": "",
+    "homepage": "http://example.com/jsmith/example",
+    "url": "git@example.com:jsmith/example.git",
+    "ssh_url": "git@example.com:jsmith/example.git",
+    "http_url": "http://example.com/jsmith/example.git"
+  },
+  "object_attributes": {
+    "id": 90,
+    "target_branch": "master",
+    "source_branch": "ms-viewport",
+    "source_project_id": 14,
+    "author_id": 51,
+    "assignee_id": 6,
+    "title": "MS-Viewport",
+    "created_at": "2017-09-20T08:31:45.944Z",
+    "updated_at": "2017-09-28T12:23:42.365Z",
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "unchecked",
+    "target_project_id": 14,
+    "iid": 1,
+    "description": "",
+    "updated_by_id": 1,
+    "merge_error": null,
+    "merge_params": {
+      "force_remove_source_branch": "0"
+    },
+    "merge_when_pipeline_succeeds": false,
+    "merge_user_id": null,
+    "merge_commit_sha": null,
+    "deleted_at": null,
+    "in_progress_merge_commit_sha": null,
+    "lock_version": 5,
+    "time_estimate": 0,
+    "last_edited_at": "2017-09-27T12:43:37.558Z",
+    "last_edited_by_id": 1,
+    "head_pipeline_id": 61,
+    "ref_fetched": true,
+    "merge_jid": null,
+    "source": {
+      "name": "Awesome Project",
+      "description": "",
+      "web_url": "http://example.com/awesome_space/awesome_project",
+      "avatar_url": null,
+      "git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
+      "git_http_url": "http://example.com/awesome_space/awesome_project.git",
+      "namespace": "root",
+      "visibility_level": 0,
+      "path_with_namespace": "awesome_space/awesome_project",
+      "default_branch": "master",
+      "ci_config_path": "",
+      "homepage": "http://example.com/awesome_space/awesome_project",
+      "url": "http://example.com/awesome_space/awesome_project.git",
+      "ssh_url": "git@example.com:awesome_space/awesome_project.git",
+      "http_url": "http://example.com/awesome_space/awesome_project.git"
+    },
+    "target": {
+      "name": "Awesome Project",
+      "description": "Aut reprehenderit ut est.",
+      "web_url": "http://example.com/awesome_space/awesome_project",
+      "avatar_url": null,
+      "git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
+      "git_http_url": "http://example.com/awesome_space/awesome_project.git",
+      "namespace": "Awesome Space",
+      "visibility_level": 0,
+      "path_with_namespace": "awesome_space/awesome_project",
+      "default_branch": "master",
+      "ci_config_path": "",
+      "homepage": "http://example.com/awesome_space/awesome_project",
+      "url": "http://example.com/awesome_space/awesome_project.git",
+      "ssh_url": "git@example.com:awesome_space/awesome_project.git",
+      "http_url": "http://example.com/awesome_space/awesome_project.git"
+    },
+    "last_commit": {
+      "id": "ba3e0d8ff79c80d5b0bbb4f3e2e343e0aaa662b7",
+      "message": "fixed readme",
+      "timestamp": "2017-09-26T16:12:57Z",
+      "url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+      "author": {
+        "name": "GitLab dev user",
+        "email": "gitlabdev@dv6700.(none)"
+      }
+    },
+    "work_in_progress": false,
+    "total_time_spent": 0,
+    "human_total_time_spent": null,
+    "human_time_estimate": null
+  },
+  "labels": null,
+  "repository": {
+    "name": "git-gpg-test",
+    "url": "git@example.com:awesome_space/awesome_project.git",
+    "description": "",
+    "homepage": "http://example.com/awesome_space/awesome_project"
+  }
+}

testdata/gitlab/system-push-event.json

@@ -0,0 +1,50 @@
+{
+  "event_name": "push",
+  "before": "95790bf891e76fee5e1747ab589903a6a1f80f22",
+  "after": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+  "ref": "refs/heads/master",
+  "checkout_sha": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
+  "user_id": 4,
+  "user_name": "John Smith",
+  "user_email": "john@example.com",
+  "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80",
+  "project_id": 15,
+  "project":{
+    "name":"Diaspora",
+    "description":"",
+    "web_url":"http://example.com/mike/diaspora",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:mike/diaspora.git",
+    "git_http_url":"http://example.com/mike/diaspora.git",
+    "namespace":"Mike",
+    "visibility_level":0,
+    "path_with_namespace":"mike/diaspora",
+    "default_branch":"master",
+    "homepage":"http://example.com/mike/diaspora",
+    "url":"git@example.com:mike/diaspora.git",
+    "ssh_url":"git@example.com:mike/diaspora.git",
+    "http_url":"http://example.com/mike/diaspora.git"
+  },
+  "repository":{
+    "name": "Diaspora",
+    "url": "git@example.com:mike/diaspora.git",
+    "description": "",
+    "homepage": "http://example.com/mike/diaspora",
+    "git_http_url":"http://example.com/mike/diaspora.git",
+    "git_ssh_url":"git@example.com:mike/diaspora.git",
+    "visibility_level":0
+  },
+  "commits": [
+    {
+      "id": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
+      "message": "Add simple search to projects in public area",
+      "timestamp": "2013-05-13T18:18:08+00:00",
+      "url": "https://dev.gitlab.org/gitlab/gitlabhq/commit/c5feabde2d8cd023215af4d2ceeb7a64839fc428",
+      "author": {
+        "name": "Example User",
+        "email": "user@example.com"
+      }
+    }
+  ],
+  "total_commits_count": 1
+}

testdata/gitlab/system-tag-event.json

@@ -0,0 +1,38 @@
+{
+  "event_name": "tag_push",
+  "before": "0000000000000000000000000000000000000000",
+  "after": "82b3d5ae55f7080f1e6022629cdb57bfae7cccc7",
+  "ref": "refs/tags/v1.0.0",
+  "checkout_sha": "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+  "user_id": 1,
+  "user_name": "John Smith",
+  "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80",
+  "project_id": 1,
+  "project":{
+    "name":"Example",
+    "description":"",
+    "web_url":"http://example.com/jsmith/example",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:jsmith/example.git",
+    "git_http_url":"http://example.com/jsmith/example.git",
+    "namespace":"Jsmith",
+    "visibility_level":0,
+    "path_with_namespace":"jsmith/example",
+    "default_branch":"master",
+    "homepage":"http://example.com/jsmith/example",
+    "url":"git@example.com:jsmith/example.git",
+    "ssh_url":"git@example.com:jsmith/example.git",
+    "http_url":"http://example.com/jsmith/example.git"
+  },
+  "repository":{
+    "name": "Example",
+    "url": "ssh://git@example.com/jsmith/example.git",
+    "description": "",
+    "homepage": "http://example.com/jsmith/example",
+    "git_http_url":"http://example.com/jsmith/example.git",
+    "git_ssh_url":"git@example.com:jsmith/example.git",
+    "visibility_level":0
+  },
+  "commits": [],
+  "total_commits_count": 0
+}