test: enhance error handling for GitHub API responses in scale-down logic

Author: stuartp44

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

@@ -1,4 +1,5 @@
 import { Octokit } from '@octokit/rest';
+import { RequestError } from '@octokit/request-error';
 import moment from 'moment';
 import nock from 'nock';
 
@@ -421,8 +422,13 @@ describe('Scale down runners', () => {
         mockAwsRunners(runners);
 
         // Mock 404 error response
-        const error404 = new Error('Runner not found');
-        (error404 as any).status = 404;
+        const error404 = new RequestError('Runner not found', 404, {
+          request: {
+            method: 'GET',
+            url: 'https://api.github.com/test',
+            headers: {},
+          },
+        });
 
         if (type === 'Repo') {
           mockOctokit.actions.getSelfHostedRunnerForRepo.mockRejectedValueOnce(error404);
@@ -453,8 +459,13 @@ describe('Scale down runners', () => {
         mockAwsRunners(runners);
 
         // Mock 404 error response for busy state check
-        const error404 = new Error('Runner not found');
-        (error404 as any).status = 404;
+        const error404 = new RequestError('Runner not found', 404, {
+          request: {
+            method: 'GET',
+            url: 'https://api.github.com/test',
+            headers: {},
+          },
+        });
 
         if (type === 'Repo') {
           mockOctokit.actions.getSelfHostedRunnerForRepo.mockRejectedValueOnce(error404);
@@ -487,8 +498,13 @@ describe('Scale down runners', () => {
         mockAwsRunners(runners);
 
         // Mock non-404 error response
-        const error500 = new Error('Internal server error');
-        (error500 as any).status = 500;
+        const error500 = new RequestError('Internal server error', 500, {
+          request: {
+            method: 'GET',
+            url: 'https://api.github.com/test',
+            headers: {},
+          },
+        });
 
         if (type === 'Repo') {
           mockOctokit.actions.getSelfHostedRunnerForRepo.mockRejectedValueOnce(error500);

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

@@ -1,5 +1,6 @@
 import { Octokit } from '@octokit/rest';
 import { Endpoints } from '@octokit/types';
+import { RequestError } from '@octokit/request-error';
 import { createChildLogger } from '@aws-github-runner/aws-powertools-util';
 import moment from 'moment';
 
@@ -71,8 +72,8 @@ async function getGitHubSelfHostedRunnerState(
     metricGitHubAppRateLimit(state.headers);
 
     return state.data;
-  } catch (error: any) {
-    if (error.status === 404) {
+  } catch (error) {
+    if (error instanceof RequestError && error.status === 404) {
       logger.info(`Runner '${ec2runner.instanceId}' with GitHub Runner ID '${runnerId}' not found on GitHub (404)`);
       return null;
     }