serverless-offline 9.0.0 → 9.1.0

package/README.md

@@ -127,6 +127,7 @@ All CLI options are optional:
 --ignoreJWTSignature        When using HttpApi with a JWT authorizer, don't check the signature of the JWT token. This should only be used for local development.
 --lambdaPort                Lambda http port to listen on. Default: 3002
 --layersDir                 The directory layers should be stored in. Default: ${codeDir}/.serverless-offline/layers'
+--localEnvironment          Copy local environment variables. Default: false
 --noAuth                    Turns off all authorizers
 --noPrependStageInUrl       Don't prepend http routes with the stage.
 --noStripTrailingSlashInUrl Don't strip trailing slash from http routes.
@@ -266,14 +267,14 @@ If you're using least-privilege principals for your AWS roles, this policy shoul
 
 ```json
 {
-  "Version": "2012-10-17",
   "Statement": [
     {
-      "Effect": "Allow",
       "Action": "lambda:GetLayerVersion",
+      "Effect": "Allow",
       "Resource": "arn:aws:lambda:*:*:layer:*:*"
     }
-  ]
+  ],
+  "Version": "2012-10-17"
 }
 ```
 
@@ -603,13 +604,13 @@ Add a new [launch configuration](https://code.visualstudio.com/docs/editor/debug
 
 ```json
 {
-  "type": "node",
-  "request": "launch",
-  "name": "Debug Serverless Offline",
   "cwd": "${workspaceFolder}",
-  "runtimeExecutable": "npm",
+  "name": "Debug Serverless Offline",
+  "request": "launch",
   "runtimeArgs": ["run", "debug"],
-  "sourceMaps": true
+  "runtimeExecutable": "npm",
+  "sourceMaps": true,
+  "type": "node"
 }
 ```
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "9.0.0",
+  "version": "9.1.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "./src/index.js",
@@ -194,7 +194,7 @@
     "@hapi/boom": "^10.0.0",
     "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.2.2",
-    "aws-sdk": "^2.1176.0",
+    "aws-sdk": "^2.1181.0",
     "boxen": "^7.0.0",
     "chalk": "^5.0.1",
     "execa": "^6.1.0",
@@ -206,7 +206,7 @@
     "jsonwebtoken": "^8.5.1",
     "jszip": "^3.10.0",
     "luxon": "^3.0.1",
-    "node-fetch": "^3.2.8",
+    "node-fetch": "^3.2.9",
     "node-schedule": "^2.1.0",
     "object.hasown": "^1.1.1",
     "p-memoize": "^7.1.0",

package/src/ServerlessOffline.js

@@ -1,4 +1,4 @@
-import process, { env, exit } from 'node:process'
+import process, { exit } from 'node:process'
 import { log } from '@serverless/utils/log.js'
 import chalk from 'chalk'
 import {
@@ -59,9 +59,6 @@ export default class ServerlessOffline {
 
   // Entry point for the plugin (sls offline) when running 'sls offline start'
   async start() {
-    // Put here so available everywhere, not just in handlers
-    env.IS_OFFLINE = true
-
     this.#mergeOptions()
 
     const { httpEvents, lambdas, scheduleEvents, webSocketEvents } =

package/src/config/commandOptions.js

@@ -91,6 +91,10 @@ export default {
     usage:
       'The directory layers should be stored in. Default: {codeDir}/.serverless-offline/layers',
   },
+  localEnvironment: {
+    type: 'boolean',
+    usage: 'Copy local environment variables. Default: false',
+  },
   noAuth: {
     type: 'boolean',
     usage: 'Turns off all authorizers',

package/src/config/constants.js

@@ -4,7 +4,7 @@ export const BASE_URL_PLACEHOLDER = 'http://example'
 
 export const CUSTOM_OPTION = 'serverless-offline'
 
-export const DEFAULT_LAMBDA_RUNTIME = 'nodejs12.x'
+export const DEFAULT_LAMBDA_RUNTIME = 'nodejs14.x'
 
 // https://docs.aws.amazon.com/lambda/latest/dg/limits.html
 export const DEFAULT_LAMBDA_MEMORY_SIZE = 1024

package/src/config/defaultOptions.js

@@ -20,6 +20,7 @@ export default {
   httpsProtocol: '',
   lambdaPort: 3002,
   layersDir: null,
+  localEnvironment: false,
   noAuth: false,
   noPrependStageInUrl: false,
   noStripTrailingSlashInUrl: false,

package/src/events/http/HttpServer.js

@@ -2,7 +2,7 @@ import { Buffer } from 'node:buffer'
 import { readFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import { join, resolve } from 'node:path'
-import process, { exit } from 'node:process'
+import { exit } from 'node:process'
 import h2o2 from '@hapi/h2o2'
 import { Server } from '@hapi/hapi'
 import { log } from '@serverless/utils/log.js'
@@ -35,8 +35,6 @@ const { assign, entries, keys } = Object
 export default class HttpServer {
   #lambda = null
 
-  #lastRequestOptions = null
-
   #options = null
 
   #serverless = null
@@ -198,17 +196,6 @@ export default class HttpServer {
     const server = `${httpsProtocol ? 'https' : 'http'}://${host}:${httpPort}`
 
     log.notice(`Server ready: ${server} 🚀`)
-    log.notice()
-    log.notice('Enter "rp" to replay the last request')
-
-    process.openStdin().addListener('data', (data) => {
-      // note: data is an object, and when converted to a string it will
-      // end with a linefeed.  so we (rather crudely) account for that
-      // with toString() and then trim()
-      if (data.toString().trim() === 'rp') {
-        this.#injectLastRequest()
-      }
-    })
   }
 
   // stops the server
@@ -513,24 +500,11 @@ export default class HttpServer {
     hapiOptions.tags = ['api']
 
     const hapiHandler = async (request, h) => {
-      // Here we go
-      // Store current request as the last one
-      this.#lastRequestOptions = {
-        headers: request.headers,
-        method: request.method,
-        payload: request.payload,
-        url: request.url.href,
-      }
-
       const requestPath =
         endpoint.isHttpApi || this.#options.noPrependStageInUrl
           ? request.path
           : request.path.substr(`/${stage}`.length)
 
-      if (request.auth.credentials && request.auth.strategy) {
-        this.#lastRequestOptions.auth = request.auth
-      }
-
       // Payload processing
       const encoding = detectEncoding(request)
 
@@ -1257,15 +1231,6 @@ export default class HttpServer {
       .map((line) => line.trim())
   }
 
-  #injectLastRequest() {
-    if (this.#lastRequestOptions) {
-      log.notice('Replaying HTTP last request')
-      this.#server.inject(this.#lastRequestOptions)
-    } else {
-      log.notice('No last HTTP request to replay!')
-    }
-  }
-
   writeRoutesTerminal() {
     logRoutes(this.#terminalInfo)
   }

package/src/lambda/LambdaFunction.js

@@ -1,12 +1,12 @@
 import { readFile, writeFile } from 'node:fs/promises'
 import { dirname, join, resolve } from 'node:path'
+import process from 'node:process'
 import { performance } from 'node:perf_hooks'
 import { log } from '@serverless/utils/log.js'
 import { emptyDir, ensureDir, remove } from 'fs-extra'
 import jszip from 'jszip'
 import HandlerRunner from './handler-runner/index.js'
 import LambdaContext from './LambdaContext.js'
-import resolveJoins from '../utils/resolveJoins.js'
 import {
   DEFAULT_LAMBDA_MEMORY_SIZE,
   DEFAULT_LAMBDA_RUNTIME,
@@ -15,7 +15,7 @@ import {
 } from '../config/index.js'
 import { createUniqueId, splitHandlerPathAndName } from '../utils/index.js'
 
-const { entries } = Object
+const { entries, fromEntries } = Object
 const { ceil } = Math
 
 export default class LambdaFunction {
@@ -35,6 +35,8 @@ export default class LambdaFunction {
 
   #functionName = null
 
+  #handler = null
+
   #handlerRunner = null
 
   #idleTimeStarted = null
@@ -86,6 +88,7 @@ export default class LambdaFunction {
     // this._executionTimeout = null
     this.#functionKey = functionKey
     this.#functionName = name
+    this.#handler = handler
     this.#memorySize = memorySize
     this.#region = provider.region
     this.#runtime = runtime
@@ -93,11 +96,18 @@ export default class LambdaFunction {
 
     this.#verifySupportedRuntime()
 
-    const env = this.#getEnv(
-      resolveJoins(provider.environment),
-      functionDefinition.environment,
-      handler,
-    )
+    const env = {
+      ...(options.localEnvironment
+        ? process.env
+        : // we always copy all AWS_xxxx environment variables over from local env
+          fromEntries(
+            entries(process.env).filter(([key]) => key.startsWith('AWS_')),
+          )),
+      ...this.#getAwsEnvVars(),
+      ...provider.environment,
+      ...functionDefinition.environment,
+      IS_OFFLINE: 'true',
+    }
 
     this.#artifact = functionDefinition.package?.artifact
 
@@ -176,6 +186,7 @@ export default class LambdaFunction {
   // https://github.com/serverless/serverless/blob/v1.50.0/lib/plugins/aws/invokeLocal/index.js#L108
   #getAwsEnvVars() {
     return {
+      _HANDLER: this.#handler,
       AWS_DEFAULT_REGION: this.#region,
       AWS_LAMBDA_FUNCTION_MEMORY_SIZE: this.#memorySize,
       AWS_LAMBDA_FUNCTION_NAME: this.#functionName,
@@ -194,16 +205,6 @@ export default class LambdaFunction {
     }
   }
 
-  #getEnv(providerEnv, functionDefinitionEnv, handler) {
-    return {
-      ...this.#getAwsEnvVars(),
-      ...providerEnv,
-      ...functionDefinitionEnv,
-      _HANDLER: handler, // TODO is this available in AWS?
-      IS_OFFLINE: true,
-    }
-  }
-
   setClientContext(clientContext) {
     this.#clientContext = clientContext
   }

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

@@ -1,4 +1,4 @@
-import { mkdir, readFile, rmdir, writeFile } from 'node:fs/promises'
+import { mkdir, readFile, rm, rmdir, writeFile } from 'node:fs/promises'
 import { EOL } from 'node:os'
 import { sep, resolve, parse as pathParse } from 'node:path'
 import process, { chdir, cwd } from 'node:process'
@@ -32,6 +32,9 @@ export default class GoRunner {
 
   async cleanup() {
     try {
+      // refresh go.mod
+      await rm(this.#tmpFile)
+      execaSync('go', ['mod', 'tidy'])
       await rmdir(this.#tmpPath, { recursive: true })
     } catch {
       // @ignore
@@ -154,8 +157,6 @@ export default class GoRunner {
     }
 
     try {
-      // refresh go.mod
-      execaSync('go', ['mod', 'tidy'])
       chdir(this.#codeDir)
     } catch {
       // @ignore

package/src/utils/resolveJoins.js

@@ -1,29 +0,0 @@
-const { entries } = Object
-
-// Used to resolve Fn::Join in environment variables
-export default function resolveJoins(environment) {
-  if (!environment) {
-    return undefined
-  }
-
-  const newEnv = {}
-
-  entries(environment).forEach(([key, value]) => {
-    if (!value) {
-      return
-    }
-
-    const joinArray = value['Fn::Join']
-    const isJoin = Boolean(joinArray)
-
-    if (isJoin) {
-      const separator = joinArray[0]
-      const joined = joinArray[1].join(separator)
-      newEnv[key] = joined
-    } else {
-      newEnv[key] = value
-    }
-  })
-
-  return newEnv
-}