@vercel/go 2.0.14 → 2.1.0

package/dist/index.js

@@ -17689,7 +17689,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.prepareCache = exports.startDevServer = exports.build = exports.version = exports.shouldServe = void 0;
+exports.prepareCache = exports.startDevServer = exports.getNewHandlerFunctionName = exports.build = exports.version = exports.shouldServe = void 0;
 const execa_1 = __importDefault(__webpack_require__(580));
 const async_retry_1 = __importDefault(__webpack_require__(8571));
 const os_1 = __webpack_require__(2087);
@@ -17740,6 +17740,7 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
     // in order to undo the action, not what the original action was
     const undoFileActions = [];
     const undoDirectoryCreation = [];
+    const undoFunctionRenames = [];
     try {
         if (process.env.GIT_CREDENTIALS) {
             build_utils_1.debug('Initialize Git credentials...');
@@ -17756,6 +17757,7 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
   Learn more: https://github.com/golang/go/wiki/Modules
   `);
         }
+        const originalEntrypointAbsolute = path_1.join(workPath, entrypoint);
         const renamedEntrypoint = getRenamedEntrypoint(entrypoint);
         if (renamedEntrypoint) {
             await fs_extra_1.move(path_1.join(workPath, entrypoint), path_1.join(workPath, renamedEntrypoint));
@@ -17853,8 +17855,14 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
                 }
             }
         }
-        const handlerFunctionName = parsedAnalyzed.functionName;
-        build_utils_1.debug(`Found exported function "${handlerFunctionName}" in "${entrypoint}"`);
+        const originalFunctionName = parsedAnalyzed.functionName;
+        const handlerFunctionName = getNewHandlerFunctionName(originalFunctionName, entrypoint);
+        await renameHandlerFunction(entrypointAbsolute, originalFunctionName, handlerFunctionName);
+        undoFunctionRenames.push({
+            fsPath: originalEntrypointAbsolute,
+            from: handlerFunctionName,
+            to: originalFunctionName,
+        });
         if (!isGoModExist) {
             if (await fs_extra_1.pathExists(path_1.join(workPath, 'vendor'))) {
                 throw new Error('`go.mod` is required to use a `vendor` directory.');
@@ -17890,8 +17898,8 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
                     throw err;
                 }
             }
-            const mainModGoFileName = 'main__mod__.go';
-            const modMainGoContents = await fs_extra_1.readFile(__webpack_require__.ab + "main__mod__.go", 'utf8');
+            const mainModGoFileName = 'main.go';
+            const modMainGoContents = await fs_extra_1.readFile(__webpack_require__.ab + "main.go", 'utf8');
             let goPackageName = `${packageName}/${packageName}`;
             const goFuncName = `${packageName}.${handlerFunctionName}`;
             if (isGoModExist) {
@@ -17992,8 +18000,10 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
             const go = await go_helpers_1.createGo(workPath, goPath, process.platform, process.arch, {
                 cwd: entrypointDirname,
             }, false);
-            const origianlMainGoContents = await fs_extra_1.readFile(__webpack_require__.ab + "main.go", 'utf8');
-            const mainGoContents = origianlMainGoContents.replace('__VC_HANDLER_FUNC_NAME', handlerFunctionName);
+            const originalMainGoContents = await fs_extra_1.readFile(__webpack_require__.ab + "main.go", 'utf8');
+            const mainGoContents = originalMainGoContents
+                .replace('"__VC_HANDLER_PACKAGE_NAME"', '')
+                .replace('__VC_HANDLER_FUNC_NAME', handlerFunctionName);
             // in order to allow the user to have `main.go`,
             // we need our `main.go` to be called something else
             const mainGoFileName = 'main__vc__go__.go';
@@ -18032,6 +18042,7 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
             files: { ...(await build_utils_1.glob('**', outDir)), ...includedFiles },
             handler: handlerFileName,
             runtime: 'go1.x',
+            supportsWrapper: true,
             environment: {},
         });
         const watch = parsedAnalyzed.watch;
@@ -18053,7 +18064,7 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
     }
     finally {
         try {
-            await cleanupFileSystem(undoFileActions, undoDirectoryCreation);
+            await cleanupFileSystem(undoFileActions, undoDirectoryCreation, undoFunctionRenames);
         }
         catch (error) {
             console.log(`Build cleanup failed: ${error.message}`);
@@ -18062,7 +18073,27 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
     }
 }
 exports.build = build;
-async function cleanupFileSystem(undoFileActions, undoDirectoryCreation) {
+async function renameHandlerFunction(fsPath, from, to) {
+    let fileContents = await fs_extra_1.readFile(fsPath, 'utf8');
+    const fromRegex = new RegExp(`\\b${from}\\b`, 'g');
+    fileContents = fileContents.replace(fromRegex, to);
+    await fs_extra_1.writeFile(fsPath, fileContents);
+}
+function getNewHandlerFunctionName(originalFunctionName, entrypoint) {
+    if (!originalFunctionName) {
+        throw new Error('Handler function renaming failed because original function name was empty.');
+    }
+    if (!entrypoint) {
+        throw new Error('Handler function renaming failed because entrypoint was empty.');
+    }
+    build_utils_1.debug(`Found exported function "${originalFunctionName}" in "${entrypoint}"`);
+    const pathSlug = entrypoint.replace(/(\s|\\|\/|\]|\[|-|\.)/g, '_');
+    const newHandlerName = `${originalFunctionName}_${pathSlug}`;
+    build_utils_1.debug(`Renaming handler function temporarily from "${originalFunctionName}" to "${newHandlerName}"`);
+    return newHandlerName;
+}
+exports.getNewHandlerFunctionName = getNewHandlerFunctionName;
+async function cleanupFileSystem(undoFileActions, undoDirectoryCreation, undoFunctionRenames) {
     // we have to undo the actions in reverse order in cases
     // where one file was moved multiple times, which happens
     // using files that start with brackets
@@ -18074,6 +18105,11 @@ async function cleanupFileSystem(undoFileActions, undoDirectoryCreation) {
             await fs_extra_1.remove(action.from);
         }
     }
+    // after files are moved back, we can undo function renames
+    // these reference the original file location
+    for (const rename of undoFunctionRenames) {
+        await renameHandlerFunction(rename.fsPath, rename.from, rename.to);
+    }
     const undoDirectoryPromises = undoDirectoryCreation.map(async (directory) => {
         const contents = await fs_extra_1.readdir(directory);
         // only delete an empty directory

package/dist/main.go

@@ -1,10 +1,31 @@
 package main
 
 import (
-	vc "github.com/vercel/go-bridge/go/bridge"
 	"net/http"
+	"os"
+	"syscall"
+
+	"__VC_HANDLER_PACKAGE_NAME"
+	vc "github.com/vercel/go-bridge/go/bridge"
 )
 
+func checkForLambdaWrapper() {
+	wrapper := os.Getenv("AWS_LAMBDA_EXEC_WRAPPER")
+	if wrapper == "" {
+		return
+	}
+
+	// Removing the env var doesn't work
+	// Set it to empty string to override the previous value
+	os.Setenv("AWS_LAMBDA_EXEC_WRAPPER", "")
+	argv := append([]string{wrapper}, os.Args...)
+	err := syscall.Exec(wrapper, argv, os.Environ())
+	if err != nil {
+		panic(err)
+	}
+}
+
 func main() {
+	checkForLambdaWrapper()
 	vc.Start(http.HandlerFunc(__VC_HANDLER_FUNC_NAME))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/go",
-  "version": "2.0.14",
+  "version": "2.1.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -17,14 +17,25 @@
   "files": [
     "dist"
   ],
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "globals": {
+      "ts-jest": {
+        "diagnostics": true,
+        "isolatedModules": true
+      }
+    }
+  },
   "devDependencies": {
     "@tootallnate/once": "1.1.2",
     "@types/async-retry": "1.4.2",
     "@types/execa": "^0.9.0",
     "@types/fs-extra": "^5.0.5",
+    "@types/jest": "28.1.6",
     "@types/node-fetch": "^2.3.0",
     "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "5.1.1",
+    "@vercel/build-utils": "5.3.0",
     "@vercel/ncc": "0.24.0",
     "async-retry": "1.3.1",
     "execa": "^1.0.0",
@@ -34,5 +45,5 @@
     "tar": "4.4.6",
     "typescript": "4.3.4"
   },
-  "gitHead": "5eb8b16cbdf6215618b4b8125673941757fa1a8e"
+  "gitHead": "31f79c7de1944420b1f6fa5be9235c9b3f1d62b6"
 }

package/dist/main__mod__.go

@@ -1,12 +0,0 @@
-package main
-
-import (
-	"__VC_HANDLER_PACKAGE_NAME"
-	"net/http"
-
-	vc "github.com/vercel/go-bridge/go/bridge"
-)
-
-func main() {
-	vc.Start(http.HandlerFunc(__VC_HANDLER_FUNC_NAME))
-}