chore: Node function default (#12058)

* fix: Node function default * chore: Updated docker expectations * chore: Adjusted before all hook * chore: Revert fixture tests
serverless · Jul 10, 2023 · 47e299e · 47e299e
1 parent 668a0ce
commit 47e299e
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 43 deletions.
diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
@@ -52,7 +52,7 @@ module.exports = {
 
     const sdk = new ServerlessSDK();
     const { supportedRegions, supportedRuntimes } = await sdk.metadata.get();
-    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs12.x')) {
+    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs16.x')) {
       context.inapplicabilityReasonCode = 'UNSUPPORTED_RUNTIME';
       return false;
     }

diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -221,7 +221,7 @@ module.exports = {
     }
     const sdk = new ServerlessSDK();
     const { supportedRegions, supportedRuntimes } = await sdk.metadata.get();
-    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs12.x')) {
+    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs16.x')) {
       context.inapplicabilityReasonCode = 'UNSUPPORTED_RUNTIME';
       return false;
     }

diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
@@ -541,6 +541,8 @@ class AwsProvider {
               'nodejs10.x',
               'nodejs12.x',
               'nodejs14.x',
+              'nodejs16.x',
+              'nodejs18.x',
               'provided',
               'provided.al2',
               'python2.7',
@@ -1589,7 +1591,7 @@ class AwsProvider {
   }
 
   getRuntime(runtime) {
-    const defaultRuntime = 'nodejs12.x';
+    const defaultRuntime = 'nodejs16.x';
     const runtimeSourceValue = this.getRuntimeSourceValue();
     return runtime || runtimeSourceValue.value || defaultRuntime;
   }

diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/packageService.js
@@ -29,7 +29,7 @@ module.exports = {
   },
 
   getRuntime(runtime) {
-    const defaultRuntime = 'nodejs12.x';
+    const defaultRuntime = 'nodejs14.x';
     return runtime || this.serverless.service.provider.runtime || defaultRuntime;
   },
 

diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
@@ -40,7 +40,7 @@ const getServiceConfig = ({ configuration, options, variableSources }) => {
   const isAwsProvider = providerName === 'aws';
 
   const defaultRuntime = isAwsProvider
-    ? configuration.provider.runtime || 'nodejs12.x'
+    ? configuration.provider.runtime || 'nodejs16.x'
     : _.get(configuration, 'provider.runtime');
 
   const functions = (() => {

diff --git a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
@@ -21,7 +21,16 @@ const ServerlessSDKMock = class ServerlessSDK {
       get: async () => {
         return {
           awsAccountId: '377024778620',
-          supportedRuntimes: ['nodejs10.x', 'nodejs12.x', 'python2.7', 'python3.6', 'python3.7'],
+          supportedRuntimes: [
+            'nodejs10.x',
+            'nodejs12.x',
+            'nodejs14.x',
+            'nodejs16.x',
+            'nodejs18.x',
+            'python2.7',
+            'python3.6',
+            'python3.7',
+          ],
           supportedRegions: [
             'us-east-1',
             'us-east-2',
@@ -116,7 +125,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
     });
     const context = {
       serviceDir: process.cwd(),
-      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configuration: { provider: { name: 'aws', runtime: 'nodejs16.x' } },
       configurationFilename: 'serverless.yml',
       options: {},
       initial: {},
@@ -148,7 +157,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
     });
     const context = {
       serviceDir: process.cwd(),
-      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configuration: { provider: { name: 'aws', runtime: 'nodejs16.x' } },
       configurationFilename: 'serverless.yml',
       options: { org: 'someorg' },
       initial: {},
@@ -168,7 +177,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
     });
     const context = {
       serviceDir: process.cwd(),
-      configuration: { org: 'someorg', provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configuration: { org: 'someorg', provider: { name: 'aws', runtime: 'nodejs16.x' } },
       configurationFilename: 'serverless.yml',
       options: {},
       initial: {},
@@ -191,7 +200,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function
     });
     const context = {
       serviceDir: process.cwd(),
-      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configuration: { provider: { name: 'aws', runtime: 'nodejs16.x' } },
       configurationFilename: 'serverless.yml',
       options: {},
       initial: {},

diff --git a/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -40,6 +40,9 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
               supportedRuntimes: [
                 'nodejs10.x',
                 'nodejs12.x',
+                'nodejs14.x',
+                'nodejs16.x',
+                'nodejs18.x',
                 'python2.7',
                 'python3.6',
                 'python3.7',
@@ -154,7 +157,7 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
       serviceDir: process.cwd(),
       configuration: {
         service: 'some-aws-service',
-        provider: { name: 'aws', runtime: 'nodejs12.x' },
+        provider: { name: 'aws', runtime: 'nodejs16.x' },
       },
       configurationFilename: 'serverless.yml',
       options: {},
@@ -174,7 +177,13 @@ describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', functi
               get: async () => {
                 return {
                   awsAccountId: '377024778620',
-                  supportedRuntimes: ['nodejs10.x', 'nodejs12.x'],
+                  supportedRuntimes: [
+                    'nodejs10.x',
+                    'nodejs12.x',
+                    'nodejs14.x',
+                    'nodejs16.x',
+                    'nodejs18.x',
+                  ],
                   supportedRegions: ['us-east-1'],
                 };
               },

diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invokeLocal/index.test.js
@@ -420,7 +420,7 @@ describe('AwsInvokeLocal', () => {
         it(`should call invokeLocalNodeJs for any node.js runtime version for ${item.path}`, async () => {
           awsInvokeLocal.options.functionObj.handler = item.path;
 
-          awsInvokeLocal.options.functionObj.runtime = 'nodejs12.x';
+          awsInvokeLocal.options.functionObj.runtime = 'nodejs16.x';
           await awsInvokeLocal.invokeLocal();
           expect(invokeLocalNodeJsStub.calledOnce).to.be.equal(true);
           expect(
@@ -628,7 +628,7 @@ describe('AwsInvokeLocal', () => {
           handler: 'handler.hello',
           name: 'hello',
           timeout: 4,
-          runtime: 'nodejs12.x',
+          runtime: 'nodejs16.x',
           environment: {
             functionVar: 'functionValue',
           },
@@ -656,7 +656,7 @@ describe('AwsInvokeLocal', () => {
       expect(spawnExtStub.getCall(0).args).to.deep.equal(['docker', ['version']]);
       expect(spawnExtStub.getCall(1).args).to.deep.equal([
         'docker',
-        ['images', '-q', 'lambci/lambda:nodejs12.x'],
+        ['images', '-q', 'lambci/lambda:nodejs16.x'],
       ]);
       expect(spawnExtStub.getCall(3).args).to.deep.equal([
         'docker',
@@ -687,7 +687,7 @@ describe('AwsInvokeLocal', () => {
           'commandLineEnvVar=commandLineEnvVarValue',
           '-p',
           '9292:9292',
-          'sls-docker-nodejs12.x',
+          'sls-docker-nodejs16.x',
           'handler.hello',
           '{}',
         ],

diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -334,7 +334,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
         },
       };
@@ -375,7 +375,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
           Tags: [
             { Key: 'foo', Value: 'bar' },
@@ -439,7 +439,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs16.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: 'arn:aws:sns:region:accountid:foo',
@@ -490,7 +490,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs16.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -532,7 +532,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs16.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -574,7 +574,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs16.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -616,7 +616,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs16.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: 'arn:aws:sns:region:accountid:foo',
@@ -667,7 +667,7 @@ describe('AwsCompileFunctions', () => {
             Handler: 'func.function.handler',
             MemorySize: 1024,
             Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
+            Runtime: 'nodejs16.x',
             Timeout: 6,
             KmsKeyArn: { 'Fn::GetAtt': ['MyKms', 'Arn'] },
           },
@@ -704,7 +704,7 @@ describe('AwsCompileFunctions', () => {
             Handler: 'func.function.handler',
             MemorySize: 1024,
             Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
+            Runtime: 'nodejs16.x',
             Timeout: 6,
             KmsKeyArn: { Ref: 'foobar' },
           },
@@ -741,7 +741,7 @@ describe('AwsCompileFunctions', () => {
             Handler: 'func.function.handler',
             MemorySize: 1024,
             Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
+            Runtime: 'nodejs16.x',
             Timeout: 6,
             KmsKeyArn: { 'Fn::ImportValue': 'KmsKey' },
           },
@@ -794,7 +794,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs16.x',
               Timeout: 6,
               KmsKeyArn: 'arn:aws:kms:region:accountid:foo/bar',
             },
@@ -869,7 +869,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs16.x',
               Timeout: 6,
               TracingConfig: {
                 Mode: 'Active',
@@ -926,7 +926,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
           Environment: {
             Variables: {
@@ -993,7 +993,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 128,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 10,
         },
       };
@@ -1006,7 +1006,7 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    it('should default to the nodejs12.x runtime when no provider runtime is given', () => {
+    it('should default to the nodejs16.x runtime when no provider runtime is given', () => {
       const s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
       const s3FileName = awsCompileFunctions.serverless.service.package.artifact
         .split(path.sep)
@@ -1030,7 +1030,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
         },
       };
@@ -1164,7 +1164,7 @@ describe('AwsCompileFunctions', () => {
           MemorySize: 1024,
           ReservedConcurrentExecutions: 5,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
         },
       };
@@ -1220,7 +1220,7 @@ describe('AwsCompileFunctions', () => {
           MemorySize: 1024,
           ReservedConcurrentExecutions: 0,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
         },
       };
@@ -1259,7 +1259,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
         },
       };
@@ -1297,7 +1297,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs16.x',
           Timeout: 6,
           Layers: ['arn:aws:xxx:*:*'],
         },
@@ -1409,7 +1409,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
                 sharedEnvVar: 'valueFromFunction',
               },
               memorySize: 2048,
-              runtime: 'nodejs12.x',
+              runtime: 'nodejs16.x',
               versionFunction: true,
             },
             fnFileSystemConfig: {
@@ -1932,7 +1932,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               ExternalLambdaLayer: {
                 Type: 'AWS::Lambda::LayerVersion',
                 Properties: {
-                  CompatibleRuntimes: ['nodejs12.x'],
+                  CompatibleRuntimes: ['nodejs16.x'],
                   Content: {
                     S3Bucket: 'bucket',
                     S3Key: 'key',

diff --git a/test/unit/lib/plugins/aws/package/compile/layers.test.js b/test/unit/lib/plugins/aws/package/compile/layers.test.js
@@ -48,7 +48,7 @@ describe('lib/plugins/aws/package/compile/layers/index.test.js', () => {
           layerTwo: {
             description: 'Layer two example',
             path: 'layer',
-            compatibleRuntimes: ['nodejs12.x'],
+            compatibleRuntimes: ['nodejs16.x'],
             compatibleArchitectures: ['arm64'],
             licenseInfo: 'GPL',
             allowedAccounts: ['123456789012', '123456789013'],
@@ -186,7 +186,7 @@ describe('lib/plugins/aws/package/compile/layers/index.test.js', () => {
     const layerOne = cfResources[layerResourceName];
 
     expect(layerOne.Type).to.equals('AWS::Lambda::LayerVersion');
-    expect(layerOne.Properties.CompatibleRuntimes).to.deep.equals(['nodejs12.x']);
+    expect(layerOne.Properties.CompatibleRuntimes).to.deep.equals(['nodejs16.x']);
   });
 
   it('should support `layers[].compatibleArchitectures`', () => {