@vercel/go 2.1.1 → 2.2.2

package/dist/analyze.go

@@ -197,7 +197,9 @@ func main() {
 			// find a valid `http.HandlerFunc` handler function
 			params := rf[fn.Type.Params.Pos()-offset : fn.Type.Params.End()-offset]
 			validHandlerFunc := (strings.Contains(string(params), "http.ResponseWriter") &&
-				strings.Contains(string(params), "*http.Request") && len(fn.Type.Params.List) == 2)
+				strings.Contains(string(params), "*http.Request") &&
+				len(fn.Type.Params.List) == 2 &&
+				(fn.Recv == nil || len(fn.Recv.List) == 0))
 
 			if validHandlerFunc {
 				// we found the first exported function with `http.HandlerFunc`
@@ -223,7 +225,7 @@ func main() {
 		if fn.Name.IsExported() == true {
 			for _, param := range fn.Type.Params.List {
 				paramStr := fmt.Sprintf("%s", param.Type)
-				if strings.Contains(string(paramStr), "http ResponseWriter") && len(fn.Type.Params.List) == 2 {
+				if strings.Contains(string(paramStr), "http ResponseWriter") && len(fn.Type.Params.List) == 2 && (fn.Recv == nil || len(fn.Recv.List) == 0) {
 					analyzed := analyze{
 						PackageName: parsed.Name.Name,
 						FuncName:    fn.Name.Name,

package/dist/index.js

@@ -17875,6 +17875,9 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
             throw new Error('Please change `package main` to `package handler`');
         }
         const outDir = await build_utils_1.getWriteableDirectory();
+        // 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';
         if (packageName !== 'main') {
             const go = await go_helpers_1.createGo(workPath, goPath, process.platform, process.arch, {
                 cwd: entrypointDirname,
@@ -17898,8 +17901,7 @@ 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 modMainGoContents = await fs_extra_1.readFile(__webpack_require__.ab + "main.go", 'utf8');
             let goPackageName = `${packageName}/${packageName}`;
             const goFuncName = `${packageName}.${handlerFunctionName}`;
             if (isGoModExist) {
@@ -17919,26 +17921,26 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
                 .replace('__VC_HANDLER_FUNC_NAME', goFuncName);
             if (isGoModExist && isGoModInRootDir) {
                 build_utils_1.debug('[mod-root] Write main file to ' + downloadPath);
-                await fs_extra_1.writeFile(path_1.join(downloadPath, mainModGoFileName), mainModGoContents);
+                await fs_extra_1.writeFile(path_1.join(downloadPath, mainGoFileName), mainModGoContents);
                 undoFileActions.push({
                     to: undefined,
-                    from: path_1.join(downloadPath, mainModGoFileName),
+                    from: path_1.join(downloadPath, mainGoFileName),
                 });
             }
             else if (isGoModExist && !isGoModInRootDir) {
                 build_utils_1.debug('[mod-other] Write main file to ' + goModPath);
-                await fs_extra_1.writeFile(path_1.join(goModPath, mainModGoFileName), mainModGoContents);
+                await fs_extra_1.writeFile(path_1.join(goModPath, mainGoFileName), mainModGoContents);
                 undoFileActions.push({
                     to: undefined,
-                    from: path_1.join(goModPath, mainModGoFileName),
+                    from: path_1.join(goModPath, mainGoFileName),
                 });
             }
             else {
                 build_utils_1.debug('[entrypoint] Write main file to ' + entrypointDirname);
-                await fs_extra_1.writeFile(path_1.join(entrypointDirname, mainModGoFileName), mainModGoContents);
+                await fs_extra_1.writeFile(path_1.join(entrypointDirname, mainGoFileName), mainModGoContents);
                 undoFileActions.push({
                     to: undefined,
-                    from: path_1.join(entrypointDirname, mainModGoFileName),
+                    from: path_1.join(entrypointDirname, mainGoFileName),
                 });
             }
             // move user go file to folder
@@ -17985,7 +17987,7 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
             build_utils_1.debug('Running `go build`...');
             const destPath = path_1.join(outDir, handlerFileName);
             try {
-                const src = [path_1.join(baseGoModPath, mainModGoFileName)];
+                const src = [path_1.join(baseGoModPath, mainGoFileName)];
                 await go.build(src, destPath);
             }
             catch (err) {
@@ -18000,11 +18002,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);
-            // 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';
+            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);
             // Go doesn't like to build files in different directories,
             // so now we place `main.go` together with the user code
             await fs_extra_1.writeFile(path_1.join(entrypointDirname, mainGoFileName), mainGoContents);
@@ -18040,6 +18041,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;
@@ -18072,8 +18074,14 @@ async function build({ files, entrypoint, config, workPath, meta = {}, }) {
 exports.build = build;
 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);
+    // This regex has to walk a fine line where it replaces the most-likely occurrences
+    // of the handler's identifier without clobbering other syntax.
+    // Left-hand Side: A single space was chosen because it can catch `func Handler`
+    //   as well as `var _ http.HandlerFunc = Index`.
+    // Right-hand Side: a word boundary was chosen because this can be an end of line
+    //   or an open paren (as in `func Handler(`).
+    const fromRegex = new RegExp(String.raw ` ${from}\b`, 'g');
+    fileContents = fileContents.replace(fromRegex, ` ${to}`);
     await fs_extra_1.writeFile(fsPath, fileContents);
 }
 function getNewHandlerFunctionName(originalFunctionName, entrypoint) {

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.1.1",
+  "version": "2.2.2",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/go",
@@ -35,7 +35,7 @@
     "@types/jest": "28.1.6",
     "@types/node-fetch": "^2.3.0",
     "@types/tar": "^4.0.0",
-    "@vercel/build-utils": "5.3.1",
+    "@vercel/build-utils": "5.3.2",
     "@vercel/ncc": "0.24.0",
     "async-retry": "1.3.1",
     "execa": "^1.0.0",
@@ -45,5 +45,5 @@
     "tar": "4.4.6",
     "typescript": "4.3.4"
   },
-  "gitHead": "b52d01f809b80734ed1ab61df82f299f11a04720"
+  "gitHead": "6700630feb23bdb4e94ea727911a9e10aa546361"
 }

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))
-}