update travis.yml to atest golang versions

README.md

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

github/github.go

@@ -36,8 +36,6 @@ const (
 	DeploymentStatusEvent         Event = "deployment_status"
 	ForkEvent                     Event = "fork"
 	GollumEvent                   Event = "gollum"
-	InstallationEvent             Event = "installation"
-	IntegrationInstallationEvent  Event = "integration_installation"
 	IssueCommentEvent             Event = "issue_comment"
 	IssuesEvent                   Event = "issues"
 	LabelEvent                    Event = "label"
@@ -47,7 +45,6 @@ const (
 	OrganizationEvent             Event = "organization"
 	OrgBlockEvent                 Event = "org_block"
 	PageBuildEvent                Event = "page_build"
-	PingEvent                     Event = "ping"
 	ProjectCardEvent              Event = "project_card"
 	ProjectColumnEvent            Event = "project_column"
 	ProjectEvent                  Event = "project"
@@ -182,10 +179,6 @@ func (hook Webhook) ParsePayload(w http.ResponseWriter, r *http.Request) {
 		var g GollumPayload
 		json.Unmarshal([]byte(payload), &g)
 		hook.runProcessPayloadFunc(fn, g, hd)
-	case InstallationEvent, IntegrationInstallationEvent:
-		var i InstallationPayload
-		json.Unmarshal([]byte(payload), &i)
-		hook.runProcessPayloadFunc(fn, i, hd)
 	case IssueCommentEvent:
 		var i IssueCommentPayload
 		json.Unmarshal([]byte(payload), &i)
@@ -222,10 +215,6 @@ func (hook Webhook) ParsePayload(w http.ResponseWriter, r *http.Request) {
 		var p PageBuildPayload
 		json.Unmarshal([]byte(payload), &p)
 		hook.runProcessPayloadFunc(fn, p, hd)
-	case PingEvent:
-		var p PingPayload
-		json.Unmarshal([]byte(payload), &p)
-		hook.runProcessPayloadFunc(fn, p, hd)
 	case ProjectCardEvent:
 		var p ProjectCardPayload
 		json.Unmarshal([]byte(payload), &p)

github/github_test.go

@@ -48,8 +48,6 @@ func TestMain(m *testing.M) {
 		DeploymentStatusEvent,
 		ForkEvent,
 		GollumEvent,
-		InstallationEvent,
-		IntegrationInstallationEvent,
 		IssueCommentEvent,
 		IssuesEvent,
 		LabelEvent,
@@ -59,7 +57,6 @@ func TestMain(m *testing.M) {
 		OrganizationEvent,
 		OrgBlockEvent,
 		PageBuildEvent,
-		PingEvent,
 		ProjectCardEvent,
 		ProjectColumnEvent,
 		ProjectEvent,
@@ -1312,186 +1309,6 @@ func TestGollumEvent(t *testing.T) {
 	Equal(t, resp.StatusCode, http.StatusOK)
 }
 
-func TestInstallationEvent(t *testing.T) {
-
-	payload := `{
-    "action": "created",
-    "installation": {
-        "id": 80429,
-        "account": {
-            "login": "PombeirP",
-            "id": 138074,
-            "avatar_url": "https://avatars1.githubusercontent.com/u/138074?v=4",
-            "gravatar_id": "",
-            "url": "https://api.github.com/users/PombeirP",
-            "html_url": "https://github.com/PombeirP",
-            "followers_url": "https://api.github.com/users/PombeirP/followers",
-            "following_url": "https://api.github.com/users/PombeirP/following{/other_user}",
-            "gists_url": "https://api.github.com/users/PombeirP/gists{/gist_id}",
-            "starred_url": "https://api.github.com/users/PombeirP/starred{/owner}{/repo}",
-            "subscriptions_url": "https://api.github.com/users/PombeirP/subscriptions",
-            "organizations_url": "https://api.github.com/users/PombeirP/orgs",
-            "repos_url": "https://api.github.com/users/PombeirP/repos",
-            "events_url": "https://api.github.com/users/PombeirP/events{/privacy}",
-            "received_events_url": "https://api.github.com/users/PombeirP/received_events",
-            "type": "User",
-            "site_admin": false
-        },
-        "repository_selection": "selected",
-        "access_tokens_url": "https://api.github.com/installations/80429/access_tokens",
-        "repositories_url": "https://api.github.com/installation/repositories",
-        "html_url": "https://github.com/settings/installations/80429",
-        "app_id": 8157,
-        "target_id": 138074,
-        "target_type": "User",
-        "permissions": {
-            "repository_projects": "write",
-            "issues": "read",
-            "metadata": "read",
-            "pull_requests": "read"
-        },
-        "events": [
-            "pull_request"
-        ],
-        "created_at": 1516025475,
-        "updated_at": 1516025475,
-        "single_file_name": null
-    },
-    "repositories": [
-        {
-            "id": 117381220,
-            "name": "status-github-bot",
-            "full_name": "PombeirP/status-github-bot"
-        }
-    ],
-    "sender": {
-        "login": "PombeirP",
-        "id": 138074,
-        "avatar_url": "https://avatars1.githubusercontent.com/u/138074?v=4",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/PombeirP",
-        "html_url": "https://github.com/PombeirP",
-        "followers_url": "https://api.github.com/users/PombeirP/followers",
-        "following_url": "https://api.github.com/users/PombeirP/following{/other_user}",
-        "gists_url": "https://api.github.com/users/PombeirP/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/PombeirP/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/PombeirP/subscriptions",
-        "organizations_url": "https://api.github.com/users/PombeirP/orgs",
-        "repos_url": "https://api.github.com/users/PombeirP/repos",
-        "events_url": "https://api.github.com/users/PombeirP/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/PombeirP/received_events",
-        "type": "User",
-        "site_admin": false
-    }
-}
-`
-
-	req, err := http.NewRequest("POST", "http://127.0.0.1:3010/webhooks", bytes.NewBuffer([]byte(payload)))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-Github-Event", "installation")
-	req.Header.Set("X-Hub-Signature", "sha1=987338c6e5c21794ab6c258abe51284f9b1df728")
-
-	Equal(t, err, nil)
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	Equal(t, err, nil)
-
-	defer resp.Body.Close()
-
-	Equal(t, resp.StatusCode, http.StatusOK)
-}
-
-func TestIntegrationInstallationEvent(t *testing.T) {
-
-	payload := `{
-    "action": "created",
-    "installation": {
-        "id": 80429,
-        "account": {
-            "login": "PombeirP",
-            "id": 138074,
-            "avatar_url": "https://avatars1.githubusercontent.com/u/138074?v=4",
-            "gravatar_id": "",
-            "url": "https://api.github.com/users/PombeirP",
-            "html_url": "https://github.com/PombeirP",
-            "followers_url": "https://api.github.com/users/PombeirP/followers",
-            "following_url": "https://api.github.com/users/PombeirP/following{/other_user}",
-            "gists_url": "https://api.github.com/users/PombeirP/gists{/gist_id}",
-            "starred_url": "https://api.github.com/users/PombeirP/starred{/owner}{/repo}",
-            "subscriptions_url": "https://api.github.com/users/PombeirP/subscriptions",
-            "organizations_url": "https://api.github.com/users/PombeirP/orgs",
-            "repos_url": "https://api.github.com/users/PombeirP/repos",
-            "events_url": "https://api.github.com/users/PombeirP/events{/privacy}",
-            "received_events_url": "https://api.github.com/users/PombeirP/received_events",
-            "type": "User",
-            "site_admin": false
-        },
-        "repository_selection": "selected",
-        "access_tokens_url": "https://api.github.com/installations/80429/access_tokens",
-        "repositories_url": "https://api.github.com/installation/repositories",
-        "html_url": "https://github.com/settings/installations/80429",
-        "app_id": 8157,
-        "target_id": 138074,
-        "target_type": "User",
-        "permissions": {
-            "repository_projects": "write",
-            "issues": "read",
-            "metadata": "read",
-            "pull_requests": "read"
-        },
-        "events": [
-            "pull_request"
-        ],
-        "created_at": 1516025475,
-        "updated_at": 1516025475,
-        "single_file_name": null
-    },
-    "repositories": [
-        {
-            "id": 117381220,
-            "name": "status-github-bot",
-            "full_name": "PombeirP/status-github-bot"
-        }
-    ],
-    "sender": {
-        "login": "PombeirP",
-        "id": 138074,
-        "avatar_url": "https://avatars1.githubusercontent.com/u/138074?v=4",
-        "gravatar_id": "",
-        "url": "https://api.github.com/users/PombeirP",
-        "html_url": "https://github.com/PombeirP",
-        "followers_url": "https://api.github.com/users/PombeirP/followers",
-        "following_url": "https://api.github.com/users/PombeirP/following{/other_user}",
-        "gists_url": "https://api.github.com/users/PombeirP/gists{/gist_id}",
-        "starred_url": "https://api.github.com/users/PombeirP/starred{/owner}{/repo}",
-        "subscriptions_url": "https://api.github.com/users/PombeirP/subscriptions",
-        "organizations_url": "https://api.github.com/users/PombeirP/orgs",
-        "repos_url": "https://api.github.com/users/PombeirP/repos",
-        "events_url": "https://api.github.com/users/PombeirP/events{/privacy}",
-        "received_events_url": "https://api.github.com/users/PombeirP/received_events",
-        "type": "User",
-        "site_admin": false
-    }
-}
-`
-
-	req, err := http.NewRequest("POST", "http://127.0.0.1:3010/webhooks", bytes.NewBuffer([]byte(payload)))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-Github-Event", "integration_installation")
-	req.Header.Set("X-Hub-Signature", "sha1=987338c6e5c21794ab6c258abe51284f9b1df728")
-
-	Equal(t, err, nil)
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	Equal(t, err, nil)
-
-	defer resp.Body.Close()
-
-	Equal(t, resp.StatusCode, http.StatusOK)
-}
-
 func TestIssueCommentEvent(t *testing.T) {
 
 	payload := `{
@@ -2743,48 +2560,6 @@ func TestPageBuildEvent(t *testing.T) {
 	Equal(t, resp.StatusCode, http.StatusOK)
 }
 
-func TestPingEvent(t *testing.T) {
-
-	payload := `{
-    "zen": "Keep it logically awesome.",
-    "hook_id": 20081052,
-    "hook": {
-        "type": "App",
-        "id": 20081052,
-        "name": "web",
-        "active": true,
-        "events": [
-            "pull_request"
-        ],
-        "config": {
-            "content_type": "json",
-            "insecure_ssl": "0",
-            "secret": "********",
-            "url": "https://ngrok.io/webhook"
-        },
-        "updated_at": "2018-01-15T10:48:54Z",
-        "created_at": "2018-01-15T10:48:54Z",
-        "app_id": 8157
-    }
-}
-`
-
-	req, err := http.NewRequest("POST", "http://127.0.0.1:3010/webhooks", bytes.NewBuffer([]byte(payload)))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-Github-Event", "ping")
-	req.Header.Set("X-Hub-Signature", "sha1=f82267eb5c6408d5986209da906747f57c11b33b")
-
-	Equal(t, err, nil)
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	Equal(t, err, nil)
-
-	defer resp.Body.Close()
-
-	Equal(t, resp.StatusCode, http.StatusOK)
-}
-
 func TestProjectCardEvent(t *testing.T) {
 
 	payload := `{

github/payload.go

@@ -28,14 +28,13 @@ type CommitCommentPayload struct {
 			Type              string `json:"type"`
 			SiteAdmin         bool   `json:"site_admin"`
 		} `json:"user"`
-		Position          *int64    `json:"position"`
+		Position  *int64    `json:"position"`
-		Line              *int64    `json:"line"`
+		Line      *int64    `json:"line"`
-		Path              *string   `json:"path"`
+		Path      *string   `json:"path"`
-		CommitID          string    `json:"commit_id"`
+		CommitID  string    `json:"commit_id"`
-		CreatedAt         time.Time `json:"created_at"`
+		CreatedAt time.Time `json:"created_at"`
-		UpdatedAt         time.Time `json:"updated_at"`
+		UpdatedAt time.Time `json:"updated_at"`
-		Body              string    `json:"body"`
+		Body      string    `json:"body"`
-		AuthorAssociation string    `json:"author_association"`
 	} `json:"comment"`
 	Repository struct {
 		ID       int64  `json:"id"`
@@ -1007,74 +1006,6 @@ type GollumPayload struct {
 	} `json:"sender"`
 }
 
-// InstallationPayload contains the information for GitHub's installation and integration_installation hook events
-type InstallationPayload struct {
-	Action       string `json:"action"`
-	Installation struct {
-		ID      int64 `json:"id"`
-		Account struct {
-			Login             string `json:"login"`
-			ID                int64  `json:"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:"account"`
-		RepositorySelection string `json:"repository_selection"`
-		AccessTokensURL     string `json:"access_tokens_url"`
-		RepositoriesURL     string `json:"repositories_url"`
-		HTMLURL             string `json:"html_url"`
-		AppID               int    `json:"app_id"`
-		TargetID            int    `json:"target_id"`
-		TargetType          string `json:"target_type"`
-		Permissions         struct {
-			Issues             string `json:"issues"`
-			Metadata           string `json:"metadata"`
-			PullRequests       string `json:"pull_requests"`
-			RepositoryProjects string `json:"repository_projects"`
-		} `json:"permissions"`
-		Events         []string `json:"events"`
-		CreatedAt      int64    `json:"created_at"`
-		UpdatedAt      int64    `json:"updated_at"`
-		SingleFileName *string  `json:"single_file_name"`
-	} `json:"installation"`
-	Repositories []struct {
-		ID       int64  `json:"id"`
-		Name     string `json:"name"`
-		FullName string `json:"full_name"`
-	} `json:"repositories"`
-	Sender struct {
-		Login             string `json:"login"`
-		ID                int64  `json:"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"`
-}
-
 // IssueCommentPayload contains the information for GitHub's issue_comment hook event
 type IssueCommentPayload struct {
 	Action string `json:"action"`
@@ -1145,10 +1076,9 @@ type IssueCommentPayload struct {
 			Type              string `json:"type"`
 			SiteAdmin         bool   `json:"site_admin"`
 		} `json:"user"`
-		CreatedAt         time.Time `json:"created_at"`
+		CreatedAt time.Time `json:"created_at"`
-		UpdatedAt         time.Time `json:"updated_at"`
+		UpdatedAt time.Time `json:"updated_at"`
-		Body              string    `json:"body"`
+		Body      string    `json:"body"`
-		AuthorAssociation string    `json:"author_association"`
 	} `json:"comment"`
 	Repository struct {
 		ID       int64  `json:"id"`
@@ -2162,27 +2092,6 @@ type PageBuildPayload struct {
 	} `json:"sender"`
 }
 
-// PingPayload contains the information for GitHub's ping hook event
-type PingPayload struct {
-	HookID int `json:"hook_id"`
-	Hook   struct {
-		Type   string   `json:"type"`
-		ID     int64    `json:"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 int    `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"`
-}
-
 // ProjectCardPayload contains the information for GitHub's project_payload hook event
 type ProjectCardPayload struct {
 	Action      string `json:"action"`
@@ -3031,13 +2940,6 @@ type PullRequestPayload struct {
 		Deletions      int64     `json:"deletions"`
 		ChangedFiles   int64     `json:"changed_files"`
 	} `json:"pull_request"`
-	Label struct {
-		ID      int64  `json:"id"`
-		URL     string `json:"url"`
-		Name    string `json:"name"`
-		Color   string `json:"color"`
-		Default bool   `json:"default"`
-	} `json:"label"`
 	Repository struct {
 		ID       int64  `json:"id"`
 		Name     string `json:"name"`
@@ -3622,13 +3524,12 @@ type PullRequestReviewCommentPayload struct {
 			Type              string `json:"type"`
 			SiteAdmin         bool   `json:"site_admin"`
 		} `json:"user"`
-		Body              string    `json:"body"`
+		Body           string    `json:"body"`
-		AuthorAssociation string    `json:"author_association"`
+		CreatedAt      time.Time `json:"created_at"`
-		CreatedAt         time.Time `json:"created_at"`
+		UpdatedAt      time.Time `json:"updated_at"`
-		UpdatedAt         time.Time `json:"updated_at"`
+		HTMLURL        string    `json:"html_url"`
-		HTMLURL           string    `json:"html_url"`
+		PullRequestURL string    `json:"pull_request_url"`
-		PullRequestURL    string    `json:"pull_request_url"`
+		Links          struct {
-		Links             struct {
 			Self struct {
 				Href string `json:"href"`
 			} `json:"self"`

gitlab/gitlab.go

@@ -26,15 +26,14 @@ type Event string
 
 // GitLab hook types
 const (
-	PushEvents               Event = "Push Hook"
+	PushEvents         Event = "Push Hook"
-	TagEvents                Event = "Tag Push Hook"
+	TagEvents          Event = "Tag Push Hook"
-	IssuesEvents             Event = "Issue Hook"
+	IssuesEvents       Event = "Issue Hook"
-	ConfidentialIssuesEvents Event = "Confidential Issue Hook"
+	CommentEvents      Event = "Note Hook"
-	CommentEvents            Event = "Note Hook"
+	MergeRequestEvents Event = "Merge Request Hook"
-	MergeRequestEvents       Event = "Merge Request Hook"
+	WikiPageEvents     Event = "Wiki Page Hook"
-	WikiPageEvents           Event = "Wiki Page Hook"
+	PipelineEvents     Event = "Pipeline Hook"
-	PipelineEvents           Event = "Pipeline Hook"
+	BuildEvents        Event = "Build Hook"
-	BuildEvents              Event = "Build Hook"
 )
 
 // New creates and returns a WebHook instance denoted by the Provider type
@@ -113,11 +112,6 @@ func (hook Webhook) ParsePayload(w http.ResponseWriter, r *http.Request) {
 		json.Unmarshal([]byte(payload), &te)
 		hook.runProcessPayloadFunc(fn, te, hd)
 
-	case ConfidentialIssuesEvents:
-		var cie ConfidentialIssueEventPayload
-		json.Unmarshal([]byte(payload), &cie)
-		hook.runProcessPayloadFunc(fn, cie, hd)
-
 	case IssuesEvents:
 		var ie IssueEventPayload
 		json.Unmarshal([]byte(payload), &ie)

gitlab/gitlab_test.go

@@ -43,7 +43,6 @@ func TestMain(m *testing.M) {
 		PushEvents,
 		TagEvents,
 		IssuesEvents,
-		ConfidentialIssuesEvents,
 		CommentEvents,
 		MergeRequestEvents,
 		WikiPageEvents,
@@ -350,78 +349,6 @@ func TestIssueEvent(t *testing.T) {
 	Equal(t, resp.StatusCode, http.StatusOK)
 }
 
-func TestConfidentialIssueEvent(t *testing.T) {
-
-	payload := `{
-    "object_kind": "issue",
-    "user": {
-      "name": "Administrator",
-      "username": "root",
-      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
-    },
-    "project":{
-      "name":"Gitlab Test",
-      "description":"Aut reprehenderit ut est.",
-      "web_url":"http://example.com/gitlabhq/gitlab-test",
-      "avatar_url":null,
-      "git_ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
-      "git_http_url":"http://example.com/gitlabhq/gitlab-test.git",
-      "namespace":"GitlabHQ",
-      "visibility_level":20,
-      "path_with_namespace":"gitlabhq/gitlab-test",
-      "default_branch":"master",
-      "homepage":"http://example.com/gitlabhq/gitlab-test",
-      "url":"http://example.com/gitlabhq/gitlab-test.git",
-      "ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
-      "http_url":"http://example.com/gitlabhq/gitlab-test.git"
-    },
-    "repository":{
-      "name": "Gitlab Test",
-      "url": "http://example.com/gitlabhq/gitlab-test.git",
-      "description": "Aut reprehenderit ut est.",
-      "homepage": "http://example.com/gitlabhq/gitlab-test"
-    },
-    "object_attributes": {
-      "id": 301,
-      "title": "New API: create/update/delete file",
-      "assignee_id": 51,
-      "author_id": 51,
-      "project_id": 14,
-      "created_at": "2013-12-03T17:15:43Z",
-      "updated_at": "2013-12-03T17:15:43Z",
-      "position": 0,
-      "branch_name": null,
-      "description": "Create new API for manipulations with repository",
-      "milestone_id": null,
-      "state": "opened",
-      "iid": 23,
-      "url": "http://example.com/diaspora/issues/23",
-      "action": "open"
-    },
-    "assignee": {
-      "name": "User1",
-      "username": "user1",
-      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
-    }
-  }
-  `
-
-	req, err := http.NewRequest("POST", "http://127.0.0.1:3011/webhooks", bytes.NewBuffer([]byte(payload)))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-Gitlab-Event", "Confidential Issue Hook")
-	req.Header.Set("X-Gitlab-Token", "sampleToken!")
-
-	Equal(t, err, nil)
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	Equal(t, err, nil)
-
-	defer resp.Body.Close()
-
-	Equal(t, resp.StatusCode, http.StatusOK)
-}
-
 func TestCommentCommitEvent(t *testing.T) {
 
 	payload := `{
@@ -807,145 +734,82 @@ func TestCommentSunippetEvent(t *testing.T) {
 func TestMergeRequestEvent(t *testing.T) {
 
 	payload := `{
-    "object_kind": "merge_request",
+  "object_kind": "merge_request",
-    "user": {
+  "user": {
-      "name": "Administrator",
+    "name": "Administrator",
-      "username": "root",
+    "username": "root",
-      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
-    },
+  },
-    "project": {
+  "object_attributes": {
-      "id": 1,
+    "id": 99,
-      "name":"Gitlab Test",
+    "target_branch": "master",
+    "source_branch": "ms-viewport",
+    "source_project_id": 14,
+    "author_id": 51,
+    "assignee_id": 6,
+    "title": "MS-Viewport",
+    "created_at": "2013-12-03T17:23:34Z",
+    "updated_at": "2013-12-03T17:23:34Z",
+    "st_commits": null,
+    "st_diffs": null,
+    "milestone_id": null,
+    "state": "opened",
+    "merge_status": "unchecked",
+    "target_project_id": 14,
+    "iid": 1,
+    "description": "",
+    "source":{
+      "name":"Awesome Project",
       "description":"Aut reprehenderit ut est.",
-      "web_url":"http://example.com/gitlabhq/gitlab-test",
+      "web_url":"http://example.com/awesome_space/awesome_project",
       "avatar_url":null,
-      "git_ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
+      "git_ssh_url":"git@example.com:awesome_space/awesome_project.git",
-      "git_http_url":"http://example.com/gitlabhq/gitlab-test.git",
+      "git_http_url":"http://example.com/awesome_space/awesome_project.git",
-      "namespace":"GitlabHQ",
+      "namespace":"Awesome Space",
       "visibility_level":20,
-      "path_with_namespace":"gitlabhq/gitlab-test",
+      "path_with_namespace":"awesome_space/awesome_project",
       "default_branch":"master",
-      "homepage":"http://example.com/gitlabhq/gitlab-test",
+      "homepage":"http://example.com/awesome_space/awesome_project",
-      "url":"http://example.com/gitlabhq/gitlab-test.git",
+      "url":"http://example.com/awesome_space/awesome_project.git",
-      "ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
+      "ssh_url":"git@example.com:awesome_space/awesome_project.git",
-      "http_url":"http://example.com/gitlabhq/gitlab-test.git"
+      "http_url":"http://example.com/awesome_space/awesome_project.git"
     },
-    "repository": {
+    "target": {
-      "name": "Gitlab Test",
+      "name":"Awesome Project",
-      "url": "http://example.com/gitlabhq/gitlab-test.git",
+      "description":"Aut reprehenderit ut est.",
-      "description": "Aut reprehenderit ut est.",
+      "web_url":"http://example.com/awesome_space/awesome_project",
-      "homepage": "http://example.com/gitlabhq/gitlab-test"
+      "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":20,
+      "path_with_namespace":"awesome_space/awesome_project",
+      "default_branch":"master",
+      "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"
     },
-    "object_attributes": {
+    "last_commit": {
-      "id": 99,
+      "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-      "target_branch": "master",
+      "message": "fixed readme",
-      "source_branch": "ms-viewport",
+      "timestamp": "2012-01-03T23:36:29+02:00",
-      "source_project_id": 14,
+      "url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-      "author_id": 51,
+      "author": {
-      "assignee_id": 6,
+        "name": "GitLab dev user",
-      "title": "MS-Viewport",
+        "email": "gitlabdev@dv6700.(none)"
-      "created_at": "2013-12-03T17:23:34Z",
-      "updated_at": "2013-12-03T17:23:34Z",
-      "milestone_id": null,
-      "state": "opened",
-      "merge_status": "unchecked",
-      "target_project_id": 14,
-      "iid": 1,
-      "description": "",
-      "source": {
-        "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":20,
-        "path_with_namespace":"awesome_space/awesome_project",
-        "default_branch":"master",
-        "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":20,
-        "path_with_namespace":"awesome_space/awesome_project",
-        "default_branch":"master",
-        "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": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-        "message": "fixed readme",
-        "timestamp": "2012-01-03T23:36:29+02:00",
-        "url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
-        "author": {
-          "name": "GitLab dev user",
-          "email": "gitlabdev@dv6700.(none)"
-        }
-      },
-      "work_in_progress": false,
-      "url": "http://example.com/diaspora/merge_requests/1",
-      "action": "open",
-      "assignee": {
-        "name": "User1",
-        "username": "user1",
-        "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
       }
     },
-    "labels": [{
+    "work_in_progress": false,
-      "id": 206,
+    "url": "http://example.com/diaspora/merge_requests/1",
-      "title": "API",
+    "action": "open",
-      "color": "#ffffff",
+    "assignee": {
-      "project_id": 14,
+      "name": "User1",
-      "created_at": "2013-12-03T17:15:43Z",
+      "username": "user1",
-      "updated_at": "2013-12-03T17:15:43Z",
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
-      "template": false,
-      "description": "API related issues",
-      "type": "ProjectLabel",
-      "group_id": 41
-    }],
-    "changes": {
-      "updated_by_id": [null, 1],
-      "updated_at": ["2017-09-15 16:50:55 UTC", "2017-09-15 16:52:00 UTC"],
-      "labels": {
-        "previous": [{
-          "id": 206,
-          "title": "API",
-          "color": "#ffffff",
-          "project_id": 14,
-          "created_at": "2013-12-03T17:15:43Z",
-          "updated_at": "2013-12-03T17:15:43Z",
-          "template": false,
-          "description": "API related issues",
-          "type": "ProjectLabel",
-          "group_id": 41
-        }],
-        "current": [{
-          "id": 205,
-          "title": "Platform",
-          "color": "#123123",
-          "project_id": 14,
-          "created_at": "2013-12-03T17:15:43Z",
-          "updated_at": "2013-12-03T17:15:43Z",
-          "template": false,
-          "description": "Platform related issues",
-          "type": "ProjectLabel",
-          "group_id": 41
-        }]
-      }
     }
   }
+}
 `
 
 	req, err := http.NewRequest("POST", "http://127.0.0.1:3011/webhooks", bytes.NewBuffer([]byte(payload)))

gitlab/payload.go

@@ -38,14 +38,6 @@ type IssueEventPayload struct {
 	Repository       Repository       `json:"repository"`
 	ObjectAttributes ObjectAttributes `json:"object_attributes"`
 	Assignee         Assignee         `json:"assignee"`
-	Changes          Changes          `json:"changes"`
-}
-
-// ConfidentialIssueEventPayload contains the information for GitLab's confidential issue event
-type ConfidentialIssueEventPayload struct {
-	// The data for confidential issues is currently the same as normal issues,
-	// so we can just embed the normal issue payload type here.
-	IssueEventPayload
 }
 
 // MergeRequestEventPayload contains the information for GitLab's merge request event
@@ -53,9 +45,6 @@ type MergeRequestEventPayload struct {
 	ObjectKind       string           `json:"object_kind"`
 	User             User             `json:"user"`
 	ObjectAttributes ObjectAttributes `json:"object_attributes"`
-	Changes          Changes          `json:"changes"`
-	Project          Project          `json:"project"`
-	Repository       Repository       `json:"repository"`
 }
 
 // PushEventPayload contains the information for GitLab's push event
@@ -323,7 +312,7 @@ type MergeRequest struct {
 	ID              int64      `json:"id"`
 	TargetBranch    string     `json:"target_branch"`
 	SourceBranch    string     `json:"source_branch"`
-	SourceProjectID int64      `json:"source_project_id"`
+	SourceProjectID string     `json:"source_project_id"`
 	AssigneeID      int64      `json:"assignee_id"`
 	AuthorID        int64      `json:"author_id"`
 	Title           string     `json:"title"`
@@ -413,28 +402,3 @@ type Author struct {
 	Name  string `json:"name"`
 	Email string `json:"email"`
 }
-
-// Changes contains all changes associated with a GitLab issue or MR
-type Changes struct {
-	LabelChanges LabelChanges `json:"labels"`
-}
-
-// LabelChanges contains changes in labels assocatiated with a GitLab issue or MR
-type LabelChanges struct {
-	Previous []Label `json:"previous"`
-	Current  []Label `json:"current"`
-}
-
-// Label contains all of the GitLab label information
-type Label struct {
-	Id          int64      `json:"id"`
-	Title       string     `json:"title"`
-	Color       string     `json:"color"`
-	ProjectId   int64      `json:"project_id"`
-	CreatedAt   customTime `json:"created_at"`
-	UpdatedAt   customTime `json:"updated_at"`
-	Template    bool       `json:"template"`
-	Description string     `json:"description"`
-	Type        string     `json:"type"`
-	GroupId     int64      `json:"group_id"`
-}