Merge pull request #62 from lifeomic/fixLambdaHandler

fix: lambda-handler flag wasn't working

package.json

@@ -23,13 +23,14 @@
     "clean": "yarn tsc --build --clean; rm -rf tsconfig.build.tsbuildinfo tsconfig.tsbuildinfo"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.110.0",
+    "@aws-sdk/types": "^3.370.0",
     "@koa/router": "^12.0.0",
     "@lifeomic/eslint-config-standards": "^3.0.0",
     "@lifeomic/jest-config": "^1.1.3",
     "@lifeomic/typescript-config": "^1.0.3",
     "@swc/core": "^1.2.207",
     "@swc/jest": "^0.2.21",
+    "@types/aws-lambda": "^8.10.119",
     "@types/glob": "^7.2.0",
     "@types/jest": "^28.1.3",
     "@types/js-yaml": "^4.0.5",
@@ -51,8 +52,8 @@
     "ulid": "^2.3.0"
   },
   "dependencies": {
-    "@aws-sdk/client-sts": "^3.121.0",
-    "@lifeomic/alpha": "^5.1.0",
+    "@aws-sdk/client-sts": "^3.370.0",
+    "@lifeomic/alpha": "^5.1.3",
     "axios": "^0.27.2",
     "dotenv": "^16.0.2",
     "glob": "^8.0.3",

src/alphaProxy.ts

@@ -10,7 +10,7 @@ export const alphaProxy = (baseConfig: AlphaCliConfig) => {
     const requestConfig: AlphaCliConfig = {
       ...baseConfig,
       method: method as AlphaCliConfig['method'],
-      url: `${baseConfig.url as string}${url as string}`,
+      url: `${baseConfig.url ?? ''}${url as string}`,
       headers: {
         ...baseConfig.headers,
         ...req.headers as Record<string, string>,

src/plugins/lambda-handler.ts

@@ -44,7 +44,7 @@ export default (yargs: Argv) => {
         await loadEnvFile(envFile);
       }
       const exported = await import(lambdaHandler);
-      config.lambda = exported.handler || exported.default.handler;
+      config.handler = exported.handler || exported.default.handler;
     }
   };
 };

src/types.ts

@@ -1,9 +1,11 @@
+import { Handler } from 'aws-lambda';
 import { AlphaOptions, AlphaResponse } from '@lifeomic/alpha';
 
 export interface AlphaCliConfig extends AlphaOptions<string> {
   responsePostProcessors: ((data: AlphaResponse<string>) => AlphaResponse<string>)[];
   proxied?: boolean;
   proxyPort?: number;
+  handler?: Handler;
 }
 
 export interface AlphaCliArguments {

src/utils.ts

@@ -1,8 +1,8 @@
 import { AlphaCliConfig } from './types';
 import { Alpha } from '@lifeomic/alpha';
 
-export const callAlpha = async (config: AlphaCliConfig) => {
-  const client = new Alpha();
+export const callAlpha = async ({ handler, ...config }: AlphaCliConfig) => {
+  const client = handler ? new Alpha(handler) : new Alpha();
   const response = await client.request<string>(config);
 
   const processedResponse = config.responsePostProcessors.reduce((reduce, processor) => {

test/lambdaHandlers/exportApp.ts

@@ -11,9 +11,7 @@ router.get('/echo/:param', (ctx) => {
   ctx.status = 200;
 });
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 app.use(router.routes());
-// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 app.use(router.allowedMethods());
 
 app.handler = serverless(app);

test/lambdaHandlers/exportHandler.ts

@@ -1,19 +1,2 @@
-import Koa from 'koa';
-import Router from '@koa/router';
-import serverless from 'serverless-http';
-
-const app = new Koa();
-
-const router = new Router();
-
-router.get('/echo/:param', (ctx) => {
-  ctx.body = ctx.params.param;
-  ctx.status = 200;
-});
-
-// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-app.use(router.routes());
-// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-app.use(router.allowedMethods());
-
-export const handler = serverless(app);
+import app from './exportApp';
+export const handler = app.handler;

test/plugins/lambda-handler.test.ts

@@ -27,7 +27,7 @@ test.each([
     'lambda-handler': path.join(__dirname, '..', 'lambdaHandlers', lambdaHandlerFile),
   };
   await expect(pluginFunc(config, cliArgs)).resolves.toBeUndefined();
-  expect(config).toHaveProperty('lambda', expect.any(Function));
+  expect(config).toHaveProperty('handler', expect.any(Function));
 });
 
 test('will throw exception on unknown extension', async () => {

test/sign-request.test.ts

@@ -1,5 +1,5 @@
 import yargs from 'yargs';
-import { Credentials, Provider } from '@aws-sdk/types';
+import { AwsCredentialIdentity, Provider } from '@aws-sdk/types';
 import { AssumeRoleCommand, STSClient } from '@aws-sdk/client-sts';
 import { mockClient } from 'aws-sdk-client-mock';
 
@@ -18,7 +18,7 @@ const getConfig = async (...args: string[]) => {
 
 const mockSts = mockClient(STSClient);
 
-const expectedCreds: Credentials = {
+const expectedCreds: AwsCredentialIdentity = {
   accessKeyId: randomUUID(),
   secretAccessKey: randomUUID(),
   sessionToken: randomUUID(),
@@ -53,7 +53,7 @@ test('will set up using sts to assume a role', async () => {
   const role = 'some-stinky-role';
   const config = await getConfig('--sign', '--role', role);
   expect(config).toHaveProperty('signAwsV4', { credentials: expect.any(Function) });
-  const { credentials } = config.signAwsV4 as { credentials: Provider<Credentials>; };
+  const { credentials } = config.signAwsV4 as { credentials: Provider<AwsCredentialIdentity>; };
 
   await expect(credentials()).resolves.toEqual(expectedCreds);
   expect(mockSts.commandCalls(AssumeRoleCommand)).toHaveLength(1);
@@ -68,7 +68,7 @@ test('will throw exception if Credentials is empty', async () => {
   const role = 'some-stinky-role';
   const config = await getConfig('--sign', '--role', role);
   expect(config).toHaveProperty('signAwsV4', { credentials: expect.any(Function) });
-  const { credentials } = config.signAwsV4 as { credentials: Provider<Credentials>; };
+  const { credentials } = config.signAwsV4 as { credentials: Provider<AwsCredentialIdentity>; };
 
   await expect(credentials()).rejects.toThrowError(`Unable to assume role ${role}`);
 });

tsconfig.build.json

@@ -3,9 +3,7 @@
   "compilerOptions": {
     "noEmit": false
   },
-  "exclude": [
-    "*.js",
-    "*.ts",
-    "test/**"
+  "include": [
+    "src/"
   ]
 }