fix(runners): upgrade aws sdk v2 to v3 (#3138)

* fix(runners): upgrade aws sdk v2 to v3 * migrate to v3 * refactor * refactor types for runners module * fix: added pagination for EC2 DescribeInstancesCommand. --------- Co-authored-by: Navdeep Gupta <[email protected]>
philips-labs · Apr 7, 2023 · 48da039 · 48da039
1 parent e53545c
commit 48da039
Show file tree

Hide file tree

Showing 9 changed files with 1,023 additions and 949 deletions.
diff --git a/modules/runners/lambdas/runners/package.json b/modules/runners/lambdas/runners/package.json
@@ -25,6 +25,8 @@
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "@vercel/ncc": "^0.36.1",
+    "aws-sdk-client-mock": "^2.1.1",
+    "aws-sdk-client-mock-jest": "^2.1.1",
     "eslint": "^8.33.0",
     "eslint-plugin-prettier": "4.2.1",
     "jest": "^29.5",
@@ -39,11 +41,11 @@
   },
   "dependencies": {
     "@aws-lambda-powertools/logger": "^1.6.0",
-    "@aws-sdk/client-ssm": "^3.296.0",
+    "@aws-sdk/client-ec2": "^3.303.0",
+    "@aws-sdk/client-ssm": "^3.303.0",
     "@octokit/auth-app": "4.0.9",
     "@octokit/rest": "^19.0.7",
     "@octokit/types": "^9.0.0",
-    "aws-sdk": "^2.1340.0",
     "cron-parser": "^4.7.1",
     "typescript": "^4.9.4"
   }

diff --git a/modules/runners/lambdas/runners/src/aws/runners.d.ts b/modules/runners/lambdas/runners/src/aws/runners.d.ts
@@ -0,0 +1,44 @@
+import { DefaultTargetCapacityType, SpotAllocationStrategy } from '@aws-sdk/client-ec2';
+
+export type RunnerType = 'Org' | 'Repo';
+
+export interface RunnerList {
+  instanceId: string;
+  launchTime?: Date;
+  owner?: string;
+  type?: string;
+  repo?: string;
+  org?: string;
+}
+
+export interface RunnerInfo {
+  instanceId: string;
+  launchTime?: Date;
+  owner: string;
+  type: string;
+}
+
+export interface ListRunnerFilters {
+  runnerType?: RunnerType;
+  runnerOwner?: string;
+  environment?: string;
+  statuses?: string[];
+}
+
+export interface RunnerInputParameters {
+  runnerServiceConfig: string[];
+  environment: string;
+  runnerType: RunnerType;
+  runnerOwner: string;
+  ssmTokenPath: string;
+  subnets: string[];
+  launchTemplateName: string;
+  ec2instanceCriteria: {
+    instanceTypes: string[];
+    targetCapacityType: DefaultTargetCapacityType;
+    maxSpotPrice?: string;
+    instanceAllocationStrategy: SpotAllocationStrategy;
+  };
+  numberOfRunners?: number;
+  amiIdSsmParameterName?: string;
+}