Refactor runner interfaces: remove RunnerState interface and update imports in scale-down.ts

Author: stuartp44

lambdas/functions/control-plane/src/aws/runners.d.ts

@@ -13,13 +13,6 @@ export interface RunnerList {
   runnerId?: string;
 }
 
-export interface RunnerState {
-  id: number;
-  name: string;
-  busy: boolean;
-  status: string;
-}
-
 export interface RunnerInfo {
   instanceId: string;
   launchTime?: Date;

lambdas/functions/control-plane/src/scale-runners/scale-down.ts

@@ -4,14 +4,25 @@ import moment from 'moment';
 
 import { createGithubAppAuth, createGithubInstallationAuth, createOctokitClient } from '../github/auth';
 import { bootTimeExceeded, listEC2Runners, tag, untag, terminateRunner } from './../aws/runners';
-import { RunnerInfo, RunnerList, RunnerState } from './../aws/runners.d';
+import { RunnerInfo, RunnerList } from './../aws/runners.d';
 import { GhRunners, githubCache } from './cache';
 import { ScalingDownConfig, getEvictionStrategy, getIdleRunnerCount } from './scale-down-config';
 import { metricGitHubAppRateLimit } from '../github/rate-limit';
 import { getGitHubEnterpriseApiUrl } from './scale-up';
+import { GetResponseDataTypeFromEndpointMethod } from '@octokit/types/dist-types/GetResponseTypeFromEndpointMethod';
 
 const logger = createChildLogger('scale-down');
 
+type OrgRunnerList = GetResponseDataTypeFromEndpointMethod<
+  typeof Octokit.prototype.actions.listSelfHostedRunnersForOrg
+>;
+
+type RepoRunnerList = GetResponseDataTypeFromEndpointMethod<
+  typeof Octokit.prototype.actions.listSelfHostedRunnersForRepo
+>;
+
+// Derive the shape of an individual runner
+type RunnerState = (OrgRunnerList | RepoRunnerList)['runners'][number];
 
 async function getOrCreateOctokit(runner: RunnerInfo): Promise<Octokit> {
   const key = runner.owner;