chore(deps): update dependencies (#250)

* feat(deps): update dependencies

* terraform-docs: automated action

* migrate jest to bun test runner

* format

* terraform-docs: automated action

* fix

* fix deps

* terraform-docs: automated action

* fix prettier

* fix only

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: danadajian <danadajian@gmail.com>

Author: 3 people

.prettierignore

@@ -1,2 +1,3 @@
 build/
 node_modules/
+USAGE.md

.terraform-version

@@ -1 +1 @@
-1.13.3
+1.13.4

CONTRIBUTING.md

@@ -20,7 +20,7 @@ where "my-new-feature" describes what you're working on.
 
 ### 3. Add tests for any bug fixes or new functionality
 
-All functions must be tested with a unit test. Please follow the existing convention of one exported function per file with a corresponding file to test it. Run tests using `yarn test`, or using the [Jest CLI](https://jestjs.io/docs/cli).
+All functions must be tested with a unit test. Please follow the existing convention of one exported function per file with a corresponding file to test it. Run tests using `bun test`.
 
 There is also an integration test present in the [test workflow](./.github/workflows/test.yaml), which will actually run this Github Action using the code from this repository. This allows you to test your change to the Github Action right within the pull request you make.
 

USAGE.md

@@ -3,7 +3,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.13.3 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.13.4 |
 
 ## Providers
 

bun.lock

@@ -12,20 +12,19 @@ limitations under the License.
 */
 
 import { handler } from "./proxy";
-import axios, { AxiosRequestHeaders, AxiosResponse } from "axios";
+import type { AxiosRequestHeaders, AxiosResponse } from "axios";
 import { readFileSync } from "fs";
 import { Agent } from "https";
-import { readFileFromLayer } from "./file-readers";
 import { APIGatewayProxyWithLambdaAuthorizerEvent } from "aws-lambda";
 import { VALID_PING_EVENT } from "../fixtures/valid-ping-payload";
 import { VALID_PUSH_PAYLOAD } from "../fixtures/valid-push-payload";
 import { VALID_PUSH_PAYLOAD_USER_REPO } from "../fixtures/valid-push-payload-user-repo";
+import { afterEach, beforeEach, describe, expect, it, mock } from "bun:test";
+
 const urlencodedPayload = readFileSync(
   "fixtures/invalid-payload-urlencoded.txt",
 ).toString();
 
-jest.mock("axios");
-jest.mock("./file-readers");
 const axiosResponse: AxiosResponse = {
   status: 200,
   data: {
@@ -39,7 +38,26 @@ const axiosResponse: AxiosResponse = {
     headers: {} as AxiosRequestHeaders,
   },
 };
-(axios.post as jest.Mock).mockResolvedValue(axiosResponse);
+const axiosPostMock = mock(() => axiosResponse);
+mock.module("axios", () => ({
+  default: {
+    post: axiosPostMock,
+  },
+}));
+
+const fileMap: Record<string, string> = {
+  "allowed-destination-hosts.json": JSON.stringify([
+    "approved.host",
+    "another.approved.host",
+    "a.wildcard.*.host",
+  ]),
+};
+const readFileFromLayerMock = mock((fileName: string) => fileMap[fileName]);
+mock.module("./file-readers", () => ({
+  readFileFromLayer: readFileFromLayerMock,
+  getPublicCerts: mock(),
+}));
+
 const expectedResponseObject = {
   statusCode: 200,
   body: '{"some":"data"}',
@@ -66,23 +84,17 @@ const baseEvent: APIGatewayProxyWithLambdaAuthorizerEvent<any> = {
   requestContext: {} as any,
   resource: "",
 };
-const fileMap: Record<string, string> = {
-  "allowed-destination-hosts.json": JSON.stringify([
-    "approved.host",
-    "another.approved.host",
-    "a.wildcard.*.host",
-  ]),
-};
-(readFileFromLayer as jest.Mock).mockImplementation(
-  (fileName: string) => fileMap[fileName],
-);
 
 describe("proxy", () => {
   beforeEach(() => {
     process.env.ENTERPRISE_SLUG = "some_enterprise";
     process.env.ENTERPRISE_MANAGED_USER_SUFFIX = "";
   });
 
+  afterEach(() => {
+    mock.clearAllMocks();
+  });
+
   it("should reject a request with an invalid urlencoded payload", async () => {
     const event: APIGatewayProxyWithLambdaAuthorizerEvent<any> = {
       ...baseEvent,
@@ -94,7 +106,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual({ statusCode: 403, body: "Access denied" });
-    expect(axios.post).not.toHaveBeenCalled();
+    expect(axiosPostMock).not.toHaveBeenCalled();
   });
 
   it("should reject a request with an endpointId which is not an encoded URL", async () => {
@@ -106,7 +118,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual({ statusCode: 403, body: "Access denied" });
-    expect(axios.post).not.toHaveBeenCalled();
+    expect(axiosPostMock).not.toHaveBeenCalled();
   });
 
   it("should allow a request from a managed user suffix when supplied", async () => {
@@ -122,7 +134,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual(expectedResponseObject);
-    expect(axios.post).toHaveBeenCalled();
+    expect(axiosPostMock).toHaveBeenCalled();
   });
 
   it("should forward a request when header is Content-Type", async () => {
@@ -142,7 +154,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual(expectedResponseObject);
-    expect(axios.post).toHaveBeenCalled();
+    expect(axiosPostMock).toHaveBeenCalled();
   });
 
   it("should not forward a request that does not come from an enterprise or managed user suffix", async () => {
@@ -161,7 +173,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual({ statusCode: 403, body: "Access denied" });
-    expect(axios.post).not.toHaveBeenCalled();
+    expect(axiosPostMock).not.toHaveBeenCalled();
   });
 
   it("should not forward a request that does not have an approved host", async () => {
@@ -175,7 +187,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual({ statusCode: 403, body: "Access denied" });
-    expect(axios.post).not.toHaveBeenCalled();
+    expect(axiosPostMock).not.toHaveBeenCalled();
   });
 
   it("should forward a request that has an approved host which matches a wildcard", async () => {
@@ -201,7 +213,7 @@ describe("proxy", () => {
       },
     };
     const result = await handler(event);
-    expect(axios.post).toHaveBeenCalledWith(
+    expect(axiosPostMock).toHaveBeenCalledWith(
       destinationUrl,
       stringifiedPayload,
       {
@@ -220,7 +232,7 @@ describe("proxy", () => {
       "ca.pem": "some ca",
       "cert.pem": "some cert",
     };
-    (readFileFromLayer as jest.Mock).mockImplementation(
+    readFileFromLayerMock.mockImplementation(
       (fileName: string) => newFileMap[fileName],
     );
     const destinationUrl = "https://approved.host/github-webhook/";
@@ -232,7 +244,7 @@ describe("proxy", () => {
       },
     };
     const result = await handler(event);
-    expect(axios.post).toHaveBeenCalledWith(
+    expect(axiosPostMock).toHaveBeenCalledWith(
       destinationUrl,
       stringifiedPayload,
       {
@@ -253,7 +265,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual({ statusCode: 404, body: "Not found" });
-    expect(axios.post).not.toHaveBeenCalled();
+    expect(axiosPostMock).not.toHaveBeenCalled();
   });
 
   it("should forward a ping event from a managed user suffix when supplied", async () => {
@@ -269,7 +281,7 @@ describe("proxy", () => {
     };
     const result = await handler(event);
     expect(result).toEqual(expectedResponseObject);
-    expect(axios.post).toHaveBeenCalled();
+    expect(axiosPostMock).toHaveBeenCalled();
   });
 
   it("should return error response from axios", async () => {
@@ -286,9 +298,7 @@ describe("proxy", () => {
         headers: {} as AxiosRequestHeaders,
       },
     };
-    (axios.post as jest.Mock).mockRejectedValue({
-      response: axiosErrorResponse,
-    });
+    axiosPostMock.mockImplementationOnce(() => axiosErrorResponse);
 
     process.env.ENTERPRISE_MANAGED_USER_SUFFIX = "suffix";
     const destinationUrl = "https://approved.host/github-webhook/";
@@ -306,6 +316,6 @@ describe("proxy", () => {
       body: '{"some":"error"}',
       headers: { response: "headers" },
     });
-    expect(axios.post).toHaveBeenCalled();
+    expect(axiosPostMock).toHaveBeenCalled();
   });
 });

bun.lockb

@@ -17,7 +17,6 @@ import { requestPayloadIsValid } from "./request-payload-is-valid";
 import { destinationHostIsAllowed } from "./destination-host-is-allowed";
 import { getHttpsAgent } from "./get-https-agent";
 import { parseRequestBody } from "./parse-request-body";
-import { EnterpriseProxyEvent } from "./types";
 import { urlIsValid } from "./url-is-valid";
 import { axiosErrorSchema } from "./schema";