feat: lambda proxy integration

Author: sam

.projen/deps.json

@@ -75,7 +75,12 @@ const project = new CustomTypescriptProject({
   bin: {
     functionless: "./bin/functionless.js",
   },
-  deps: ["fs-extra", "minimatch", "@functionless/nodejs-closure-serializer"],
+  deps: [
+    "@types/aws-lambda",
+    "fs-extra",
+    "minimatch",
+    "@functionless/nodejs-closure-serializer",
+  ],
   devDeps: [
     `@aws-cdk/aws-appsync-alpha@${MIN_CDK_VERSION}-alpha.0`,
     "@types/fs-extra",

.projenrc.js

@@ -3,4 +3,7 @@ const { tsc } = require("../lib/tsc");
 
 (async function () {
   await tsc(path.join(__dirname, "..", "test-app"));
-})().catch((err) => process.exit(1));
+})().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

package.json

@@ -1,7 +1,7 @@
 import { aws_apigateway } from "aws-cdk-lib";
+import { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
 import { Construct } from "constructs";
-import { isParameterDecl } from ".";
-import { FunctionDecl, isFunctionDecl } from "./declaration";
+import { FunctionDecl, isFunctionDecl, isParameterDecl } from "./declaration";
 import { isErr } from "./error";
 import {
   Identifier,
@@ -20,6 +20,7 @@ import {
   ObjectLiteralExpr,
   PropAccessExpr,
 } from "./expression";
+import { Function } from "./function";
 import { findIntegration, IntegrationImpl } from "./integration";
 import { FunctionlessNode } from "./node";
 import { isReturnStmt, isVariableStmt, ReturnStmt } from "./statement";
@@ -83,7 +84,7 @@ export abstract class BaseApiIntegration {
    */
   public abstract addMethod(
     httpMethod: HttpMethod,
-    resource: aws_apigateway.Resource
+    resource: aws_apigateway.IResource
   ): aws_apigateway.Method;
 }
 
@@ -225,7 +226,7 @@ export interface AwsApiIntegrationProps<
  * @see https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-api-integration-types.html
  */
 export class AwsApiIntegration<
-  Request,
+  Request extends ApiRequest<any, any, any, any>,
   IntegrationResponse,
   MethodResponse
 > extends BaseApiIntegration {
@@ -553,3 +554,36 @@ export interface ApiGatewayVtlIntegration {
     responses: aws_apigateway.IntegrationResponse[]
   ) => aws_apigateway.Integration;
 }
+
+export interface LambdaProxyApiIntegrationProps
+  extends Omit<
+    aws_apigateway.LambdaIntegrationOptions,
+    | "requestParameters"
+    | "requestTemplates"
+    | "integrationResponses"
+    | "passthroughBehavior"
+    | "proxy"
+  > {
+  function: Function<APIGatewayProxyEvent, APIGatewayProxyResult>;
+}
+
+export class LambdaProxyApiIntegration extends BaseApiIntegration {
+  readonly function;
+  constructor(private readonly props: LambdaProxyApiIntegrationProps) {
+    super();
+    this.function = props.function;
+  }
+
+  public addMethod(
+    httpMethod: HttpMethod,
+    resource: aws_apigateway.IResource
+  ): aws_apigateway.Method {
+    return resource.addMethod(
+      httpMethod,
+      new aws_apigateway.LambdaIntegration(this.function.resource, {
+        ...this.props,
+        proxy: true,
+      })
+    );
+  }
+}

scripts/compile-test-app.js

@@ -241,8 +241,9 @@ export class Function<P, O> extends FunctionBase<P, O> {
    * To correctly resolve these for CDK synthesis, either use `asyncSynth()` or use `cdk synth` in the CDK cli.
    * https://twitter.com/samgoodwin89/status/1516887131108438016?s=20&t=7GRGOQ1Bp0h_cPsJgFk3Ww
    */
-  public static readonly promises = ((global as any)[PromisesSymbol] =
-    (global as any)[PromisesSymbol] ?? []);
+  public static readonly promises: Promise<any>[] = ((global as any)[
+    PromisesSymbol
+  ] = (global as any)[PromisesSymbol] ?? []);
 
   /**
    * Wrap a {@link aws_lambda.Function} with Functionless.

src/api.ts

@@ -31,7 +31,7 @@ export async function tsc(
   projectRoot: string = process.cwd(),
   props?: TscProps
 ) {
-  const tsConfigPath = path.join(projectRoot, "tsconfig.json");
+  const tsConfigPath = path.join(projectRoot, "tsconfig.dev.json");
   let tsConfig: {
     include: string[];
     exclude?: string[];

src/function.ts

@@ -1614,6 +1614,11 @@
   resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.93.tgz#3e2c80894122477040aabf29b7320556f5702a76"
   integrity sha512-Vsyi9ogDAY3REZDjYnXMRJJa62SDvxHXxJI5nGDQdZW058dDE+av/anynN2rLKbCKXDRNw3D/sQmqxVflZFi4A==
 
+"@types/aws-lambda@^8.10.98":
+  version "8.10.98"
+  resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.98.tgz#2936975c19529011b8b5c08850d42157711c690d"
+  integrity sha512-dJ/R9qamtI2nNpxhNwPBTwsfYwbcCWsYBJxhpgGyMLCD0HxKpORcMpPpSrFP/FIceNEYfnS3R5EfjSZJmX2oJg==
+
 "@types/js-yaml@^4.0.0":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138"
@@ -2695,6 +2700,7 @@ function.prototype.name@^1.1.5:
   version "0.0.0"
   dependencies:
     "@functionless/nodejs-closure-serializer" "^0.0.2"
+    "@types/aws-lambda" "^8.10.98"
     fs-extra "^10.1.0"
     minimatch "^5.1.0"
 

src/tsc.ts

@@ -1,6 +1,12 @@
 import { aws_apigateway } from "aws-cdk-lib";
+import { APIGatewayProxyEvent, APIGatewayProxyResult } from "aws-lambda";
 import axios from "axios";
-import { MockApiIntegration } from "../src";
+import {
+  AwsApiIntegration,
+  Function,
+  LambdaProxyApiIntegration,
+  MockApiIntegration,
+} from "../src";
 import { localstackTestSuite } from "./localstack";
 
 localstackTestSuite("apiGatewayStack", (test, stack) => {
@@ -40,4 +46,76 @@ localstackTestSuite("apiGatewayStack", (test, stack) => {
       });
     }
   );
+
+  test.skip(
+    "lambda function integration",
+    () => {
+      const api = new aws_apigateway.RestApi(stack, "LambdaAPI");
+      const func = new Function(stack, "Func", async (_input: any) => {
+        return { key: "hello" };
+      });
+
+      new AwsApiIntegration({
+        request: (req: {
+          pathParameters: {
+            code: number;
+          };
+        }) =>
+          func({
+            input: req.pathParameters.code,
+          }),
+        response: (result) => ({
+          result: result.key,
+        }),
+      }).addMethod("GET", api.root);
+
+      return {
+        outputs: {
+          endpoint: api.url,
+        },
+      };
+    },
+    async (context) => {
+      const response = await axios.get(context.endpoint);
+      expect(response.data).toEqual({ result: "hello" });
+    }
+  );
+
+  test(
+    "lambda proxy integration",
+    () => {
+      const api = new aws_apigateway.RestApi(stack, "LambdaAPI");
+      const func = new Function<APIGatewayProxyEvent, APIGatewayProxyResult>(
+        stack,
+        "Func",
+        async (request) => {
+          return {
+            statusCode: 200,
+            body: JSON.stringify({
+              hello: "world",
+              path: request.path,
+            }),
+          };
+        }
+      );
+
+      new LambdaProxyApiIntegration({
+        function: func,
+      }).addMethod("GET", api.root);
+
+      return {
+        outputs: {
+          endpoint: api.url,
+        },
+      };
+    },
+    async (context) => {
+      const response = await axios.get(context.endpoint);
+      expect(response.status).toEqual(200);
+      expect(response.data).toMatchObject({
+        hello: "world",
+        path: "/",
+      });
+    }
+  );
 });

test-app/yarn.lock

@@ -6,6 +6,7 @@ import { CloudFormationDeployments } from "aws-cdk/lib/api/cloudformation-deploy
 import { CloudFormation } from "aws-sdk";
 import { Construct } from "constructs";
 import { asyncSynth } from "../src/async-synth";
+import { Function } from "../src/function";
 
 export const clientConfig = {
   endpoint: "http://localhost:4566",
@@ -44,10 +45,11 @@ export const deployStack = async (app: App, stack: Stack) => {
     sdkProvider,
   });
 
+  const stackArtifact = cloudAssembly.getStackArtifact(
+    stack.artifactId
+  ) as unknown as cxapi.CloudFormationStackArtifact;
   await cfn.deployStack({
-    stack: cloudAssembly.getStackArtifact(
-      stack.artifactId
-    ) as unknown as cxapi.CloudFormationStackArtifact,
+    stack: stackArtifact,
     force: true,
   });
 };
@@ -125,6 +127,8 @@ export const localstackTestSuite = (
       return {};
     });
 
+    await Promise.all(Function.promises);
+
     await deployStack(app, stack);
 
     stackOutputs = (