From a2829a2e963649d32ce2069f7167f649c8f3e39c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 31 Aug 2016 22:57:52 +0200 Subject: [PATCH 1/3] Add sample gogs web hooks (unused yet) --- remote/gogs/testdata/hooks.go | 218 ++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 remote/gogs/testdata/hooks.go diff --git a/remote/gogs/testdata/hooks.go b/remote/gogs/testdata/hooks.go new file mode 100644 index 00000000..af266b7c --- /dev/null +++ b/remote/gogs/testdata/hooks.go @@ -0,0 +1,218 @@ +package testdata + +// X-Gogs-Event: pull_request +var PullRequestOpenHook = []byte(` +{ + "secret": "a_secret", + "action": "opened", + "number": 1, + "pull_request": { + "id": 2, + "number": 1, + "user": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + }, + "title": "dot", + "body": "could you figure", + "labels": [], + "milestone": null, + "assignee": null, + "state": "open", + "comments": 0, + "html_url": "http://cdb:3000/org1/test3/pulls/1", + "mergeable": true, + "merged": false, + "merged_at": null, + "merge_commit_sha": null, + "merged_by": null + }, + "repository": { + "id": 5, + "owner": { + "id": 5, + "username": "org1", + "full_name": "org1", + "email": "", + "avatar_url": "http://cdb:3000/avatars/5" + }, + "name": "test3", + "full_name": "org1/test3", + "description": "just a test", + "private": false, + "fork": false, + "html_url": "http://cdb:3000/org1/test3", + "ssh_url": "strk@git.osgeo.org:org1/test3.git", + "clone_url": "http://cdb:3000/org1/test3.git", + "website": "", + "stars_count": 0, + "forks_count": 1, + "watchers_count": 2, + "open_issues_count": 0, + "default_branch": "master", + "created_at": "2016-08-31T22:45:16+02:00", + "updated_at": "2016-08-31T22:45:31+02:00" + }, + "sender": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + } +} +') + +// X-Gogs-Event: pull_request +var PullRequestSynchronizeHook = []byte(` +{ + "secret": "a_secret", + "action": "synchronized", + "number": 1, + "pull_request": { + "id": 2, + "number": 1, + "user": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + }, + "title": "dot", + "body": "could you figure", + "labels": [], + "milestone": null, + "assignee": null, + "state": "open", + "comments": 0, + "html_url": "http://cdb:3000/org1/test3/pulls/1", + "mergeable": true, + "merged": false, + "merged_at": null, + "merge_commit_sha": null, + "merged_by": null + }, + "repository": { + "id": 5, + "owner": { + "id": 5, + "username": "org1", + "full_name": "org1", + "email": "", + "avatar_url": "http://cdb:3000/avatars/5" + }, + "name": "test3", + "full_name": "org1/test3", + "description": "just a test", + "private": false, + "fork": false, + "html_url": "http://cdb:3000/org1/test3", + "ssh_url": "strk@git.osgeo.org:org1/test3.git", + "clone_url": "http://cdb:3000/org1/test3.git", + "website": "", + "stars_count": 0, + "forks_count": 1, + "watchers_count": 2, + "open_issues_count": 0, + "default_branch": "master", + "created_at": "2016-08-31T22:45:16+02:00", + "updated_at": "2016-08-31T22:45:31+02:00" + }, + "sender": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + } +} +') + +// X-Gogs-Event: push +var PushHook = []byte(` +{ + "secret": "a_secret", + "ref": "refs/heads/master", + "before": "117b1990205dbc6395656ef1ed2125719aa7f4d3", + "after": "7d7605add378b55e6154d96b3e0957d392e2cc14", + "compare_url": "http://cdb:3000/org1/test3/compare/117b1990205dbc6395656ef1ed2125719aa7f4d3...7d7605add378b55e6154d96b3e0957d392e2cc14", + "commits": [ + { + "id": "7d7605add378b55e6154d96b3e0957d392e2cc14", + "message": "Capitalize\n", + "url": "http://cdb:3000/org1/test3/commit/7d7605add378b55e6154d96b3e0957d392e2cc14", + "author": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "committer": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "timestamp": "2016-08-31T22:51:59+02:00" + }, + { + "id": "85800d8ecf8107626dc43a0cbdf218c31cd04779", + "message": "dot\n", + "url": "http://cdb:3000/org1/test3/commit/85800d8ecf8107626dc43a0cbdf218c31cd04779", + "author": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "committer": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "timestamp": "2016-08-31T22:46:53+02:00" + } + ], + "repository": { + "id": 5, + "owner": { + "id": 5, + "username": "org1", + "full_name": "org1", + "email": "", + "avatar_url": "http://cdb:3000/avatars/5" + }, + "name": "test3", + "full_name": "org1/test3", + "description": "just a test", + "private": false, + "fork": false, + "html_url": "http://cdb:3000/org1/test3", + "ssh_url": "strk@git.osgeo.org:org1/test3.git", + "clone_url": "http://cdb:3000/org1/test3.git", + "website": "", + "stars_count": 0, + "forks_count": 1, + "watchers_count": 2, + "open_issues_count": 0, + "default_branch": "master", + "created_at": "2016-08-31T22:45:16+02:00", + "updated_at": "2016-08-31T22:45:31+02:00" + }, + "pusher": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + }, + "sender": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + } +} +') From bacb78a9e22b1a61cb0a69f0b44ec8a6ed81df1c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 1 Sep 2016 17:59:07 +0200 Subject: [PATCH 2/3] Add more hooks to existing fixture file --- remote/gogs/fixtures/hooks.go | 221 ++++++++++++++++++++++++++++++++++ remote/gogs/testdata/hooks.go | 218 --------------------------------- 2 files changed, 221 insertions(+), 218 deletions(-) delete mode 100644 remote/gogs/testdata/hooks.go diff --git a/remote/gogs/fixtures/hooks.go b/remote/gogs/fixtures/hooks.go index f73ced4b..d8bfb365 100644 --- a/remote/gogs/fixtures/hooks.go +++ b/remote/gogs/fixtures/hooks.go @@ -1,5 +1,6 @@ package fixtures +// old version ? var HookPush = ` { "ref": "refs/heads/master", @@ -44,3 +45,223 @@ var HookPush = ` } } ` + +// Sampled from Gogs version 0.9.97 +// X-Gogs-Event: push +var HookPushNew = ` +{ + "secret": "a_secret", + "ref": "refs/heads/master", + "before": "117b1990205dbc6395656ef1ed2125719aa7f4d3", + "after": "7d7605add378b55e6154d96b3e0957d392e2cc14", + "compare_url": "http://cdb:3000/org1/test3/compare/117b1990205dbc6395656ef1ed2125719aa7f4d3...7d7605add378b55e6154d96b3e0957d392e2cc14", + "commits": [ + { + "id": "7d7605add378b55e6154d96b3e0957d392e2cc14", + "message": "Capitalize\n", + "url": "http://cdb:3000/org1/test3/commit/7d7605add378b55e6154d96b3e0957d392e2cc14", + "author": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "committer": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "timestamp": "2016-08-31T22:51:59+02:00" + }, + { + "id": "85800d8ecf8107626dc43a0cbdf218c31cd04779", + "message": "dot\n", + "url": "http://cdb:3000/org1/test3/commit/85800d8ecf8107626dc43a0cbdf218c31cd04779", + "author": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "committer": { + "name": "Sandro Santilli", + "email": "strk@kbt.io", + "username": "strk" + }, + "timestamp": "2016-08-31T22:46:53+02:00" + } + ], + "repository": { + "id": 5, + "owner": { + "id": 5, + "username": "org1", + "full_name": "org1", + "email": "", + "avatar_url": "http://cdb:3000/avatars/5" + }, + "name": "test3", + "full_name": "org1/test3", + "description": "just a test", + "private": false, + "fork": false, + "html_url": "http://cdb:3000/org1/test3", + "ssh_url": "strk@git.osgeo.org:org1/test3.git", + "clone_url": "http://cdb:3000/org1/test3.git", + "website": "", + "stars_count": 0, + "forks_count": 1, + "watchers_count": 2, + "open_issues_count": 0, + "default_branch": "master", + "created_at": "2016-08-31T22:45:16+02:00", + "updated_at": "2016-08-31T22:45:31+02:00" + }, + "pusher": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + }, + "sender": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + } +} +' + +// Sampled from Gogs version 0.9.97 +// X-Gogs-Event: pull_request +var HookPullRequestOpenNew = ` +{ + "secret": "a_secret", + "action": "opened", + "number": 1, + "pull_request": { + "id": 2, + "number": 1, + "user": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + }, + "title": "dot", + "body": "could you figure", + "labels": [], + "milestone": null, + "assignee": null, + "state": "open", + "comments": 0, + "html_url": "http://cdb:3000/org1/test3/pulls/1", + "mergeable": true, + "merged": false, + "merged_at": null, + "merge_commit_sha": null, + "merged_by": null + }, + "repository": { + "id": 5, + "owner": { + "id": 5, + "username": "org1", + "full_name": "org1", + "email": "", + "avatar_url": "http://cdb:3000/avatars/5" + }, + "name": "test3", + "full_name": "org1/test3", + "description": "just a test", + "private": false, + "fork": false, + "html_url": "http://cdb:3000/org1/test3", + "ssh_url": "strk@git.osgeo.org:org1/test3.git", + "clone_url": "http://cdb:3000/org1/test3.git", + "website": "", + "stars_count": 0, + "forks_count": 1, + "watchers_count": 2, + "open_issues_count": 0, + "default_branch": "master", + "created_at": "2016-08-31T22:45:16+02:00", + "updated_at": "2016-08-31T22:45:31+02:00" + }, + "sender": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + } +} +' + +// Sampled from Gogs version 0.9.97 +// X-Gogs-Event: pull_request +var HookPullRequestSynchronize = ` +{ + "secret": "a_secret", + "action": "synchronized", + "number": 1, + "pull_request": { + "id": 2, + "number": 1, + "user": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + }, + "title": "dot", + "body": "could you figure", + "labels": [], + "milestone": null, + "assignee": null, + "state": "open", + "comments": 0, + "html_url": "http://cdb:3000/org1/test3/pulls/1", + "mergeable": true, + "merged": false, + "merged_at": null, + "merge_commit_sha": null, + "merged_by": null + }, + "repository": { + "id": 5, + "owner": { + "id": 5, + "username": "org1", + "full_name": "org1", + "email": "", + "avatar_url": "http://cdb:3000/avatars/5" + }, + "name": "test3", + "full_name": "org1/test3", + "description": "just a test", + "private": false, + "fork": false, + "html_url": "http://cdb:3000/org1/test3", + "ssh_url": "strk@git.osgeo.org:org1/test3.git", + "clone_url": "http://cdb:3000/org1/test3.git", + "website": "", + "stars_count": 0, + "forks_count": 1, + "watchers_count": 2, + "open_issues_count": 0, + "default_branch": "master", + "created_at": "2016-08-31T22:45:16+02:00", + "updated_at": "2016-08-31T22:45:31+02:00" + }, + "sender": { + "id": 1, + "username": "strk", + "full_name": "", + "email": "strk@kbt.io", + "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" + } +} +' diff --git a/remote/gogs/testdata/hooks.go b/remote/gogs/testdata/hooks.go deleted file mode 100644 index af266b7c..00000000 --- a/remote/gogs/testdata/hooks.go +++ /dev/null @@ -1,218 +0,0 @@ -package testdata - -// X-Gogs-Event: pull_request -var PullRequestOpenHook = []byte(` -{ - "secret": "a_secret", - "action": "opened", - "number": 1, - "pull_request": { - "id": 2, - "number": 1, - "user": { - "id": 1, - "username": "strk", - "full_name": "", - "email": "strk@kbt.io", - "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" - }, - "title": "dot", - "body": "could you figure", - "labels": [], - "milestone": null, - "assignee": null, - "state": "open", - "comments": 0, - "html_url": "http://cdb:3000/org1/test3/pulls/1", - "mergeable": true, - "merged": false, - "merged_at": null, - "merge_commit_sha": null, - "merged_by": null - }, - "repository": { - "id": 5, - "owner": { - "id": 5, - "username": "org1", - "full_name": "org1", - "email": "", - "avatar_url": "http://cdb:3000/avatars/5" - }, - "name": "test3", - "full_name": "org1/test3", - "description": "just a test", - "private": false, - "fork": false, - "html_url": "http://cdb:3000/org1/test3", - "ssh_url": "strk@git.osgeo.org:org1/test3.git", - "clone_url": "http://cdb:3000/org1/test3.git", - "website": "", - "stars_count": 0, - "forks_count": 1, - "watchers_count": 2, - "open_issues_count": 0, - "default_branch": "master", - "created_at": "2016-08-31T22:45:16+02:00", - "updated_at": "2016-08-31T22:45:31+02:00" - }, - "sender": { - "id": 1, - "username": "strk", - "full_name": "", - "email": "strk@kbt.io", - "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" - } -} -') - -// X-Gogs-Event: pull_request -var PullRequestSynchronizeHook = []byte(` -{ - "secret": "a_secret", - "action": "synchronized", - "number": 1, - "pull_request": { - "id": 2, - "number": 1, - "user": { - "id": 1, - "username": "strk", - "full_name": "", - "email": "strk@kbt.io", - "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" - }, - "title": "dot", - "body": "could you figure", - "labels": [], - "milestone": null, - "assignee": null, - "state": "open", - "comments": 0, - "html_url": "http://cdb:3000/org1/test3/pulls/1", - "mergeable": true, - "merged": false, - "merged_at": null, - "merge_commit_sha": null, - "merged_by": null - }, - "repository": { - "id": 5, - "owner": { - "id": 5, - "username": "org1", - "full_name": "org1", - "email": "", - "avatar_url": "http://cdb:3000/avatars/5" - }, - "name": "test3", - "full_name": "org1/test3", - "description": "just a test", - "private": false, - "fork": false, - "html_url": "http://cdb:3000/org1/test3", - "ssh_url": "strk@git.osgeo.org:org1/test3.git", - "clone_url": "http://cdb:3000/org1/test3.git", - "website": "", - "stars_count": 0, - "forks_count": 1, - "watchers_count": 2, - "open_issues_count": 0, - "default_branch": "master", - "created_at": "2016-08-31T22:45:16+02:00", - "updated_at": "2016-08-31T22:45:31+02:00" - }, - "sender": { - "id": 1, - "username": "strk", - "full_name": "", - "email": "strk@kbt.io", - "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" - } -} -') - -// X-Gogs-Event: push -var PushHook = []byte(` -{ - "secret": "a_secret", - "ref": "refs/heads/master", - "before": "117b1990205dbc6395656ef1ed2125719aa7f4d3", - "after": "7d7605add378b55e6154d96b3e0957d392e2cc14", - "compare_url": "http://cdb:3000/org1/test3/compare/117b1990205dbc6395656ef1ed2125719aa7f4d3...7d7605add378b55e6154d96b3e0957d392e2cc14", - "commits": [ - { - "id": "7d7605add378b55e6154d96b3e0957d392e2cc14", - "message": "Capitalize\n", - "url": "http://cdb:3000/org1/test3/commit/7d7605add378b55e6154d96b3e0957d392e2cc14", - "author": { - "name": "Sandro Santilli", - "email": "strk@kbt.io", - "username": "strk" - }, - "committer": { - "name": "Sandro Santilli", - "email": "strk@kbt.io", - "username": "strk" - }, - "timestamp": "2016-08-31T22:51:59+02:00" - }, - { - "id": "85800d8ecf8107626dc43a0cbdf218c31cd04779", - "message": "dot\n", - "url": "http://cdb:3000/org1/test3/commit/85800d8ecf8107626dc43a0cbdf218c31cd04779", - "author": { - "name": "Sandro Santilli", - "email": "strk@kbt.io", - "username": "strk" - }, - "committer": { - "name": "Sandro Santilli", - "email": "strk@kbt.io", - "username": "strk" - }, - "timestamp": "2016-08-31T22:46:53+02:00" - } - ], - "repository": { - "id": 5, - "owner": { - "id": 5, - "username": "org1", - "full_name": "org1", - "email": "", - "avatar_url": "http://cdb:3000/avatars/5" - }, - "name": "test3", - "full_name": "org1/test3", - "description": "just a test", - "private": false, - "fork": false, - "html_url": "http://cdb:3000/org1/test3", - "ssh_url": "strk@git.osgeo.org:org1/test3.git", - "clone_url": "http://cdb:3000/org1/test3.git", - "website": "", - "stars_count": 0, - "forks_count": 1, - "watchers_count": 2, - "open_issues_count": 0, - "default_branch": "master", - "created_at": "2016-08-31T22:45:16+02:00", - "updated_at": "2016-08-31T22:45:31+02:00" - }, - "pusher": { - "id": 1, - "username": "strk", - "full_name": "", - "email": "strk@kbt.io", - "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" - }, - "sender": { - "id": 1, - "username": "strk", - "full_name": "", - "email": "strk@kbt.io", - "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" - } -} -') From 320b8b68f0b5013bd403ea71e6d2c2d66aeb421c Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 1 Sep 2016 21:49:44 +0200 Subject: [PATCH 3/3] Fix ticks --- remote/gogs/fixtures/hooks.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remote/gogs/fixtures/hooks.go b/remote/gogs/fixtures/hooks.go index d8bfb365..2779616c 100644 --- a/remote/gogs/fixtures/hooks.go +++ b/remote/gogs/fixtures/hooks.go @@ -130,7 +130,7 @@ var HookPushNew = ` "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" } } -' +` // Sampled from Gogs version 0.9.97 // X-Gogs-Event: pull_request @@ -197,7 +197,7 @@ var HookPullRequestOpenNew = ` "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" } } -' +` // Sampled from Gogs version 0.9.97 // X-Gogs-Event: pull_request @@ -264,4 +264,4 @@ var HookPullRequestSynchronize = ` "avatar_url": "https://avatars.kbt.io/avatar/fe2a9e759730ee64c44bf8901bf4ccc3" } } -' +`