cleanup

package.json

@@ -39,7 +39,7 @@
     "@typescript-eslint/parser": "^8.0.1",
     "@vitejs/plugin-react": "^4.3.1",
     "@vitest/ui": "^2.0.5",
-    "aws-sdk-client-mock": "^4.0.1",
+    "aws-sdk-client-mock": "^4.1.0",
     "concurrently": "^9.1.2",
     "cross-env": "^7.0.3",
     "esbuild": "^0.23.0",

src/api/index.ts

@@ -21,7 +21,6 @@ import { STSClient, GetCallerIdentityCommand } from "@aws-sdk/client-sts";
 import NodeCache from "node-cache";
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { SecretsManagerClient } from "@aws-sdk/client-secrets-manager";
-import { SESClient } from "@aws-sdk/client-ses";
 import mobileWalletRoute from "./routes/mobileWallet.js";
 
 dotenv.config();
@@ -37,10 +36,6 @@ async function init() {
     region: genericConfig.AwsRegion,
   });
 
-  const sesClient = new SESClient({
-    region: genericConfig.AwsRegion,
-  });
-
   const app: FastifyInstance = fastify({
     logger: {
       level: process.env.LOG_LEVEL || "info",
@@ -88,7 +83,6 @@ async function init() {
   app.nodeCache = new NodeCache({ checkperiod: 30 });
   app.dynamoClient = dynamoClient;
   app.secretsManagerClient = secretsManagerClient;
-  app.sesClient = sesClient;
   app.addHook("onRequest", (req, _, done) => {
     req.startTime = now();
     const hostname = req.hostname;

src/api/sqs/handlers.ts

@@ -23,7 +23,6 @@ export const emailMembershipPassHandler: SQSHandlerFunction<
   const clients = {
     smClient: new SecretsManagerClient(commonConfig),
     dynamoClient: new DynamoDBClient(commonConfig),
-    sesClient: new SESClient(commonConfig),
   };
   const entraIdToken = await getEntraIdToken(
     clients,
@@ -46,8 +45,8 @@ export const emailMembershipPassHandler: SQSHandlerFunction<
   if (runEnvironment === "dev" && email === "testinguser@illinois.edu") {
     return;
   }
-  await clients.sesClient.send(emailCommand);
-  return;
+  const sesClient = new SESClient(commonConfig);
+  return await sesClient.send(emailCommand);
 };
 
 export const pingHandler: SQSHandlerFunction<

src/api/sqs/index.ts

@@ -14,9 +14,6 @@ import { z, ZodError } from "zod";
 import pino from "pino";
 import { emailMembershipPassHandler, pingHandler } from "./handlers.js";
 import { ValidationError } from "../../common/errors/index.js";
-import { SecretsManagerClient } from "@aws-sdk/client-secrets-manager";
-import { SESClient } from "@aws-sdk/client-ses";
-import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { RunEnvironment } from "../../common/roles.js";
 import { environmentConfig } from "../../common/config.js";
 
@@ -28,7 +25,7 @@ export type SQSHandlerFunction<T extends AvailableSQSFunctions> = (
   payload: z.infer<(typeof sqsPayloadSchemas)[T]>["payload"],
   metadata: SQSMessageMetadata,
   logger: pino.Logger,
-) => Promise<void>;
+) => Promise<any>;
 
 const handlers: SQSFunctionPayloadTypes = {
   [AvailableSQSFunctions.EmailMembershipPass]: emailMembershipPassHandler,

src/api/types.d.ts

@@ -5,8 +5,8 @@ import { ConfigType } from "../common/config.js";
 import NodeCache from "node-cache";
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { SecretsManagerClient } from "@aws-sdk/client-secrets-manager";
-import { SESClient } from "@aws-sdk/client-ses";
 import { SQSClient } from "@aws-sdk/client-sqs";
+
 declare module "fastify" {
   interface FastifyInstance {
     authenticate: (
@@ -27,7 +27,6 @@ declare module "fastify" {
     environmentConfig: ConfigType;
     nodeCache: NodeCache;
     dynamoClient: DynamoDBClient;
-    sesClient: SESClient;
     sqsClient?: SQSClient;
     secretsManagerClient: SecretsManagerClient;
   }