Upgrade some dependencies, remove lambda-git

kachkaev · kachkaev · commit 30d8fa95bfaa · 2021-11-17T09:23:11.000Z
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile
@@ -36,11 +36,11 @@ jobs:
         node: [12, 14, 16]
         exclude:
           - os: macos-latest
-            node: 14
+            node: 12
           - os: macos-latest
             node: 16
           - os: windows-latest
-            node: 14
+            node: 12
           - os: windows-latest
             node: 16
     steps:
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-.cache
 .env
+.parcel-cache
 coverage
 junit.xml
 lambda.zip
diff --git a/.markdownlintignore b/.markdownlintignore
@@ -4,8 +4,8 @@ LICENSE
 !*.md
 
 ## same as in .gitignore
-.cache
 .env
+.parcel-cache
 coverage
 junit.xml
 lambda.zip
diff --git a/.prettierignore b/.prettierignore
@@ -11,8 +11,8 @@ LICENSE
 !/.github/
 
 ## same as in .gitignore
-.cache
 .env
+.parcel-cache
 coverage
 junit.xml
 lambda.zip
diff --git a/README.md b/README.md
@@ -60,9 +60,11 @@ See [src/config.ts](src/config.ts) for the list of options.
     See [official documentation](https://docs.aws.amazon.com/lambda/latest/dg/getting-started-create-function.html).
     You should end up on the function’s configuration page at the end of this step.
 
-1.  **Upload function code and configure its execution**  
-    Press _Upload_ in the _Function code_ block and select a copy of `lambda.zip` on you computer.
-    Set _Runtime_ to _Node 12.x_ and _Basic settings_ → _Timeout_ to _15 sec_.
+1.  **Upload function code and configure its execution**
+
+    - Press _Upload_ in the _Function code_ block and select a copy of `lambda.zip` on you computer.
+    - Set _Runtime_ to _Node 14.x_ and _Basic settings_ → _Timeout_ to _15 sec_.
+    - Press _Add a layer_ and provide ARN from [git-lambda-layer](https://github.com/lambci/git-lambda-layer) repo (e.g. `arn:aws:lambda:us-east-1:553035198032:layer:git-lambda2:8` if your function is in `us-east-1` region and you want to use git `2.29.0`).
 
 1.  **Set environment variables**  
     It is necessary to set at least two environment variables, otherwise the function will not succeed.
diff --git a/jest.config.js b/jest.config.js
@@ -14,4 +14,6 @@ module.exports = {
   reporters: REPORT_TEST_RESULTS_AND_COVERAGE
     ? ["default", ["jest-junit", { suiteNameTemplate: "{filepath}" }]]
     : ["default"],
+
+  transformIgnorePatterns: ["node_modules/(?!(weak-lru-cache|ordered-binary))"],
 };
diff --git a/package.json b/package.json
@@ -15,44 +15,40 @@
     "simulate": "ts-node src/simulate.ts",
     "test": "jest"
   },
-  "resolutions": {
-    "node-forge": ">=0.10.0"
-  },
   "dependencies": {
     "@kachkaev/commands": "^0.1.1",
-    "envalid": "^6.0.2",
+    "dotenv": "^10.0.0",
+    "envalid": "^7.2.2",
     "execa": "^5.1.1",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.0.0",
     "jszip": "^3.7.1",
-    "lambda-git": "^0.1.3",
-    "luxon": "^1.28.0"
+    "luxon": "^2.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-typescript": "^7.15.0",
+    "@babel/core": "^7.16.0",
+    "@babel/preset-env": "^7.16.4",
+    "@babel/preset-typescript": "^7.16.0",
     "@kachkaev/markdownlint-config": "^0.2.0",
     "@kachkaev/prettier-config": "^1.2.0",
-    "@types/aws-lambda": "^8.10.82",
-    "@types/fs-extra": "^9.0.12",
-    "@types/jest": "^27.0.1",
+    "@types/aws-lambda": "^8.10.85",
+    "@types/fs-extra": "^9.0.13",
+    "@types/jest": "^27.0.2",
     "@types/jszip": "^3.4.1",
-    "@types/luxon": "^1.27.1",
-    "@types/node": "^14.17.9",
-    "@types/parcel-bundler": "^1.12.4",
-    "jest": "^27.0.6",
-    "jest-junit": "^12.2.0",
-    "markdownlint-cli": "^0.28.1",
+    "@types/luxon": "^2.0.7",
+    "@types/node": "^14.17.33",
+    "jest": "^27.3.1",
+    "jest-junit": "^13.0.0",
+    "markdownlint-cli": "^0.29.0",
     "npm-run-all": "^4.1.5",
-    "parcel-bundler": "^1.12.5",
+    "parcel": "^2.0.1",
     "prettier": "~2.2.1",
-    "prettier-plugin-packagejson": "^2.2.11",
-    "ts-node": "^9.1.1",
-    "typescript": "^4.3.5",
+    "prettier-plugin-packagejson": "^2.2.15",
+    "ts-node": "^10.4.0",
+    "typescript": "^4.4.4",
     "yarn-deduplicate": "^3.1.0"
   },
   "engines": {
-    "node": ">=10.21.0",
-    "yarn": ">=1.21.1"
+    "node": ">=12.21.0",
+    "yarn": ">=1.22.0"
   }
 }
diff --git a/src/build.test.ts b/src/build.test.ts
@@ -19,7 +19,6 @@ describe("build", () => {
     expect(await fs.pathExists(resultingArchive)).toBe(true);
     const zip = await JSZip.loadAsync(await fs.readFile(resultingArchive));
     expect(Object.keys(zip.files)).toEqual([
-      "git-2.4.3.tar",
       "index.js",
       "CHANGELOG.md",
       "LICENSE",
diff --git a/src/build.ts b/src/build.ts
@@ -1,52 +1,49 @@
-import envalid from "envalid";
+import * as envalid from "envalid";
 import fs from "fs-extra";
-import Bundler from "parcel-bundler";
+import Parcel from "@parcel/core";
 import path from "path";
 import JSZip from "jszip";
 import { autoStartCommandIfNeeded } from "@kachkaev/commands";
+import dotenv from "dotenv";
 
 import { generateUniqueTempDirPath } from "./helpers";
 
 const build = async () => {
-  const { BUILD_OUTPUT } = envalid.cleanEnv(
-    process.env,
-    {
-      BUILD_OUTPUT: envalid.str({
-        desc: "Location of the zip archive to produce",
-        default: "lambda.zip",
-      }),
-    },
-    {
-      ...(process.env.NODE_ENV === "test" && { dotEnvPath: null }),
-    },
-  );
+  if (process.env.NODE_ENV !== "test") {
+    dotenv.config();
+  }
+  const { BUILD_OUTPUT } = envalid.cleanEnv(process.env, {
+    BUILD_OUTPUT: envalid.str({
+      desc: "Location of the zip archive to produce",
+      default: "lambda.zip",
+    }),
+  });
 
   const buildOutDir = generateUniqueTempDirPath("build");
 
   // Produce compiled JavaScript handle
-  const bundler = new Bundler(path.resolve(__dirname, "handler.ts"), {
-    bundleNodeModules: true,
-    global: "handler",
-    logLevel: 1,
-    minify: true,
-    outDir: buildOutDir,
-    sourceMaps: false,
-    target: "node",
-    watch: false,
+  const bundler = new Parcel({
+    entries: path.resolve(__dirname, "handler.ts"),
+    logLevel: "error",
+    mode: "production",
+    defaultConfig: "@parcel/config-default",
+
+    targets: {
+      default: {
+        distDir: buildOutDir,
+        outputFormat: "commonjs",
+        optimize: true,
+        includeNodeModules: true,
+        engines: {
+          node: require("../package.json").engines.node,
+        },
+      },
+    },
   });
-  await bundler.bundle();
+  await bundler.run();
 
   // Produce ZIP archive with the handler and git binary
   const zip = new JSZip();
-  zip.file(
-    "git-2.4.3.tar",
-    fs.createReadStream(
-      path.resolve(__dirname, "../node_modules/lambda-git/git-2.4.3.tar"),
-    ),
-    {
-      binary: true,
-    },
-  );
   zip.file(
     "index.js",
     fs.createReadStream(path.resolve(buildOutDir, "handler.js")),
diff --git a/src/config.ts b/src/config.ts
@@ -1,4 +1,4 @@
-import envalid from "envalid";
+import * as envalid from "envalid";
 import { Config } from "./types";
 
 export const envValidators = {
@@ -68,16 +68,14 @@ export const envValidators = {
   }),
 };
 
-export const getConfig = ({ useLocalDotEnv = false }): Config => {
+export const getConfig = (): Config => {
   const config = envalid.cleanEnv(process.env, envValidators, {
-    strict: true,
-    ...(!useLocalDotEnv && { dotEnvPath: null }),
     reporter: ({ errors }) => {
       const errorKeys = Object.keys(errors);
       if (!errorKeys.length) {
         return;
       }
-      throw new Error("Invalid env vars: " + errorKeys);
+      throw new Error("Invalid env vars: " + errorKeys.join(", "));
     },
   });
 
diff --git a/src/handler.ts b/src/handler.ts
@@ -4,9 +4,7 @@ import { getConfig } from "./config";
 import { appendToFileInRemoteGitRepository, generateLine } from "./helpers";
 
 export const handler: Handler<IotButtonClickEvent> = async (event) => {
-  const config = getConfig({
-    useLocalDotEnv: event ? event.useLocalDotEnv : false,
-  });
+  const config = getConfig();
 
   const line = generateLine({
     config,
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -40,20 +40,6 @@ export const appendToFileInRemoteGitRepository = async ({
   try {
     let commandPath = process.env.PATH || process.env.Path;
 
-    // Ensure git binary is available inside AWS Lambda
-    // See https://github.com/pimterry/lambda-git for context
-    /* istanbul ignore if */
-    if (process.env.AWS_LAMBDA_FUNCTION_NAME) {
-      await require("lambda-git")({
-        targetDirectory: handlerDirectory,
-        updateEnv: false,
-      });
-      commandPath = `${path.resolve(
-        handlerDirectory,
-        "usr/libexec/git-core",
-      )}:${commandPath}`;
-    }
-
     // Make git commands easier to run
     const runGitCommand = async (args: string[]) => {
       await execa("git", args, {
@@ -65,6 +51,7 @@ export const appendToFileInRemoteGitRepository = async ({
           GIT_COMMITTER_EMAIL: config.GIT_COMMIT_USER_EMAIL,
           GIT_CONFIG_NOSYSTEM: "true",
           GIT_TERMINAL_PROMPT: "false",
+          LD_LIBRARY_PATH: process.env.LD_LIBRARY_PATH,
           PATH: commandPath,
         },
         extendEnv: false,
diff --git a/src/json-source-map.d.ts b/src/json-source-map.d.ts
@@ -0,0 +1,4 @@
+// TODO: Upgrade dependencies, remove this file and check if yarn lint:tsc passes without adding skipLibCheck: true
+declare module "json-source-map" {
+  export type Mapping = any;
+}
diff --git a/src/simulate.test.ts b/src/simulate.test.ts
@@ -8,34 +8,31 @@ import {
 describe("simulate", () => {
   let mockConsoleLog: jest.MockInstance<void, any[]>;
   let mockConsoleError: jest.MockInstance<void, any[]>;
-  let mockExit: jest.MockInstance<void, any[]>;
   beforeEach(() => {
     sanitizeEnv();
     mockConsoleLog = jest.spyOn(console, "log").mockImplementation();
     mockConsoleError = jest.spyOn(console, "error").mockImplementation();
-    mockExit = jest
-      .spyOn(process, "exit")
-      .mockImplementation((code: number) => {
-        throw new Error(`Early exit with code ${code}`);
-      });
   });
   afterEach(() => {
     restoreEnv();
     jest.clearAllMocks();
   });
 
   it("throws by default because env vars are not provided", async () => {
-    await expect(simulate()).rejects.toThrow("Early exit with code 1");
+    await expect(simulate()).rejects.toThrow(
+      "Invalid env vars: GIT_REPO_URI, GIT_FILE_PATH",
+    );
 
     expect(mockConsoleLog).not.toHaveBeenCalled();
-    expect(mockConsoleError).toHaveBeenCalled();
-    expect(mockExit).toHaveBeenCalledWith(1);
+    expect(mockConsoleError).not.toHaveBeenCalled();
   });
 
   it("throws for an empty repository (branch does not exist)", async () => {
     const { repositoryPath } = await createTemporaryRepository();
-    process.env.GIT_REPO_URI = repositoryPath;
     process.env.GIT_FILE_PATH = "clicks.txt";
-    expect(simulate()).rejects.toThrow();
+    process.env.GIT_REPO_URI = repositoryPath;
+    expect(simulate()).rejects.toThrow(
+      /Remote branch main not found in upstream origin/,
+    );
   });
 });
diff --git a/src/simulate.ts b/src/simulate.ts
@@ -1,36 +1,30 @@
 import { handler } from "./handler";
 import { Context } from "aws-lambda";
-import { envValidators } from "./config";
-import envalid from "envalid";
+import * as envalid from "envalid";
 import { IotButtonClickType } from "./types";
 import { autoStartCommandIfNeeded } from "@kachkaev/commands";
+import dotenv from "dotenv";
 
 const simulate = async () => {
-  const useLocalDotEnv = process.env.NODE_ENV !== "test";
+  if (process.env.NODE_ENV !== "test") {
+    dotenv.config();
+  }
 
-  const { CLICK_TYPE } = envalid.cleanEnv(
-    process.env,
-    {
-      ...envValidators,
-      CLICK_TYPE: envalid.str({
-        desc: "Simulated click type",
-        choices: ["SINGLE", "DOUBLE", "LONG"],
-        default: "SINGLE",
-      }),
-    },
-    {
-      ...(!useLocalDotEnv && { dotEnvPath: null }),
-    },
-  );
+  const { CLICK_TYPE } = envalid.cleanEnv(process.env, {
+    CLICK_TYPE: envalid.str({
+      desc: "Simulated click type",
+      choices: ["SINGLE", "DOUBLE", "LONG"],
+      default: "SINGLE",
+    }),
+  });
 
   await handler(
     {
       serialNumber: "xxx",
       batteryVoltage: "xxmV",
       clickType: CLICK_TYPE as IotButtonClickType,
-      useLocalDotEnv,
     },
-    ({} as any) as Context,
+    {} as Context,
     null,
   );
 };
diff --git a/src/types.ts b/src/types.ts
@@ -23,6 +23,4 @@ export interface IotButtonClickEvent {
   batteryVoltage: string;
   clickType: IotButtonClickType;
   serialNumber: string;
-  /** Set to true when triggering the event handler locally */
-  useLocalDotEnv?: boolean;
 }
diff --git a/yarn.lock b/yarn.lock
