feat(esm): moving all lambdas to esm (#1003)

* feat(esm): moving account data deleter batch delete to esm * feat(esm): moving account data deleter events to esm * feat(esm): moving account delete monitor * feat(esm): moving user list search indexing to esm * feat(esm): moving annotations api events to esm * feat(esm): moving fxa webhook proxy gateway to esm * feat(esm): moving fxa webhook proxy sqs to esm * feat(esm): moving instant sync events to esm * feat(esm): moving sendgrid data to esm * feat(esm): moving shareable lists to esm * feat(esm): moving transactional emails to esm * feat(esm): moving user list search corpus indexing to esm * feat(esm): moving user list search corpus to esm * feat(esm): moving user list search events to esm * feat(esm): moving user list search kinesis to esm * fix(esm): small lambda esm fixes * fix(esm): updating jest to support esm * fix(tests): ensure all tests pass
Pocket · Jan 6, 2025 · 862e48c · 862e48c
1 parent 11c8b60
commit 862e48c
Show file tree

Hide file tree

Showing 177 changed files with 513 additions and 371 deletions.
diff --git a/lambdas/account-data-deleter-batch-delete/jest.config.js b/lambdas/account-data-deleter-batch-delete/jest.config.js
diff --git a/lambdas/account-data-deleter-batch-delete/jest.config.ts b/lambdas/account-data-deleter-batch-delete/jest.config.ts
@@ -0,0 +1,17 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/?(*.)+(spec|integration).ts'],
+  testPathIgnorePatterns: ['/dist/'],
+  setupFiles: ['./jest.setup.ts'],
+  displayName: 'lambda-batchdelete',
+  testTimeout: 1000000,
+  moduleNameMapper: {
+    "^(\\.\\/.+)\\.js$": "$1",
+    "^(\\..\\/.+)\\.js$": "$1"
+  },
+};
+
+export default config;
diff --git a/...t-data-deleter-batch-delete/jest.setup.js → ...t-data-deleter-batch-delete/jest.setup.ts b/...t-data-deleter-batch-delete/jest.setup.js → ...t-data-deleter-batch-delete/jest.setup.ts
diff --git a/lambdas/account-data-deleter-batch-delete/package.json b/lambdas/account-data-deleter-batch-delete/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "ISC",
   "author": "",
+  "type": "module",
   "main": "dist/index.js",
   "files": [
     "dist",

diff --git a/lambdas/account-data-deleter-batch-delete/src/dyanmoUtils.integration.ts b/lambdas/account-data-deleter-batch-delete/src/dyanmoUtils.integration.ts
@@ -1,9 +1,9 @@
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 import { BatchGetCommand } from '@aws-sdk/lib-dynamodb';
-import { config } from './config';
-import { BatchDeleteDyanmoClient } from './dynamoUtils';
-import { seedData, truncateTable } from './test/utils';
+import { config } from './config.ts';
+import { BatchDeleteDyanmoClient } from './dynamoUtils.ts';
+import { seedData, truncateTable } from './test/utils.ts';
 
 describe('Data fetcher', () => {
   const client = new DynamoDBClient({

diff --git a/lambdas/account-data-deleter-batch-delete/src/dynamoUtils.ts b/lambdas/account-data-deleter-batch-delete/src/dynamoUtils.ts
@@ -1,4 +1,4 @@
-import { config } from './config';
+import { config } from './config.ts';
 import {
   BatchWriteCommand,
   BatchWriteCommandInput,

diff --git a/lambdas/account-data-deleter-batch-delete/src/externalCaller/deleteMutation.spec.ts b/lambdas/account-data-deleter-batch-delete/src/externalCaller/deleteMutation.spec.ts
@@ -1,5 +1,5 @@
-import { config } from '../config';
-import { deleteUserMutationCaller, userApiCalls } from './deleteMutation';
+import { config } from '../config.ts';
+import { deleteUserMutationCaller, userApiCalls } from './deleteMutation.ts';
 import nock from 'nock';
 
 describe('deleteUser mutation test', () => {

diff --git a/lambdas/account-data-deleter-batch-delete/src/externalCaller/deleteMutation.ts b/lambdas/account-data-deleter-batch-delete/src/externalCaller/deleteMutation.ts
@@ -1,5 +1,5 @@
 import { backOff } from 'exponential-backoff';
-import { config } from '../config';
+import { config } from '../config.ts';
 
 /**
  * Function that establishes the number of back off attempts

diff --git a/lambdas/account-data-deleter-batch-delete/src/index.spec.ts b/lambdas/account-data-deleter-batch-delete/src/index.spec.ts
@@ -1,8 +1,8 @@
-import { BatchDeleteDyanmoClient } from './dynamoUtils';
+import { BatchDeleteDyanmoClient } from './dynamoUtils.ts';
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-import { config } from './config';
-import * as DeleteMutation from './externalCaller/deleteMutation';
-import { deleteUsers } from './index';
+import { config } from './config.ts';
+import * as DeleteMutation from './externalCaller/deleteMutation.ts';
+import { deleteUsers } from './index.ts';
 import * as Sentry from '@sentry/aws-serverless';
 
 describe('deleteUsers spec test', () => {

diff --git a/lambdas/account-data-deleter-batch-delete/src/index.ts b/lambdas/account-data-deleter-batch-delete/src/index.ts
@@ -1,4 +1,4 @@
-import { config } from './config';
+import { config } from './config.ts';
 import * as Sentry from '@sentry/aws-serverless';
 import { serverLogger } from '@pocket-tools/ts-logger';
 
@@ -11,9 +11,9 @@ Sentry.init({
 });
 
 import { EventBridgeEvent } from 'aws-lambda';
-import { BatchDeleteDyanmoClient } from './dynamoUtils';
+import { BatchDeleteDyanmoClient } from './dynamoUtils.ts';
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
-import { deleteUserMutationCaller } from './externalCaller/deleteMutation';
+import { deleteUserMutationCaller } from './externalCaller/deleteMutation.ts';
 
 const dynamoDBClient = new DynamoDBClient({
   region: config.aws.region,

diff --git a/lambdas/account-data-deleter-batch-delete/src/test/utils.ts b/lambdas/account-data-deleter-batch-delete/src/test/utils.ts
@@ -8,7 +8,7 @@ import {
 } from '@aws-sdk/lib-dynamodb';
 
 import { chunk } from 'lodash';
-import { config } from '../config';
+import { config } from '../config.ts';
 
 /**
  * Seed data of consecutive stringified integers, hash key only

diff --git a/lambdas/account-data-deleter-batch-delete/tsconfig.json b/lambdas/account-data-deleter-batch-delete/tsconfig.json
@@ -4,7 +4,7 @@
     "outDir": "dist",
     "rootDir": "src"
   },
-  "exclude": ["node_modules", "jest.config.js", "jest.setup.js"],
+  "exclude": ["node_modules", "jest.config.ts", "jest.setup.ts"],
   "include": [
     "src/**/*.ts", 
   ]

diff --git a/lambdas/account-data-deleter-events/jest.config.js b/lambdas/account-data-deleter-events/jest.config.js
diff --git a/lambdas/account-data-deleter-events/jest.config.ts b/lambdas/account-data-deleter-events/jest.config.ts
@@ -0,0 +1,16 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/?(*.)+(spec|integration).ts'],
+  testPathIgnorePatterns: ['/dist/'],
+  setupFiles: ['./jest.setup.ts'],
+  displayName: 'lambda-events',
+  moduleNameMapper: {
+    "^(\\.\\/.+)\\.js$": "$1",
+    "^(\\..\\/.+)\\.js$": "$1"
+  },
+};
+
+export default config;
diff --git a/...account-data-deleter-events/jest.setup.js → ...account-data-deleter-events/jest.setup.ts b/...account-data-deleter-events/jest.setup.js → ...account-data-deleter-events/jest.setup.ts
diff --git a/lambdas/account-data-deleter-events/package.json b/lambdas/account-data-deleter-events/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "ISC",
   "author": "",
+  "type": "module",
   "main": "dist/index.js",
   "files": [
     "dist",

diff --git a/lambdas/account-data-deleter-events/src/handlers/accountDelete/index.spec.ts b/lambdas/account-data-deleter-events/src/handlers/accountDelete/index.spec.ts
@@ -1,7 +1,7 @@
-import { config } from '../../config';
+import { config } from '../../config.ts';
 import nock from 'nock';
-import { accountDeleteHandler } from './';
-import { callQueueDeleteEndpoint } from './postRequest';
+import { accountDeleteHandler } from './index.ts';
+import { callQueueDeleteEndpoint } from './postRequest.ts';
 import { SQSRecord } from 'aws-lambda';
 
 describe('accountDelete handler', () => {

diff --git a/lambdas/account-data-deleter-events/src/handlers/accountDelete/index.ts b/lambdas/account-data-deleter-events/src/handlers/accountDelete/index.ts
@@ -1,10 +1,10 @@
-import { AccountDeleteEvent } from '../../schemas/accountDeleteEvent';
+import { AccountDeleteEvent } from '../../schemas/accountDeleteEvent.ts';
 import {
   callQueueDeleteEndpoint,
   callStripeDeleteEndpoint,
-} from './postRequest';
+} from './postRequest.ts';
 import { SQSRecord } from 'aws-lambda';
-import { AggregateError } from '../../errors/AggregateError';
+import { AggregateError } from '../../errors/AggregateError.ts';
 
 type AccountDeleteBody = {
   userId: string;

diff --git a/lambdas/account-data-deleter-events/src/handlers/accountDelete/postRequest.ts b/lambdas/account-data-deleter-events/src/handlers/accountDelete/postRequest.ts
@@ -1,5 +1,5 @@
 import fetchRetry from 'fetch-retry';
-import { config } from '../../config';
+import { config } from '../../config.ts';
 
 const newFetch = fetchRetry(fetch);
 

diff --git a/lambdas/account-data-deleter-events/src/handlers/index.ts b/lambdas/account-data-deleter-events/src/handlers/index.ts
@@ -1,5 +1,5 @@
 import { SQSRecord } from 'aws-lambda';
-import { accountDeleteHandler } from './accountDelete';
+import { accountDeleteHandler } from './accountDelete/index.ts';
 
 export enum Event {
   ACCOUNT_DELETION = 'account-deletion',

diff --git a/lambdas/account-data-deleter-events/src/index.spec.ts b/lambdas/account-data-deleter-events/src/index.spec.ts
@@ -1,5 +1,5 @@
-import { Event, handlers } from './handlers';
-import { handlerFn } from './index';
+import { Event, handlers } from './handlers/index.ts';
+import { handlerFn } from './index.ts';
 import { SQSEvent } from 'aws-lambda';
 import * as Sentry from '@sentry/aws-serverless';
 

diff --git a/lambdas/account-data-deleter-events/src/index.ts b/lambdas/account-data-deleter-events/src/index.ts
@@ -1,4 +1,4 @@
-import { config } from './config';
+import { config } from './config.ts';
 import * as Sentry from '@sentry/aws-serverless';
 Sentry.init({
   dsn: config.sentry.dsn,
@@ -7,7 +7,7 @@ Sentry.init({
   serverName: config.app.name,
 });
 import { SQSBatchItemFailure, SQSEvent } from 'aws-lambda';
-import { handlers } from './handlers';
+import { handlers } from './handlers/index.ts';
 import { serverLogger } from '@pocket-tools/ts-logger';
 
 export async function handlerFn(event: SQSEvent): Promise<any> {

diff --git a/lambdas/account-data-deleter-events/tsconfig.json b/lambdas/account-data-deleter-events/tsconfig.json
@@ -4,7 +4,7 @@
     "outDir": "dist",
     "rootDir": "src"
   },
-  "exclude": ["node_modules", "jest.config.js", "jest.setup.js"],
+  "exclude": ["node_modules", "jest.config.ts", "jest.setup.ts"],
   "include": [
     "src/**/*.ts", 
   ]

diff --git a/lambdas/account-delete-monitor/jest.config.js b/lambdas/account-delete-monitor/jest.config.js
diff --git a/lambdas/account-delete-monitor/jest.config.ts b/lambdas/account-delete-monitor/jest.config.ts
@@ -0,0 +1,16 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testMatch: ['**/?(*.)+(spec|integration).ts'],
+  testPathIgnorePatterns: ['/dist/'],
+  displayName: 'account-delete-monitor',
+  setupFiles: ['./jest.setup.ts'],
+  moduleNameMapper: {
+    "^(\\.\\/.+)\\.js$": "$1",
+    "^(\\..\\/.+)\\.js$": "$1"
+  },
+};
+
+export default config;
diff --git a/lambdas/account-delete-monitor/jest.setup.js → lambdas/account-delete-monitor/jest.setup.ts b/lambdas/account-delete-monitor/jest.setup.js → lambdas/account-delete-monitor/jest.setup.ts
diff --git a/lambdas/account-delete-monitor/package.json b/lambdas/account-delete-monitor/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "license": "ISC",
   "author": "",
+  "type": "module",
   "main": "dist/index.js",
   "files": [
     "dist",

diff --git a/lambdas/account-delete-monitor/src/dynamodb.ts b/lambdas/account-delete-monitor/src/dynamodb.ts
@@ -1,6 +1,6 @@
 import { DynamoDBClient, DynamoDBClientConfig } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
-import { config } from './config';
+import { config } from './config.ts';
 
 /** Initialize outside of handler to follow best practices
  * Note that TCP connection reuse is enabled by default in v3

diff --git a/lambdas/account-delete-monitor/src/externalCaller/deleteMutation.spec.ts b/lambdas/account-delete-monitor/src/externalCaller/deleteMutation.spec.ts
@@ -1,5 +1,5 @@
-import { config } from '../config';
-import { deleteUserMutationCaller, userApiCalls } from './deleteMutation';
+import { config } from '../config.ts';
+import { deleteUserMutationCaller, userApiCalls } from './deleteMutation.ts';
 import nock from 'nock';
 
 describe('deleteUser mutation test', () => {

diff --git a/lambdas/account-delete-monitor/src/externalCaller/deleteMutation.ts b/lambdas/account-delete-monitor/src/externalCaller/deleteMutation.ts
@@ -1,5 +1,5 @@
 import { backOff } from 'exponential-backoff';
-import { config } from '../config';
+import { config } from '../config.ts';
 
 /**
  * Function that establishes the number of back off attempts

diff --git a/lambdas/account-delete-monitor/src/handlers/accountDeleteHandler.integration.ts b/lambdas/account-delete-monitor/src/handlers/accountDeleteHandler.integration.ts
@@ -1,10 +1,10 @@
-import { accountDeleteHandler } from './accountDeleteHandler';
+import { accountDeleteHandler } from './accountDeleteHandler.ts';
 import { SQSRecord } from 'aws-lambda';
-import { client, dynamo } from '../dynamodb';
+import { client, dynamo } from '../dynamodb.ts';
 import { GetCommand, PutCommand } from '@aws-sdk/lib-dynamodb';
-import { config } from '../config';
-import * as deleteMutation from '../externalCaller/deleteMutation';
-import { truncateTable } from '../test/utils';
+import { config } from '../config.ts';
+import * as deleteMutation from '../externalCaller/deleteMutation.ts';
+import { truncateTable } from '../test/utils.ts';
 
 describe('Account delete handler', () => {
   const record = {

diff --git a/lambdas/account-delete-monitor/src/handlers/accountDeleteHandler.spec.ts b/lambdas/account-delete-monitor/src/handlers/accountDeleteHandler.spec.ts
@@ -1,5 +1,5 @@
-import { client } from '../dynamodb';
-import { accountDeleteHandler } from './accountDeleteHandler';
+import { client } from '../dynamodb.ts';
+import { accountDeleteHandler } from './accountDeleteHandler.ts';
 import { type SQSRecord } from 'aws-lambda';
 
 describe('Account delete handler', () => {

diff --git a/lambdas/account-delete-monitor/src/handlers/accountDeleteHandler.ts b/lambdas/account-delete-monitor/src/handlers/accountDeleteHandler.ts
@@ -1,11 +1,11 @@
 import { SQSRecord } from 'aws-lambda';
-import { client } from '../dynamodb';
+import { client } from '../dynamodb.ts';
 import { GetCommand, PutCommand } from '@aws-sdk/lib-dynamodb';
-import { config } from '../config';
+import { config } from '../config.ts';
 // import { expirationTimestamp } from '../utils';
-import { epochMsToIsoDate } from '../utils';
-import { DeleteRequestModel } from '../types';
-import { deleteUserMutationCaller } from '../externalCaller/deleteMutation';
+import { epochMsToIsoDate } from '../utils.ts';
+import { DeleteRequestModel } from '../types.ts';
+import { deleteUserMutationCaller } from '../externalCaller/deleteMutation.ts';
 
 /**
  * Store the account deletion request in DynamoDB for tracking, and to

diff --git a/lambdas/account-delete-monitor/src/handlers/accountMergeHandler.integration.ts b/lambdas/account-delete-monitor/src/handlers/accountMergeHandler.integration.ts
@@ -1,9 +1,9 @@
 import { SQSRecord } from 'aws-lambda';
-import { client, dynamo } from '../dynamodb';
+import { client, dynamo } from '../dynamodb.ts';
 import { GetCommand, PutCommand } from '@aws-sdk/lib-dynamodb';
-import { config } from '../config';
-import { accountMergeHandler } from './accountMergeHandler';
-import { truncateTable } from '../test/utils';
+import { config } from '../config.ts';
+import { accountMergeHandler } from './accountMergeHandler.ts';
+import { truncateTable } from '../test/utils.ts';
 
 describe('Account merge handler', () => {
   beforeEach(async () => {

diff --git a/lambdas/account-delete-monitor/src/handlers/accountMergeHandler.spec.ts b/lambdas/account-delete-monitor/src/handlers/accountMergeHandler.spec.ts
@@ -1,5 +1,5 @@
-import { client } from '../dynamodb';
-import { accountMergeHandler } from './accountMergeHandler';
+import { client } from '../dynamodb.ts';
+import { accountMergeHandler } from './accountMergeHandler.ts';
 import { type SQSRecord } from 'aws-lambda';
 
 describe('Account merge handler', () => {

diff --git a/lambdas/account-delete-monitor/src/handlers/accountMergeHandler.ts b/lambdas/account-delete-monitor/src/handlers/accountMergeHandler.ts
@@ -1,9 +1,9 @@
 import { SQSRecord } from 'aws-lambda';
-import { client } from '../dynamodb';
+import { client } from '../dynamodb.ts';
 import { UpdateCommand } from '@aws-sdk/lib-dynamodb';
-import { config } from '../config';
+import { config } from '../config.ts';
 // import { expirationTimestamp } from '../utils';
-import { UserMergeEvent } from '../types';
+import { UserMergeEvent } from '../types.ts';
 
 /**
  * Store records to identify history of merged accounts.

diff --git a/lambdas/account-delete-monitor/src/handlers/index.ts b/lambdas/account-delete-monitor/src/handlers/index.ts
@@ -1,6 +1,6 @@
 import { SQSRecord } from 'aws-lambda';
-import { accountDeleteHandler } from './accountDeleteHandler';
-import { accountMergeHandler } from './accountMergeHandler';
+import { accountDeleteHandler } from './accountDeleteHandler.ts';
+import { accountMergeHandler } from './accountMergeHandler.ts';
 
 export enum Event {
   ACCOUNT_DELETION = 'account-deletion',

diff --git a/lambdas/account-delete-monitor/src/index.spec.ts b/lambdas/account-delete-monitor/src/index.spec.ts
@@ -1,5 +1,5 @@
-import { Event, handlers } from './handlers';
-import { processor } from './index';
+import { Event, handlers } from './handlers/index.ts';
+import { processor } from './index.ts';
 import { type SQSEvent } from 'aws-lambda';
 import * as Sentry from '@sentry/aws-serverless';
 

diff --git a/lambdas/account-delete-monitor/src/index.ts b/lambdas/account-delete-monitor/src/index.ts
@@ -1,4 +1,4 @@
-import { config } from './config';
+import { config } from './config.ts';
 import * as Sentry from '@sentry/aws-serverless';
 Sentry.init({
   dsn: config.sentry.dsn,
@@ -12,7 +12,7 @@ import type {
   SQSBatchResponse,
   SQSBatchItemFailure,
 } from 'aws-lambda';
-import { handlers } from './handlers';
+import { handlers } from './handlers/index.ts';
 import { serverLogger } from '@pocket-tools/ts-logger';
 
 /**

diff --git a/lambdas/account-delete-monitor/src/utils.spec.ts b/lambdas/account-delete-monitor/src/utils.spec.ts
@@ -1,4 +1,4 @@
-import * as utils from './utils';
+import * as utils from './utils.ts';
 
 describe('util functions', () => {
   describe('epochMsToIsoDate', () => {