Change PushEvent.Pusher type to CommitAuthor (google#2999)

Fixes: google#2998.
o-sama · Dec 19, 2023 · c7a9ad7 · c7a9ad7
1 parent b0181bb
commit c7a9ad7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/github/event_types.go b/github/event_types.go
@@ -1282,7 +1282,7 @@ type PushEvent struct {
 	Compare      *string              `json:"compare,omitempty"`
 	Repo         *PushEventRepository `json:"repository,omitempty"`
 	HeadCommit   *HeadCommit          `json:"head_commit,omitempty"`
-	Pusher       *User                `json:"pusher,omitempty"`
+	Pusher       *CommitAuthor        `json:"pusher,omitempty"`
 	Sender       *User                `json:"sender,omitempty"`
 	Installation *Installation        `json:"installation,omitempty"`
 

diff --git a/github/event_types_test.go b/github/event_types_test.go
@@ -3777,14 +3777,11 @@ func TestPushEvent_Marshal(t *testing.T) {
 		Compare:      String("a"),
 		Repo:         &PushEventRepository{ID: Int64(1)},
 		HeadCommit:   &HeadCommit{ID: String("id")},
-		Pusher: &User{
-			Login:     String("l"),
-			ID:        Int64(1),
-			NodeID:    String("n"),
-			URL:       String("u"),
-			ReposURL:  String("r"),
-			EventsURL: String("e"),
-			AvatarURL: String("a"),
+		Pusher: &CommitAuthor{
+			Login: String("l"),
+			Date:  &Timestamp{referenceTime},
+			Name:  String("n"),
+			Email: String("e"),
 		},
 		Sender: &User{
 			Login:     String("l"),
@@ -3937,13 +3934,10 @@ func TestPushEvent_Marshal(t *testing.T) {
 			"id": "id"
 		},
 		"pusher": {
-			"login": "l",
-			"id": 1,
-			"node_id": "n",
-			"avatar_url": "a",
-			"url": "u",
-			"events_url": "e",
-			"repos_url": "r"
+			"date": ` + referenceTimeStr + `,
+			"name": "n",
+			"email": "e",
+			"username": "l"
 		},
 		"sender": {
 			"login": "l",

diff --git a/github/github-accessors.go b/github/github-accessors.go
diff --git a/github/github-stringify_test.go b/github/github-stringify_test.go
diff --git a/github/repos_hooks_test.go b/github/repos_hooks_test.go
@@ -357,9 +357,8 @@ func TestBranchWebHookPayload_Marshal(t *testing.T) {
 		Organization: &Organization{
 			ID: Int64(22),
 		},
-		Pusher: &User{
+		Pusher: &CommitAuthor{
 			Login: String("[email protected]"),
-			ID:    Int64(112),
 		},
 		Repo: &PushEventRepository{
 			ID:     Int64(321),
@@ -421,8 +420,7 @@ func TestBranchWebHookPayload_Marshal(t *testing.T) {
 			"id" : 22
 		},
 		"pusher":{
-			"login": "[email protected]",
-			"id": 112
+			"username": "[email protected]"
 		},
 		"repository":{
 			"id": 321,