@cumulusds/aws-apig-bypass 0.2.0 → 0.2.2

package/.github/workflows/ci-cd.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Node ${{ matrix.node }}
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
       - name: Install NPM credentials
@@ -28,7 +28,8 @@ jobs:
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2.1.3
+      - name: Restore yarn cache
+        uses: actions/cache@v2
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -49,7 +50,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
         if: always()
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v2
         with:
           name: var
           path: var
@@ -62,7 +63,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Install Node 14
-        uses: actions/setup-node@v2.1.4
+        uses: actions/setup-node@v2
         with:
           node-version: 14
       - name: Install NPM credentials
@@ -72,7 +73,8 @@ jobs:
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2.1.3
+      - name: Restore yarn cache
+        uses: actions/cache@v2
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

package/lib/create-lambda-client.js

@@ -4,10 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = createLambdaClient;
+exports.LambdaInvokeError = void 0;
 
+class LambdaInvokeError extends Error {
+  constructor(response) {
+    var _response$FunctionErr;
+
+    super(["Invocation Failed", response.ExecutedVersion, response.StatusCode, response.FunctionError, response.Payload, response.LogResult != null ? Buffer.from(response.LogResult, "base64").toString("utf-8") : null].filter(x => x != null).join(": "));
+    this.code = (_response$FunctionErr = response.FunctionError) !== null && _response$FunctionErr !== void 0 ? _response$FunctionErr : "";
+  }
+
+}
 /**
  * AWS Lambda SDK adapter for createClient.
  */
+
+
+exports.LambdaInvokeError = LambdaInvokeError;
+
 function createLambdaClient({
   Lambda,
   FunctionName
@@ -18,10 +32,8 @@ function createLambdaClient({
       Payload
     }).promise();
 
-    if (invocationResponse.StatusCode !== 200) {
-      var _invocationResponse$S;
-
-      throw new Error(`AWS Lambda invocation API failed with status ${(_invocationResponse$S = invocationResponse.StatusCode) !== null && _invocationResponse$S !== void 0 ? _invocationResponse$S : "(no status code)"}`);
+    if (invocationResponse.StatusCode !== 200 || invocationResponse.FunctionError != null) {
+      throw new LambdaInvokeError(invocationResponse);
     }
 
     if (typeof invocationResponse.Payload !== "string") {

package/lib/create-lambda-client.js.flow

@@ -11,6 +11,53 @@ export type CreateLambdaClientOptions = {
   FunctionName: string
 };
 
+export type Lambda$InvocationResponse = {
+  /**
+   * The HTTP status code is in the 200 range for a successful request. For the RequestResponse invocation type, this status code is 200. For the Event invocation type, this status code is 202. For the DryRun invocation type, the status code is 204.
+   */
+  StatusCode?: number,
+
+  /**
+   * If present, indicates that an error occurred during function execution. Details about the error are included in the response payload.
+   */
+  FunctionError?: string,
+
+  /**
+   * The last 4 KB of the execution log, which is base64 encoded.
+   */
+  LogResult?: string,
+
+  /**
+   * The response from the function, or an error object.
+   */
+  Payload?: Buffer | Uint8Array | Blob | string,
+
+  /**
+   * The version of the function that executed. When you invoke a function with an alias, this indicates which version the alias resolved to.
+   */
+  ExecutedVersion?: string
+};
+
+export class LambdaInvokeError extends Error {
+  code: string;
+
+  constructor(response: Lambda$InvocationResponse) {
+    super(
+      [
+        "Invocation Failed",
+        response.ExecutedVersion,
+        response.StatusCode,
+        response.FunctionError,
+        response.Payload,
+        response.LogResult != null ? Buffer.from(response.LogResult, "base64").toString("utf-8") : null
+      ]
+        .filter(x => x != null)
+        .join(": ")
+    );
+    this.code = response.FunctionError ?? "";
+  }
+}
+
 /**
  * AWS Lambda SDK adapter for createClient.
  */
@@ -20,10 +67,8 @@ export default function createLambdaClient({ Lambda, FunctionName }: CreateLambd
       FunctionName,
       Payload
     }).promise();
-    if (invocationResponse.StatusCode !== 200) {
-      throw new Error(
-        `AWS Lambda invocation API failed with status ${invocationResponse.StatusCode ?? "(no status code)"}`
-      );
+    if (invocationResponse.StatusCode !== 200 || invocationResponse.FunctionError != null) {
+      throw new LambdaInvokeError(invocationResponse);
     }
     if (typeof invocationResponse.Payload !== "string") {
       throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cumulusds/aws-apig-bypass",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Client for API Gateway handlers, bypassing API Gateway by directly invoking the Lambda",
   "repository": "https://github.com/CumulusDS/aws-apig-bypass",
   "author": "Cumulus Digital Systems",
@@ -52,10 +52,7 @@
       }
     }
   },
-  "dependencies": {
-    "@cumulusds/flow-aws-sdk": "^2.818.0",
-    "flow-aws-lambda": "CumulusDS/flow-aws-lambda#ef1bd9a0342e55a0e9e1b225bdbc2a3c2a4d5632"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.7.4",
@@ -63,6 +60,7 @@
     "@babel/plugin-proposal-optional-chaining": "^7.12.7",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
+    "@cumulusds/flow-aws-sdk": "^2.818.0",
     "babel-eslint": "10.0.3",
     "babel-jest": "^24.9.0",
     "eslint": "^7.5.0",
@@ -72,6 +70,7 @@
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-jest": "^21.15.1",
     "eslint-plugin-prettier": "^2.6.0",
+    "flow-aws-lambda": "^1.0.6",
     "flow-bin": "^0.141.0",
     "flow-copy-source": "^2.0.9",
     "flow-coverage-report": "^0.8.0",

package/src/create-lambda-client.js

@@ -11,6 +11,53 @@ export type CreateLambdaClientOptions = {
   FunctionName: string
 };
 
+export type Lambda$InvocationResponse = {
+  /**
+   * The HTTP status code is in the 200 range for a successful request. For the RequestResponse invocation type, this status code is 200. For the Event invocation type, this status code is 202. For the DryRun invocation type, the status code is 204.
+   */
+  StatusCode?: number,
+
+  /**
+   * If present, indicates that an error occurred during function execution. Details about the error are included in the response payload.
+   */
+  FunctionError?: string,
+
+  /**
+   * The last 4 KB of the execution log, which is base64 encoded.
+   */
+  LogResult?: string,
+
+  /**
+   * The response from the function, or an error object.
+   */
+  Payload?: Buffer | Uint8Array | Blob | string,
+
+  /**
+   * The version of the function that executed. When you invoke a function with an alias, this indicates which version the alias resolved to.
+   */
+  ExecutedVersion?: string
+};
+
+export class LambdaInvokeError extends Error {
+  code: string;
+
+  constructor(response: Lambda$InvocationResponse) {
+    super(
+      [
+        "Invocation Failed",
+        response.ExecutedVersion,
+        response.StatusCode,
+        response.FunctionError,
+        response.Payload,
+        response.LogResult != null ? Buffer.from(response.LogResult, "base64").toString("utf-8") : null
+      ]
+        .filter(x => x != null)
+        .join(": ")
+    );
+    this.code = response.FunctionError ?? "";
+  }
+}
+
 /**
  * AWS Lambda SDK adapter for createClient.
  */
@@ -20,10 +67,8 @@ export default function createLambdaClient({ Lambda, FunctionName }: CreateLambd
       FunctionName,
       Payload
     }).promise();
-    if (invocationResponse.StatusCode !== 200) {
-      throw new Error(
-        `AWS Lambda invocation API failed with status ${invocationResponse.StatusCode ?? "(no status code)"}`
-      );
+    if (invocationResponse.StatusCode !== 200 || invocationResponse.FunctionError != null) {
+      throw new LambdaInvokeError(invocationResponse);
     }
     if (typeof invocationResponse.Payload !== "string") {
       throw new Error(

package/test/unit/index.test.js

@@ -5,6 +5,7 @@ import type { AWSError } from "@cumulusds/flow-aws-sdk/lib/error";
 import type { Request } from "@cumulusds/flow-aws-sdk/lib/request";
 import type { APIGatewayHandlerClient } from "../../src/create-client";
 import { createAPIGatewayEvent, createClient } from "../../src";
+import { LambdaInvokeError } from "../../src/create-lambda-client";
 
 type ClientPayload = {};
 
@@ -13,8 +14,9 @@ describe("createClient", () => {
   const data = { hello: "world" };
   const body = JSON.stringify(data);
 
-  function createLambdaClient({ StatusCode, Payload = JSON.stringify({ statusCode: 200, body }) }) {
-    const resolvedValue: Lambda$InvocationResponse = { StatusCode, Payload };
+  function createLambdaClient({ StatusCode, Payload = JSON.stringify({ statusCode: 200, body }), LogResult = null }) {
+    // $FlowFixMe
+    const resolvedValue: Lambda$InvocationResponse = { StatusCode, Payload, LogResult };
 
     // $FlowFixMe[incompatible-type] complete Response class is not required.
     const request: Request<Lambda$InvocationResponse, AWSError> = {
@@ -91,7 +93,7 @@ describe("createClient", () => {
     });
 
     it("is unsuccessful with AWS Lambda API StatusCode 500", () => {
-      const { Lambda } = createLambdaClient({ StatusCode: 500 });
+      const { Lambda } = createLambdaClient({ StatusCode: 500, LogResult: "Ym9ya2Vu" });
       const client = createClient<ClientPayload>({
         Lambda,
         FunctionName
@@ -102,7 +104,13 @@ describe("createClient", () => {
           jointIdentifierId: "1234"
         }
       });
-      return expect(client(request)).rejects.toEqual(new Error("AWS Lambda invocation API failed with status 500"));
+      return expect(client(request)).rejects.toEqual(
+        new LambdaInvokeError({
+          StatusCode: 500,
+          LogResult: "Ym9ya2Vu",
+          Payload: JSON.stringify({ statusCode: 200, body })
+        })
+      );
     });
 
     it("is unsuccessful with undefined StatusCode", () => {
@@ -118,7 +126,7 @@ describe("createClient", () => {
         }
       });
       return expect(client(request)).rejects.toEqual(
-        new Error("AWS Lambda invocation API failed with status (no status code)")
+        new LambdaInvokeError({ Payload: JSON.stringify({ statusCode: 200, body }) })
       );
     });