serverless-offline 8.3.1 → 8.4.0

package/CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## [8.4.0](https://github.com/dherault/serverless-offline/compare/v8.3.1...v8.4.0) (2022-01-28)
+
+### Features
+
+- `go-runner` implementation ([#1320](https://github.com/dherault/serverless-offline/issues/1320)) ([6bb54fd](https://github.com/dherault/serverless-offline/commit/6bb54fdccebd3db61221a9b8f709414876086324))
+- `--disableScheduledEvents` CLI param support ([#1185](https://github.com/dherault/serverless-offline/issues/1185)) ([4503567](https://github.com/dherault/serverless-offline/commit/4503567cdb8fa31ac9df98b667a403b0408f8444))
+
+### Bug Fixes
+
+- Handle custom authorizer 401 in non in-process runners ([#1319](https://github.com/dherault/serverless-offline/issues/1319)) ([8d61bde](https://github.com/dherault/serverless-offline/commit/8d61bde74cdfb37410a5c1952ca608e815eeb1cf))
+- Support `httpApi` payload override on function level ([#1312](https://github.com/dherault/serverless-offline/issues/1312)) ([8db63dd](https://github.com/dherault/serverless-offline/commit/8db63dda6054198775ed3b567dc3c1dbf73eb574))
+
+### [8.3.1](https://github.com/dherault/serverless-offline/compare/v8.3.0...v8.3.1) (2021-11-25)
+
+### Bug Fixes
+
+- Fix handling of modern logs (`Cannot read properties of undefined (reading 'notice')` error)

package/README.md

@@ -31,7 +31,7 @@ To do so, it starts an HTTP server that handles the request's lifecycle like API
 
 **Features:**
 
-- [Node.js](https://nodejs.org), [Python](https://www.python.org), [Ruby](https://www.ruby-lang.org) <!-- and [Go](https://golang.org) --> λ runtimes.
+- [Node.js](https://nodejs.org), [Python](https://www.python.org), [Ruby](https://www.ruby-lang.org) and [Go](https://golang.org) λ runtimes.
 - Velocity templates support.
 - Lazy loading of your handler files.
 - And more: integrations, authorizers, proxies, timeouts, responseParameters, HTTPS, CORS, etc...
@@ -115,6 +115,7 @@ All CLI options are optional:
 --corsDisallowCredentials   When provided, the default Access-Control-Allow-Credentials header value will be passed as 'false'. Default: true
 --corsExposedHeaders        Used as additional Access-Control-Exposed-Headers header value for responses. Delimit multiple values with commas. Default: 'WWW-Authenticate,Server-Authorization'
 --disableCookieValidation   Used to disable cookie-validation on hapi.js-server
+--disableScheduledEvents    Disables all scheduled events. Overrides configurations in serverless.yml.
 --dockerHost                The host name of Docker. Default: localhost
 --dockerHostServicePath     Defines service path which is used by SLS running inside Docker container
 --dockerNetwork             The network that the Docker container will connect to

package/dist/ServerlessOffline.js

@@ -150,7 +150,7 @@ class ServerlessOffline {
       eventModules.push(this._createHttp(httpEvents));
     }
 
-    if (scheduleEvents.length > 0) {
+    if (!_classPrivateFieldLooseBase(this, _options)[_options].disableScheduledEvents && scheduleEvents.length > 0) {
       eventModules.push(this._createSchedule(scheduleEvents));
     }
 
@@ -398,7 +398,12 @@ class ServerlessOffline {
             }
 
             httpEvent.http.isHttpApi = true;
-            httpEvent.http.payload = service.provider.httpApi && service.provider.httpApi.payload ? service.provider.httpApi.payload : '2.0';
+
+            if (functionDefinition.httpApi && functionDefinition.httpApi.payload) {
+              httpEvent.http.payload = functionDefinition.httpApi.payload;
+            } else {
+              httpEvent.http.payload = service.provider.httpApi && service.provider.httpApi.payload ? service.provider.httpApi.payload : '2.0';
+            }
           }
 
           if (http && http.private) {

package/dist/config/commandOptions.js

@@ -29,6 +29,10 @@ var _default = {
     usage: 'Used to disable cookie-validation on hapi.js-server',
     type: 'boolean'
   },
+  disableScheduledEvents: {
+    usage: 'Disables all scheduled events. Overrides configurations in serverless.yml. Default: false',
+    type: 'boolean'
+  },
   enforceSecureCookies: {
     usage: 'Enforce secure cookies',
     type: 'boolean'

package/dist/config/defaultOptions.js

@@ -16,6 +16,7 @@ var _default = {
   corsAllowOrigin: '*',
   corsExposedHeaders: 'WWW-Authenticate,Server-Authorization',
   disableCookieValidation: false,
+  disableScheduledEvents: false,
   dockerHost: 'localhost',
   dockerHostServicePath: null,
   dockerNetwork: null,

package/dist/events/http/createAuthScheme.js

@@ -112,7 +112,8 @@ function createAuthScheme(authorizerOptions, provider, lambda, {
       lambdaFunction.setEvent(event);
 
       try {
-        const result = await lambdaFunction.runHandler(); // return processResponse(null, result)
+        const result = await lambdaFunction.runHandler();
+        if (result === 'Unauthorized') return _boom.default.unauthorized('Unauthorized'); // return processResponse(null, result)
 
         const policy = result; // Validate that the policy document has the principalId set
 

package/dist/lambda/handler-runner/HandlerRunner.js

@@ -144,6 +144,13 @@ class HandlerRunner {
       return new InProcessRunner(functionKey, handlerPath, handlerName, _classPrivateFieldLooseBase(this, _env)[_env], timeout, allowCache);
     }
 
+    if (_index.supportedGo.has(runtime)) {
+      const {
+        default: GoRunner
+      } = await Promise.resolve().then(() => _interopRequireWildcard(require('./go-runner/index.js')));
+      return new GoRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], this.v3Utils);
+    }
+
     if (_index.supportedPython.has(runtime)) {
       const {
         default: PythonRunner

package/dist/lambda/handler-runner/go-runner/GoRunner.js

@@ -0,0 +1,211 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _os = require("os");
+
+var _fs = require("fs");
+
+var _path = require("path");
+
+var _execa = _interopRequireWildcard(require("execa"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; }
+
+var id = 0;
+
+function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
+
+const {
+  writeFile,
+  readFile,
+  mkdir,
+  rmdir
+} = _fs.promises;
+const {
+  parse,
+  stringify
+} = JSON;
+const {
+  cwd
+} = process;
+const PAYLOAD_IDENTIFIER = 'offline_payload';
+
+var _env = /*#__PURE__*/_classPrivateFieldLooseKey("env");
+
+var _handlerPath = /*#__PURE__*/_classPrivateFieldLooseKey("handlerPath");
+
+var _tmpPath = /*#__PURE__*/_classPrivateFieldLooseKey("tmpPath");
+
+var _tmpFile = /*#__PURE__*/_classPrivateFieldLooseKey("tmpFile");
+
+var _goEnv = /*#__PURE__*/_classPrivateFieldLooseKey("goEnv");
+
+class GoRunner {
+  constructor(funOptions, env, v3Utils) {
+    Object.defineProperty(this, _env, {
+      writable: true,
+      value: null
+    });
+    Object.defineProperty(this, _handlerPath, {
+      writable: true,
+      value: null
+    });
+    Object.defineProperty(this, _tmpPath, {
+      writable: true,
+      value: null
+    });
+    Object.defineProperty(this, _tmpFile, {
+      writable: true,
+      value: null
+    });
+    Object.defineProperty(this, _goEnv, {
+      writable: true,
+      value: null
+    });
+    const {
+      handlerPath
+    } = funOptions;
+    _classPrivateFieldLooseBase(this, _env)[_env] = env;
+    _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath] = handlerPath;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    } // Make sure we have the mock-lambda runner
+
+
+    (0, _execa.sync)('go', ['get', 'github.com/icarus-sullivan/mock-lambda@e065469']);
+  }
+
+  async cleanup() {
+    try {
+      await rmdir(_classPrivateFieldLooseBase(this, _tmpPath)[_tmpPath], {
+        recursive: true
+      });
+    } catch (e) {// @ignore
+    }
+
+    _classPrivateFieldLooseBase(this, _tmpFile)[_tmpFile] = null;
+    _classPrivateFieldLooseBase(this, _tmpPath)[_tmpPath] = null;
+  }
+
+  _parsePayload(value) {
+    const log = [];
+    let payload;
+
+    for (const item of value.split(_os.EOL)) {
+      if (item.indexOf(PAYLOAD_IDENTIFIER) === -1) {
+        log.push(item);
+      } else if (item.indexOf(PAYLOAD_IDENTIFIER) !== -1) {
+        try {
+          const {
+            offline_payload: {
+              success,
+              error
+            }
+          } = parse(item);
+
+          if (success) {
+            payload = success;
+          } else if (error) {
+            payload = error;
+          }
+        } catch (err) {// @ignore
+        }
+      }
+    } // Log to console in case engineers want to see the rest of the info
+
+
+    if (this.log) {
+      this.log(log.join(_os.EOL));
+    } else {
+      console.log(log.join(_os.EOL));
+    }
+
+    return payload;
+  }
+
+  async run(event, context) {
+    const {
+      dir
+    } = (0, _path.parse)(_classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]);
+    const handlerCodeRoot = dir.split(_path.sep).slice(0, -1).join(_path.sep);
+    const handlerCode = await readFile(`${_classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]}.go`, 'utf8');
+    _classPrivateFieldLooseBase(this, _tmpPath)[_tmpPath] = (0, _path.resolve)(handlerCodeRoot, 'tmp');
+    _classPrivateFieldLooseBase(this, _tmpFile)[_tmpFile] = (0, _path.resolve)(_classPrivateFieldLooseBase(this, _tmpPath)[_tmpPath], 'main.go');
+    const out = handlerCode.replace('"github.com/aws/aws-lambda-go/lambda"', 'lambda "github.com/icarus-sullivan/mock-lambda"');
+
+    try {
+      await mkdir(_classPrivateFieldLooseBase(this, _tmpPath)[_tmpPath], {
+        recursive: true
+      });
+    } catch (e) {// @ignore
+    }
+
+    try {
+      await writeFile(_classPrivateFieldLooseBase(this, _tmpFile)[_tmpFile], out, 'utf8');
+    } catch (e) {// @ignore
+    } // Get go env to run this locally
+
+
+    if (!_classPrivateFieldLooseBase(this, _goEnv)[_goEnv]) {
+      const goEnvResponse = await (0, _execa.default)('go', ['env'], {
+        stdio: 'pipe',
+        encoding: 'utf-8'
+      });
+      const goEnvString = goEnvResponse.stdout || goEnvResponse.stderr;
+      _classPrivateFieldLooseBase(this, _goEnv)[_goEnv] = goEnvString.split(_os.EOL).reduce((a, b) => {
+        const [k, v] = b.split('="'); // eslint-disable-next-line no-param-reassign
+
+        a[k] = v ? v.slice(0, -1) : '';
+        return a;
+      }, {});
+    } // Remove our root, since we want to invoke go relatively
+
+
+    const cwdPath = `${_classPrivateFieldLooseBase(this, _tmpFile)[_tmpFile]}`.replace(`${cwd()}${_path.sep}`, '');
+    const {
+      stdout,
+      stderr
+    } = await (0, _execa.default)(`go`, ['run', cwdPath], {
+      stdio: 'pipe',
+      env: { ..._classPrivateFieldLooseBase(this, _env)[_env],
+        ..._classPrivateFieldLooseBase(this, _goEnv)[_goEnv],
+        AWS_LAMBDA_LOG_GROUP_NAME: context.logGroupName,
+        AWS_LAMBDA_LOG_STREAM_NAME: context.logStreamName,
+        AWS_LAMBDA_FUNCTION_NAME: context.functionName,
+        AWS_LAMBDA_FUNCTION_MEMORY_SIZE: context.memoryLimitInMB,
+        AWS_LAMBDA_FUNCTION_VERSION: context.functionVersion,
+        LAMBDA_EVENT: stringify(event),
+        LAMBDA_TEST_EVENT: `${event}`,
+        LAMBDA_CONTEXT: stringify(context),
+        IS_LAMBDA_AUTHORIZER: event.type === 'REQUEST' || event.type === 'TOKEN',
+        IS_LAMBDA_REQUEST_AUTHORIZER: event.type === 'REQUEST',
+        IS_LAMBDA_TOKEN_AUTHORIZER: event.type === 'TOKEN',
+        PATH: process.env.PATH
+      },
+      encoding: 'utf-8'
+    }); // Clean up after we created the temporary file
+
+    await this.cleanup();
+
+    if (stderr) {
+      return stderr;
+    }
+
+    return this._parsePayload(stdout);
+  }
+
+}
+
+exports.default = GoRunner;

package/dist/lambda/handler-runner/go-runner/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _GoRunner.default;
+  }
+});
+
+var _GoRunner = _interopRequireDefault(require("./GoRunner.js"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/lambda/handler-runner/in-process-runner/InProcessRunner.js

@@ -163,8 +163,14 @@ class InProcessRunner {
     let callback;
     const callbackCalled = new Promise((resolve, reject) => {
       callback = (err, data) => {
+        if (err === 'Unauthorized') {
+          resolve('Unauthorized');
+          return;
+        }
+
         if (err) {
           reject(err);
+          return;
         }
 
         resolve(data);

package/dist/utils/checkGoVersion.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = checkGoVersion;
+
+var _execa = _interopRequireDefault(require("execa"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+async function checkGoVersion() {
+  let goVersion;
+
+  try {
+    const {
+      stdout
+    } = await (0, _execa.default)('go', ['version']);
+
+    if (stdout.match(/go1.\d+/g)) {
+      goVersion = '1.x';
+    }
+  } catch (err) {// @ignore
+  }
+
+  return goVersion;
+}

package/dist/utils/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "checkDockerDaemon", {
     return _checkDockerDaemon.default;
   }
 });
+Object.defineProperty(exports, "checkGoVersion", {
+  enumerable: true,
+  get: function () {
+    return _checkGoVersion.default;
+  }
+});
 Object.defineProperty(exports, "createApiKey", {
   enumerable: true,
   get: function () {
@@ -118,6 +124,8 @@ var _splitHandlerPathAndName = _interopRequireDefault(require("./splitHandlerPat
 
 var _checkDockerDaemon = _interopRequireDefault(require("./checkDockerDaemon.js"));
 
+var _checkGoVersion = _interopRequireDefault(require("./checkGoVersion.js"));
+
 var _generateHapiPath = _interopRequireDefault(require("./generateHapiPath.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "8.3.1",
+  "version": "8.4.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "dist/main.js",
@@ -13,6 +13,7 @@
     "lint:updated": "pipe-git-updated --ext=js -- eslint",
     "list-contributors": "echo 'clone https://github.com/mgechev/github-contributors-list.git first, then run npm install' && cd ../github-contributors-list && node bin/githubcontrib --owner dherault --repo serverless-offline --sortBy contributions --showlogin true --sortOrder desc > contributors.md",
     "prepare": "npm run build",
+    "prepare-release": "standard-version && prettier --write CHANGELOG.md",
     "prepublishOnly": "npm run lint && npm run build",
     "prettier-check": "prettier -c --ignore-path .gitignore \"**/*.{css,html,js,json,md,yaml,yml}\"",
     "prettier-check:updated": "pipe-git-updated --ext=css --ext=html --ext=js --ext=json --ext=md --ext=yaml --ext=yml -- prettier -c",
@@ -101,6 +102,7 @@
     "Gert Jansen van Rensburg (https://github.com/gertjvr)",
     "Guillaume Carbonneau (https://github.com/guillaume)",
     "György Balássy (https://github.com/balassy)",
+    "James Relyea (https://github.com/james-relyea)",
     "Jarda Snajdr (https://github.com/jsnajdr)",
     "Jaryd Carolin (https://github.com/horyd)",
     "Jeff Hall (https://github.com/electrikdevelopment)",
@@ -172,11 +174,35 @@
   "engines": {
     "node": ">=12.0.0"
   },
+  "standard-version": {
+    "skip": {
+      "commit": true,
+      "tag": true
+    },
+    "types": [
+      {
+        "type": "feat",
+        "section": "Features"
+      },
+      {
+        "type": "fix",
+        "section": "Bug Fixes"
+      },
+      {
+        "type": "perf",
+        "section": "Performance Improvements"
+      },
+      {
+        "type": "refactor",
+        "section": "Maintenance Improvements"
+      }
+    ]
+  },
   "dependencies": {
     "@hapi/boom": "^9.1.4",
     "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.2.1",
-    "aws-sdk": "^2.1036.0",
+    "aws-sdk": "^2.1065.0",
     "boxen": "^5.1.2",
     "chalk": "^4.1.2",
     "cuid": "^2.1.8",
@@ -190,44 +216,45 @@
     "jsonwebtoken": "^8.5.1",
     "jszip": "^3.7.1",
     "luxon": "^1.28.0",
-    "node-fetch": "^2.6.6",
+    "node-fetch": "^2.6.7",
     "node-schedule": "^1.3.3",
     "object.fromentries": "^2.0.5",
-    "p-memoize": "^4.0.3",
+    "p-memoize": "^4.0.4",
     "p-queue": "^6.6.2",
     "p-retry": "^4.6.1",
     "please-upgrade-node": "^3.2.0",
     "portfinder": "^1.0.28",
     "semver": "^7.3.5",
     "update-notifier": "^5.1.0",
-    "velocityjs": "^2.0.5",
+    "velocityjs": "^2.0.6",
     "ws": "^7.5.6"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@babel/plugin-proposal-dynamic-import": "^7.16.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.16.0",
-    "@babel/register": "^7.16.0",
+    "@babel/cli": "^7.16.8",
+    "@babel/core": "^7.16.12",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+    "@babel/register": "^7.16.9",
     "archiver": "^5.3.0",
     "babel-eslint": "^10.1.0",
     "copyfiles": "^2.4.1",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^3.4.1",
     "git-list-updated": "^1.2.1",
     "husky": "^4.3.8",
     "jest": "^26.6.3",
     "lint-staged": "^11.2.6",
     "p-map": "^4.0.0",
-    "prettier": "^2.4.1",
+    "prettier": "^2.5.1",
     "rimraf": "^3.0.2",
-    "serverless": "^2.66.2"
+    "serverless": "^2.72.2",
+    "standard-version": "^9.3.2"
   },
   "peerDependencies": {
     "serverless": "^1.60.0 || 2 || 3"