Lambda Custom Runtime via Docker Support

package.json

@@ -152,6 +152,7 @@
  "Bryan Vaz (https://github.com/bryanvaz)",
  "Justin Ng (https://github.com/njyjn)",
  "Fernando Alvarez (https://github.com/jefer590)",
+ "Grady Rogers (https://github.com/rogersgt)",
  "Eric Carter (https://github.com/ericctsf)"
  ],
  "engines": {

src/ServerlessOffline.js

@@ -1,5 +1,6 @@
 import process, { exit } from 'node:process'
 import { log } from '@serverless/utils/log.js'
+import { getHandlerName } from './utils/index.js'
 import {
  commandOptions,
  CUSTOM_OPTION,
@@ -275,10 +276,11 @@ export default class ServerlessOffline {
  events.forEach((event) => {
  const { http, httpApi, schedule, websocket } = event
 
- if ((http || httpApi) && functionDefinition.handler) {
+ const handlerName = getHandlerName(functionDefinition)
+ if ((http || httpApi) && handlerName) {
  const httpEvent = {
  functionKey,
- handler: functionDefinition.handler,
+ handler: handlerName,
  http: http || httpApi,
  }
 

src/lambda/LambdaFunction.js

@@ -14,7 +14,7 @@ import {
  DEFAULT_LAMBDA_TIMEOUT,
  supportedRuntimes,
 } from '../config/index.js'
-import { createUniqueId } from '../utils/index.js'
+import { createUniqueId, getHandlerName } from '../utils/index.js'
 
 const { ceil } = Math
 const { entries, fromEntries } = Object
@@ -76,7 +76,8 @@ export default class LambdaFunction {
  // TODO FIXME look into better way to work with serverless-webpack
  const servicepath = resolve(servicePath, options.location || '')
 
- const { handler, name, package: functionPackage = {} } = functionDefinition
+ const { name, package: functionPackage = {} } = functionDefinition
+ const handler = getHandlerName(functionDefinition)
 
  // this._executionTimeout = null
  this.#functionKey = functionKey

src/utils/__tests__/getHandlerName.test.js

@@ -0,0 +1,44 @@
+import getHandlerName from '../getHandlerName.js'
+
+const tests = [
+ {
+ input: {
+ image: {
+ command: ['app.handler'],
+ name: 'node14',
+ },
+ events: [
+ {
+ httpApi: {
+ method: 'get',
+ path: '/',
+ },
+ },
+ ],
+ },
+ expected: 'app.handler',
+ },
+ {
+ input: {
+ handler: 'app.handler',
+ events: [
+ {
+ httpApi: {
+ method: 'get',
+ path: '/',
+ },
+ },
+ ],
+ },
+ expected: 'app.handler',
+ },
+]
+
+describe('getHandlerName', () => {
+ tests.forEach(({ input, expected }) => {
+ test('Should return the correct handler name', () => {
+ const handlerValue = getHandlerName(input)
+ expect(handlerValue).toEqual(expected)
+ })
+ })
+})

src/utils/getHandlerName.js

@@ -0,0 +1,16 @@
+export default function getHandlerName(functionDefinition) {
+ const { handler, image } = functionDefinition
+
+ if (handler) {
+ return handler
+ }
+
+ const { command } = image
+ if (!command || command.length < 1) {
+ throw new Error(
+ `Unable to determine handler name. Be sure to include a "command" property when using a docker image as a custom runtime. See https://www.serverless.com/blog/container-support-for-lambda`,
+ )
+ }
+
+ return command[0]
+}

src/utils/index.js

@@ -14,7 +14,7 @@ export { default as parseMultiValueQueryStringParameters } from './parseMultiVal
 export { default as parseQueryStringParameters } from './parseQueryStringParameters.js'
 export { default as parseQueryStringParametersForPayloadV2 } from './parseQueryStringParametersForPayloadV2.js'
 export { default as splitHandlerPathAndName } from './splitHandlerPathAndName.js'
-
+export { default as getHandlerName } from './getHandlerName.js'
 // export { default as baseImage } from './baseImage.js'
 
 const { isArray } = Array