Use octokit's type def versions (#431)

* use octokits types

* remove

Author: estherkim

package-lock.json

@@ -1,7 +1,6 @@
 {
   "devDependencies": {
     "@actions/core": "1.9.0",
-    "@octokit/openapi-types": "12.5.0",
     "@octokit/rest": "18.12.0",
     "@types/mocha": "9.1.1",
     "@types/node": "16.11.41",

package.json

@@ -1,7 +1,10 @@
 import {Octokit} from '@octokit/rest';
-import {components} from '@octokit/openapi-types';
+import {GetResponseTypeFromEndpointMethod} from '@octokit/types';
+
+type Commits = GetResponseTypeFromEndpointMethod<
+  Octokit['repos']['compareCommitsWithBasehead']
+>['data']['commits'];
 
-type Commit = components['schemas']['commit'];
 const params = {owner: 'ampproject', repo: 'amphtml'};
 
 export async function getMissingCommits(
@@ -39,13 +42,14 @@ export async function getMissingCommits(
 async function getCherryPickCommits(
   octokit: Octokit,
   release: string
-): Promise<Commit[] | undefined> {
+): Promise<Commits | undefined> {
   if (release.endsWith('000')) return;
   const base = release.slice(0, -3) + '000';
   const response = await octokit.rest.repos.compareCommitsWithBasehead({
     ...params,
     basehead: `${base}...${release}`,
   });
+
   return response.data.commits;
 }
 

scripts/get-missing-cherry-picks-utils.ts

@@ -10,7 +10,6 @@ import {
   runPromoteJob,
 } from './promote-job';
 import {getChannels} from './get-channels-utils';
-import {components} from '@octokit/openapi-types';
 
 interface Args {
   amp_version: string;
@@ -60,10 +59,8 @@ async function getCherryPickedPRs(
       if (pullNumber) {
         return `* https://github.com/ampproject/amphtml/pull/${pullNumber}`;
       }
-      // Ugh Octokit's typing is horrendous.
-      const {html_url: htmlUrl} =
-        commit as unknown as components['schemas']['commit'];
-      return `* ${htmlUrl}`;
+
+      return `* ${commit.url}`;
     });
   } catch (err) {
     console.warn('Could not fetch the list of cherry picked PRs, skipping...');