Merge pull request #26 from lkeijmel/feature/sync-runtime-version-with-config

mnapoli · web-flow · commit f19eb4dec172 · 2025-03-05T10:07:31.000+01:00
feat: add custom runtime support based on the defined runtime
diff --git a/lib/plugins/aws/custom-resources/index.js b/lib/plugins/aws/custom-resources/index.js
@@ -162,6 +162,12 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
     });
   }
 
+  let runtimeVersion = 'nodejs18.x';
+  const providerRuntime = awsProvider.getRuntime();
+  if (providerRuntime.startsWith('nodejs')) {
+    runtimeVersion = providerRuntime;
+  }
+
   const customResourceFunction = {
     Type: 'AWS::Lambda::Function',
     Properties: {
@@ -172,7 +178,7 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
       FunctionName: absoluteFunctionName,
       Handler,
       MemorySize: 1024,
-      Runtime: 'nodejs18.x',
+      Runtime: runtimeVersion,
       Timeout: 180,
     },
     DependsOn: [],
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
@@ -1822,7 +1822,7 @@ class AwsProvider {
   }
 
   getRuntime(runtime) {
-    const defaultRuntime = 'nodejs16.x';
+    const defaultRuntime = 'nodejs18.x';
     const runtimeSourceValue = this.getRuntimeSourceValue();
     return runtime || runtimeSourceValue.value || defaultRuntime;
   }
diff --git a/lib/plugins/package/lib/package-service.js b/lib/plugins/package/lib/package-service.js
@@ -29,7 +29,7 @@ module.exports = {
   },
 
   getRuntime(runtime) {
-    const defaultRuntime = 'nodejs16.x';
+    const defaultRuntime = 'nodejs18.x';
     return runtime || this.serverless.service.provider.runtime || defaultRuntime;
   },
 
diff --git a/test/fixtures/cli/variables/serverless.yml b/test/fixtures/cli/variables/serverless.yml
@@ -3,7 +3,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 custom:
   importedFile: ${file(config.json)}
diff --git a/test/fixtures/programmatic/api-gateway-extended/serverless.yml b/test/fixtures/programmatic/api-gateway-extended/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
   apiGateway:
     shouldStartNameWithService: true
diff --git a/test/fixtures/programmatic/api-gateway/serverless.yml b/test/fixtures/programmatic/api-gateway/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   apiGateway:
     shouldStartNameWithService: true
 
diff --git a/test/fixtures/programmatic/check-for-changes/serverless.yml b/test/fixtures/programmatic/check-for-changes/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   fn1:
diff --git a/test/fixtures/programmatic/cognito-user-pool/serverless.yml b/test/fixtures/programmatic/cognito-user-pool/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/config-schema-extensions-error/serverless.yml b/test/fixtures/programmatic/config-schema-extensions-error/serverless.yml
@@ -2,7 +2,7 @@ service: configSchemaExtensionsError
 
 provider:
   name: someProvider
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 configValidationMode: error
 frameworkVersion: '*'
diff --git a/test/fixtures/programmatic/curated-plugins/serverless.yml b/test/fixtures/programmatic/curated-plugins/serverless.yml
@@ -10,7 +10,7 @@ custom:
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   function:
diff --git a/test/fixtures/programmatic/ecr/serverless.yml b/test/fixtures/programmatic/ecr/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   ecr:
     images:
       baseimage:
diff --git a/test/fixtures/programmatic/event-bridge/serverless.yml b/test/fixtures/programmatic/event-bridge/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/function-active-mq/serverless.yml b/test/fixtures/programmatic/function-active-mq/serverless.yml
@@ -8,7 +8,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/function-cloud-front/serverless.yml b/test/fixtures/programmatic/function-cloud-front/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/function-efs/serverless.yml b/test/fixtures/programmatic/function-efs/serverless.yml
@@ -7,7 +7,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/function-layers/serverless.yml b/test/fixtures/programmatic/function-layers/serverless.yml
@@ -1,7 +1,7 @@
 service: service
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 layers:
   testLayer:
diff --git a/test/fixtures/programmatic/function-msk/serverless.yml b/test/fixtures/programmatic/function-msk/serverless.yml
@@ -8,7 +8,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/function-rabbit-mq/serverless.yml b/test/fixtures/programmatic/function-rabbit-mq/serverless.yml
@@ -8,7 +8,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/function/serverless.yml b/test/fixtures/programmatic/function/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   basic:
diff --git a/test/fixtures/programmatic/http-api-catch-all/serverless.yml b/test/fixtures/programmatic/http-api-catch-all/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/http-api-export/serverless.yml b/test/fixtures/programmatic/http-api-export/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 resources:
   Resources:
diff --git a/test/fixtures/programmatic/http-api/serverless.yml b/test/fixtures/programmatic/http-api/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   logRetentionInDays: 14
 
 functions:
diff --git a/test/fixtures/programmatic/invocation/serverless.yml b/test/fixtures/programmatic/invocation/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   callback:
diff --git a/test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml b/test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/iot/serverless.yml b/test/fixtures/programmatic/iot/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/layer/serverless.yml b/test/fixtures/programmatic/layer/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   function:
diff --git a/test/fixtures/programmatic/multi-service/service-a/serverless.yml b/test/fixtures/programmatic/multi-service/service-a/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 custom:
   env: ${env:ENV_SOURCE_TEST, null}
diff --git a/test/fixtures/programmatic/package-artifact-in-serverless-dir/serverless.yml b/test/fixtures/programmatic/package-artifact-in-serverless-dir/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 plugins:
   # Mutates `package.artifact` to point to copied `.serverless/NAME.zip`
diff --git a/test/fixtures/programmatic/package-artifact/serverless.yml b/test/fixtures/programmatic/package-artifact/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 package:
   artifact: artifact.zip
diff --git a/test/fixtures/programmatic/packaging/serverless.yml b/test/fixtures/programmatic/packaging/serverless.yml
@@ -6,7 +6,7 @@ disabledDeprecations: LOAD_VARIABLES_FROM_ENV_FILES
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   fnService:
diff --git a/test/fixtures/programmatic/plugin/serverless.yml b/test/fixtures/programmatic/plugin/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 plugins:
   - ./plugin
diff --git a/test/fixtures/programmatic/provisioned-concurrency/serverless.yml b/test/fixtures/programmatic/provisioned-concurrency/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/request-parameters/serverless.yml b/test/fixtures/programmatic/request-parameters/serverless.yml
@@ -2,7 +2,7 @@ service: service
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 functions:
   target:
diff --git a/test/fixtures/programmatic/request-schema/serverless.yml b/test/fixtures/programmatic/request-schema/serverless.yml
@@ -2,7 +2,7 @@ service: service
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   apiGateway:
     request:
       schemas:
diff --git a/test/fixtures/programmatic/s3/serverless.yml b/test/fixtures/programmatic/s3/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
   s3:
     customBucket:
diff --git a/test/fixtures/programmatic/schedule/serverless.yml b/test/fixtures/programmatic/schedule/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/sns/serverless.yml b/test/fixtures/programmatic/sns/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/sqs/serverless.yml b/test/fixtures/programmatic/sqs/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/stream/serverless.yml b/test/fixtures/programmatic/stream/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/variables-legacy/serverless.yml b/test/fixtures/programmatic/variables-legacy/serverless.yml
@@ -2,7 +2,7 @@ service: service
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
 
 custom:
   importedFile: ${file(config.json)}
diff --git a/test/fixtures/programmatic/websocket-external-auth/serverless.yml b/test/fixtures/programmatic/websocket-external-auth/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
 
 functions:
diff --git a/test/fixtures/programmatic/websocket/serverless.yml b/test/fixtures/programmatic/websocket/serverless.yml
@@ -4,7 +4,7 @@ configValidationMode: error
 
 provider:
   name: aws
-  runtime: nodejs16.x
+  runtime: nodejs18.x
   versionFunctions: false
   logs:
     websocket: true
diff --git a/test/integration-package/cloudformation.tests.js b/test/integration-package/cloudformation.tests.js
diff --git a/test/integration-package/fixtures/artifact/serverless.yml b/test/integration-package/fixtures/artifact/serverless.yml
diff --git a/test/integration-package/fixtures/individually-function/serverless.yml b/test/integration-package/fixtures/individually-function/serverless.yml
diff --git a/test/integration-package/fixtures/individually/serverless.yml b/test/integration-package/fixtures/individually/serverless.yml
diff --git a/test/integration-package/fixtures/regular/serverless.yml b/test/integration-package/fixtures/regular/serverless.yml
diff --git a/test/unit/lib/plugins/aws/custom-resources/index.test.js b/test/unit/lib/plugins/aws/custom-resources/index.test.js
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
diff --git a/test/unit/lib/plugins/aws/package/compile/layers.test.js b/test/unit/lib/plugins/aws/package/compile/layers.test.js

Original file line number	Diff line number	Diff line change
`@@ -1822,7 +1822,7 @@ class AwsProvider {`
`1822`	`1822`	`}`
`1823`	`1823`
`1824`	`1824`	`getRuntime(runtime) {`
`1825`		`- const defaultRuntime = 'nodejs16.x';`
	`1825`	`+ const defaultRuntime = 'nodejs18.x';`
`1826`	`1826`	`const runtimeSourceValue = this.getRuntimeSourceValue();`
`1827`	`1827`	`return runtime \|\| runtimeSourceValue.value \|\| defaultRuntime;`
`1828`	`1828`	`}`