Skip to content

Commit baf4371

Browse files
henrikrudstromhenrikrudstrom
committed
fixed deployment and deployment status
1 parent 7391606 commit baf4371

File tree

2 files changed

+40
-211
lines changed

2 files changed

+40
-211
lines changed

‎github/payload.go‎

Lines changed: 29 additions & 200 deletions
Original file line numberDiff line numberDiff line change
@@ -424,16 +424,17 @@ type DeletePayload struct {
424424
// DeploymentPayload contains the information for GitHub's deployment hook
425425
type DeploymentPayload struct {
426426
Deployment struct {
427-
URL string `json:"url"`
428-
ID int64 `json:"id"`
429-
NodeID string `json:"node_id"`
430-
Sha string `json:"sha"`
431-
Ref string `json:"ref"`
432-
Task string `json:"task"`
433-
Payload struct{} `json:"payload"`
434-
Environment string `json:"environment"`
435-
Description *string `json:"description"`
436-
Creator struct {
427+
URL string `json:"url"`
428+
ID int64 `json:"id"`
429+
NodeID string `json:"node_id"`
430+
Sha string `json:"sha"`
431+
Ref string `json:"ref"`
432+
Task string `json:"task"`
433+
Payload struct{} `json:"payload"`
434+
Environment string `json:"environment"`
435+
OriginalEnvironment string `json:"original_environment"`
436+
Description *string `json:"description"`
437+
Creator struct {
437438
Login string `json:"login"`
438439
ID int64 `json:"id"`
439440
NodeID string `json:"node_id"`
@@ -458,96 +459,8 @@ type DeploymentPayload struct {
458459
StatusesURL string `json:"statuses_url"`
459460
RepositoryURL string `json:"repository_url"`
460461
} `json:"deployment"`
461-
Repository struct {
462-
ID int64 `json:"id"`
463-
NodeID string `json:"node_id"`
464-
Name string `json:"name"`
465-
FullName string `json:"full_name"`
466-
Owner struct {
467-
Login string `json:"login"`
468-
ID int64 `json:"id"`
469-
NodeID string `json:"node_id"`
470-
AvatarURL string `json:"avatar_url"`
471-
GravatarID string `json:"gravatar_id"`
472-
URL string `json:"url"`
473-
HTMLURL string `json:"html_url"`
474-
FollowersURL string `json:"followers_url"`
475-
FollowingURL string `json:"following_url"`
476-
GistsURL string `json:"gists_url"`
477-
StarredURL string `json:"starred_url"`
478-
SubscriptionsURL string `json:"subscriptions_url"`
479-
OrganizationsURL string `json:"organizations_url"`
480-
ReposURL string `json:"repos_url"`
481-
EventsURL string `json:"events_url"`
482-
ReceivedEventsURL string `json:"received_events_url"`
483-
Type string `json:"type"`
484-
SiteAdmin bool `json:"site_admin"`
485-
} `json:"owner"`
486-
Private bool `json:"private"`
487-
HTMLURL string `json:"html_url"`
488-
Description string `json:"description"`
489-
Fork bool `json:"fork"`
490-
URL string `json:"url"`
491-
ForksURL string `json:"forks_url"`
492-
KeysURL string `json:"keys_url"`
493-
CollaboratorsURL string `json:"collaborators_url"`
494-
TeamsURL string `json:"teams_url"`
495-
HooksURL string `json:"hooks_url"`
496-
IssueEventsURL string `json:"issue_events_url"`
497-
EventsURL string `json:"events_url"`
498-
AssigneesURL string `json:"assignees_url"`
499-
BranchesURL string `json:"branches_url"`
500-
TagsURL string `json:"tags_url"`
501-
BlobsURL string `json:"blobs_url"`
502-
GitTagsURL string `json:"git_tags_url"`
503-
GitRefsURL string `json:"git_refs_url"`
504-
TreesURL string `json:"trees_url"`
505-
StatusesURL string `json:"statuses_url"`
506-
LanguagesURL string `json:"languages_url"`
507-
StargazersURL string `json:"stargazers_url"`
508-
ContributorsURL string `json:"contributors_url"`
509-
SubscribersURL string `json:"subscribers_url"`
510-
SubscriptionURL string `json:"subscription_url"`
511-
CommitsURL string `json:"commits_url"`
512-
GitCommitsURL string `json:"git_commits_url"`
513-
CommentsURL string `json:"comments_url"`
514-
IssueCommentURL string `json:"issue_comment_url"`
515-
ContentsURL string `json:"contents_url"`
516-
CompareURL string `json:"compare_url"`
517-
MergesURL string `json:"merges_url"`
518-
ArchiveURL string `json:"archive_url"`
519-
DownloadsURL string `json:"downloads_url"`
520-
IssuesURL string `json:"issues_url"`
521-
PullsURL string `json:"pulls_url"`
522-
MilestonesURL string `json:"milestones_url"`
523-
NotificationsURL string `json:"notifications_url"`
524-
LabelsURL string `json:"labels_url"`
525-
ReleasesURL string `json:"releases_url"`
526-
CreatedAt time.Time `json:"created_at"`
527-
UpdatedAt time.Time `json:"updated_at"`
528-
PushedAt time.Time `json:"pushed_at"`
529-
GitURL string `json:"git_url"`
530-
SSHURL string `json:"ssh_url"`
531-
CloneURL string `json:"clone_url"`
532-
SvnURL string `json:"svn_url"`
533-
Homepage *string `json:"homepage"`
534-
Size int64 `json:"size"`
535-
StargazersCount int64 `json:"stargazers_count"`
536-
WatchersCount int64 `json:"watchers_count"`
537-
Language *string `json:"language"`
538-
HasIssues bool `json:"has_issues"`
539-
HasDownloads bool `json:"has_downloads"`
540-
HasWiki bool `json:"has_wiki"`
541-
HasPages bool `json:"has_pages"`
542-
ForksCount int64 `json:"forks_count"`
543-
MirrorURL *string `json:"mirror_url"`
544-
OpenIssuesCount int64 `json:"open_issues_count"`
545-
Forks int64 `json:"forks"`
546-
OpenIssues int64 `json:"open_issues"`
547-
Watchers int64 `json:"watchers"`
548-
DefaultBranch string `json:"default_branch"`
549-
} `json:"repository"`
550-
Sender struct {
462+
Repository Repository `json:"repository"`
463+
Sender struct {
551464
Login string `json:"login"`
552465
ID int64 `json:"id"`
553466
NodeID string `json:"node_id"`
@@ -567,6 +480,7 @@ type DeploymentPayload struct {
567480
Type string `json:"type"`
568481
SiteAdmin bool `json:"site_admin"`
569482
} `json:"sender"`
483+
Installation Installation `json:"installation"`
570484
}
571485

572486
// DeploymentStatusPayload contains the information for GitHub's deployment_status hook event
@@ -597,23 +511,25 @@ type DeploymentStatusPayload struct {
597511
SiteAdmin bool `json:"site_admin"`
598512
} `json:"creator"`
599513
Description *string `json:"description"`
514+
Environment string `json:"environment"`
600515
TargetURL *string `json:"target_url"`
601516
CreatedAt time.Time `json:"created_at"`
602517
UpdatedAt time.Time `json:"updated_at"`
603518
DeploymentURL string `json:"deployment_url"`
604519
RepositoryURL string `json:"repository_url"`
605520
} `json:"deployment_status"`
606521
Deployment struct {
607-
URL string `json:"url"`
608-
ID int64 `json:"id"`
609-
NodeID string `json:"node_id"`
610-
Sha string `json:"sha"`
611-
Ref string `json:"ref"`
612-
Task string `json:"task"`
613-
Payload struct{} `json:"payload"`
614-
Environment string `json:"environment"`
615-
Description *string `json:"description"`
616-
Creator struct {
522+
URL string `json:"url"`
523+
ID int64 `json:"id"`
524+
NodeID string `json:"node_id"`
525+
Sha string `json:"sha"`
526+
Ref string `json:"ref"`
527+
Task string `json:"task"`
528+
Payload struct{} `json:"payload"`
529+
Environment string `json:"environment"`
530+
OriginalEnvironment string `json:"original_environment"`
531+
Description *string `json:"description"`
532+
Creator struct {
617533
Login string `json:"login"`
618534
ID int64 `json:"id"`
619535
NodeID string `json:"node_id"`
@@ -638,96 +554,8 @@ type DeploymentStatusPayload struct {
638554
StatusesURL string `json:"statuses_url"`
639555
RepositoryURL string `json:"repository_url"`
640556
} `json:"deployment"`
641-
Repository struct {
642-
ID int64 `json:"id"`
643-
NodeID string `json:"node_id"`
644-
Name string `json:"name"`
645-
FullName string `json:"full_name"`
646-
Owner struct {
647-
Login string `json:"login"`
648-
ID int64 `json:"id"`
649-
NodeID string `json:"node_id"`
650-
AvatarURL string `json:"avatar_url"`
651-
GravatarID string `json:"gravatar_id"`
652-
URL string `json:"url"`
653-
HTMLURL string `json:"html_url"`
654-
FollowersURL string `json:"followers_url"`
655-
FollowingURL string `json:"following_url"`
656-
GistsURL string `json:"gists_url"`
657-
StarredURL string `json:"starred_url"`
658-
SubscriptionsURL string `json:"subscriptions_url"`
659-
OrganizationsURL string `json:"organizations_url"`
660-
ReposURL string `json:"repos_url"`
661-
EventsURL string `json:"events_url"`
662-
ReceivedEventsURL string `json:"received_events_url"`
663-
Type string `json:"type"`
664-
SiteAdmin bool `json:"site_admin"`
665-
} `json:"owner"`
666-
Private bool `json:"private"`
667-
HTMLURL string `json:"html_url"`
668-
Description string `json:"description"`
669-
Fork bool `json:"fork"`
670-
URL string `json:"url"`
671-
ForksURL string `json:"forks_url"`
672-
KeysURL string `json:"keys_url"`
673-
CollaboratorsURL string `json:"collaborators_url"`
674-
TeamsURL string `json:"teams_url"`
675-
HooksURL string `json:"hooks_url"`
676-
IssueEventsURL string `json:"issue_events_url"`
677-
EventsURL string `json:"events_url"`
678-
AssigneesURL string `json:"assignees_url"`
679-
BranchesURL string `json:"branches_url"`
680-
TagsURL string `json:"tags_url"`
681-
BlobsURL string `json:"blobs_url"`
682-
GitTagsURL string `json:"git_tags_url"`
683-
GitRefsURL string `json:"git_refs_url"`
684-
TreesURL string `json:"trees_url"`
685-
StatusesURL string `json:"statuses_url"`
686-
LanguagesURL string `json:"languages_url"`
687-
StargazersURL string `json:"stargazers_url"`
688-
ContributorsURL string `json:"contributors_url"`
689-
SubscribersURL string `json:"subscribers_url"`
690-
SubscriptionURL string `json:"subscription_url"`
691-
CommitsURL string `json:"commits_url"`
692-
GitCommitsURL string `json:"git_commits_url"`
693-
CommentsURL string `json:"comments_url"`
694-
IssueCommentURL string `json:"issue_comment_url"`
695-
ContentsURL string `json:"contents_url"`
696-
CompareURL string `json:"compare_url"`
697-
MergesURL string `json:"merges_url"`
698-
ArchiveURL string `json:"archive_url"`
699-
DownloadsURL string `json:"downloads_url"`
700-
IssuesURL string `json:"issues_url"`
701-
PullsURL string `json:"pulls_url"`
702-
MilestonesURL string `json:"milestones_url"`
703-
NotificationsURL string `json:"notifications_url"`
704-
LabelsURL string `json:"labels_url"`
705-
ReleasesURL string `json:"releases_url"`
706-
CreatedAt time.Time `json:"created_at"`
707-
UpdatedAt time.Time `json:"updated_at"`
708-
PushedAt time.Time `json:"pushed_at"`
709-
GitURL string `json:"git_url"`
710-
SSHURL string `json:"ssh_url"`
711-
CloneURL string `json:"clone_url"`
712-
SvnURL string `json:"svn_url"`
713-
Homepage *string `json:"homepage"`
714-
Size int64 `json:"size"`
715-
StargazersCount int64 `json:"stargazers_count"`
716-
WatchersCount int64 `json:"watchers_count"`
717-
Language *string `json:"language"`
718-
HasIssues bool `json:"has_issues"`
719-
HasDownloads bool `json:"has_downloads"`
720-
HasWiki bool `json:"has_wiki"`
721-
HasPages bool `json:"has_pages"`
722-
ForksCount int64 `json:"forks_count"`
723-
MirrorURL *string `json:"mirror_url"`
724-
OpenIssuesCount int64 `json:"open_issues_count"`
725-
Forks int64 `json:"forks"`
726-
OpenIssues int64 `json:"open_issues"`
727-
Watchers int64 `json:"watchers"`
728-
DefaultBranch string `json:"default_branch"`
729-
} `json:"repository"`
730-
Sender struct {
557+
Repository Repository `json:"repository"`
558+
Sender struct {
731559
Login string `json:"login"`
732560
ID int64 `json:"id"`
733561
NodeID string `json:"node_id"`
@@ -747,6 +575,7 @@ type DeploymentStatusPayload struct {
747575
Type string `json:"type"`
748576
SiteAdmin bool `json:"site_admin"`
749577
} `json:"sender"`
578+
Installation Installation `json:"installation"`
750579
}
751580

752581
// ForkPayload contains the information for GitHub's fork hook event

‎github/payload_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ func TestPayloads(t *testing.T) {
5454
filename: "delete.json",
5555
typ: &DeletePayload{},
5656
},
57-
// {
58-
// name: "DeploymentStatusPayload",
59-
// filename: "deployment-status.json",
60-
// typ: &DeploymentStatusPayload{},
61-
// },
62-
// {
63-
// name: "DeploymentPayload",
64-
// filename: "deployment.json",
65-
// typ: &DeploymentPayload{},
66-
// },
57+
{
58+
name: "DeploymentStatusPayload",
59+
filename: "deployment-status.json",
60+
typ: &DeploymentStatusPayload{},
61+
},
62+
{
63+
name: "DeploymentPayload",
64+
filename: "deployment.json",
65+
typ: &DeploymentPayload{},
66+
},
6767
// {
6868
// name: "ForkPayload",
6969
// filename: "fork.json",
@@ -245,7 +245,7 @@ func TestSingle(t *testing.T) {
245245
},
246246
}
247247
}
248-
tests := createTest("deployment.json", &DeploymentPayload{}, &DeploymentPayload{})
248+
tests := createTest("fork.json", &ForkPayload{}, &ForkPayload{})
249249
for _, tt := range tests {
250250
tc := tt
251251
t.Run(tt.name, func(t *testing.T) {

0 commit comments

Comments
 (0)