fix: associated pull requests should match merge commit sha (#817)

googleapis · Mar 9, 2021 · c144f8b · c144f8b
1 parent 89e5bed
commit c144f8b
Show file tree

Hide file tree

Showing 11 changed files with 355 additions and 64 deletions.
diff --git a/src/github.ts b/src/github.ts
@@ -149,6 +149,9 @@ interface GraphQLCommit {
           name: string;
         }[];
       };
+      mergeCommit?: {
+        oid: string;
+      };
     }[];
   };
 }
@@ -658,7 +661,7 @@ export class GitHub {
               ... on Commit {
                 history(first: $num, after: $cursor) {
                   nodes {
-                    associatedPullRequests(first: 1) {
+                    associatedPullRequests(first: 10) {
                       nodes {
                         number
                         title
@@ -670,6 +673,9 @@ export class GitHub {
                           }
                         }
                         body
+                        mergeCommit {
+                          oid
+                        }
                       }
                     }
                     sha: oid
@@ -701,8 +707,12 @@ export class GitHub {
           message: graphCommit.message,
           files: [] as string[],
         };
-        if (graphCommit.associatedPullRequests.nodes.length > 0) {
-          const pullRequest = graphCommit.associatedPullRequests.nodes[0];
+        const pullRequest = graphCommit.associatedPullRequests.nodes.find(
+          pr => {
+            return pr.mergeCommit && pr.mergeCommit.oid === graphCommit.sha;
+          }
+        );
+        if (pullRequest) {
           return {
             commit,
             pullRequest: {

diff --git a/test/fixtures/commits-since-page-1.json b/test/fixtures/commits-since-page-1.json
@@ -15,7 +15,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "e6daec403626c9987c7af0d97b34f324cd84320a"
+                    }
                   }
                 ]
               },
@@ -33,7 +36,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "b29149f890e6f76ee31ed128585744d4c598924c"
+                    }
                   }
                 ]
               },
@@ -51,7 +57,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "27d7d7232e2e312d1380e906984f0823f5decf61"
+                    }
                   }
                 ]
               },
@@ -69,7 +78,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "2b4e0b3be2e231cd87cc44c411bd8f84b4587ab5"
+                    }
                   }
                 ]
               },
@@ -87,7 +99,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "a257514a541d483425118d973674b1ce006a5489"
+                    }
                   }
                 ]
               },
@@ -105,7 +120,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "b6a8ab1a50106cfb03f22c2cdaf7abfdcccce088"
+                    }
                   }
                 ]
               },
@@ -123,7 +141,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "520b6f42551c86002197d033564a76a3f99b0019"
+                    }
                   }
                 ]
               },
@@ -145,7 +166,10 @@
                         }
                       ]
                     },
-                    "body": ":robot: I have created a release \\*beep\\* \\*boop\\* \n---\n### Updating meta-information for bleeding-edge SNAPSHOT release.\n---\n\n\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please)."
+                    "body": ":robot: I have created a release \\*beep\\* \\*boop\\* \n---\n### Updating meta-information for bleeding-edge SNAPSHOT release.\n---\n\n\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).",
+                    "mergeCommit": {
+                      "oid": "9dda1a331d311d0a7643015cc9e6802548c8d943"
+                    }
                   }
                 ]
               },
@@ -163,7 +187,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "e86984fb22ccc5eafb6c3d815851ade3463193da"
+                    }
                   }
                 ]
               },

diff --git a/test/fixtures/commits-since-page-2.json b/test/fixtures/commits-since-page-2.json
@@ -19,7 +19,10 @@
                         }
                       ]
                     },
-                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure"
+                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure",
+                    "mergeCommit": {
+                      "oid": "959ee48c95f254300eb040c46ebdc8248317efe4"
+                    }
                   }
                 ]
               },

diff --git a/test/fixtures/commits-since.json b/test/fixtures/commits-since.json
@@ -15,7 +15,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "e6daec403626c9987c7af0d97b34f324cd84320a"
+                    }
                   }
                 ]
               },
@@ -33,7 +36,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "b29149f890e6f76ee31ed128585744d4c598924c"
+                    }
                   }
                 ]
               },
@@ -51,7 +57,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "27d7d7232e2e312d1380e906984f0823f5decf61"
+                    }
                   }
                 ]
               },
@@ -69,7 +78,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "2b4e0b3be2e231cd87cc44c411bd8f84b4587ab5"
+                    }
                   }
                 ]
               },
@@ -87,7 +99,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "a257514a541d483425118d973674b1ce006a5489"
+                    }
                   }
                 ]
               },
@@ -105,7 +120,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "b6a8ab1a50106cfb03f22c2cdaf7abfdcccce088"
+                    }
                   }
                 ]
               },
@@ -123,7 +141,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "520b6f42551c86002197d033564a76a3f99b0019"
+                    }
                   }
                 ]
               },
@@ -145,7 +166,10 @@
                         }
                       ]
                     },
-                    "body": ":robot: I have created a release \\*beep\\* \\*boop\\* \n---\n### Updating meta-information for bleeding-edge SNAPSHOT release.\n---\n\n\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please)."
+                    "body": ":robot: I have created a release \\*beep\\* \\*boop\\* \n---\n### Updating meta-information for bleeding-edge SNAPSHOT release.\n---\n\n\nThis PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).",
+                    "mergeCommit": {
+                      "oid": "9dda1a331d311d0a7643015cc9e6802548c8d943"
+                    }
                   }
                 ]
               },
@@ -163,7 +187,10 @@
                     "labels": {
                       "nodes": []
                     },
-                    "body": ""
+                    "body": "",
+                    "mergeCommit": {
+                      "oid": "e86984fb22ccc5eafb6c3d815851ade3463193da"
+                    }
                   }
                 ]
               },
@@ -192,7 +219,10 @@
                         }
                       ]
                     },
-                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure"
+                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure",
+                    "mergeCommit": {
+                      "oid": "959ee48c95f254300eb040c46ebdc8248317efe4"
+                    }
                   }
                 ]
               },

diff --git a/test/fixtures/latest-tag-alternate-branch.json b/test/fixtures/latest-tag-alternate-branch.json
@@ -19,7 +19,10 @@
                         }
                       ]
                     },
-                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure"
+                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure",
+                    "mergeCommit": {
+                      "oid": "bc329592af60713fe28586dc6d9dfb03aa2dbe1a"
+                    }
                   }
                 ]
               },
@@ -41,7 +44,10 @@
                         }
                       ]
                     },
-                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure"
+                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure",
+                    "mergeCommit": {
+                      "oid": "92af60713fe28586dc6d9dfb03aa2dbe1abc3295"
+                    }
                   }
                 ]
               },
@@ -63,7 +69,10 @@
                         }
                       ]
                     },
-                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure"
+                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure",
+                    "mergeCommit": {
+                      "oid": "959ee48c95f254300eb040c46ebdc8248317efe4"
+                    }
                   }
                 ]
               },
@@ -85,7 +94,10 @@
                         }
                       ]
                     },
-                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure"
+                    "body": "This pull request was generated using releasetool.\n\n02-03-2021 11:56 PST\n\n### New Features\n- feat: initial commit\n\n### Internal / Testing Changes\n- build: add java structure",
+                    "mergeCommit": {
+                      "oid": "959ee48c95f254300eb040c46ebdc8248317efe4"
+                    }
                   }
                 ]
               },